Rewrite magic source

pkg/core/core.go

@@ -47,7 +47,10 @@ type Producer interface {
 	// GetTrack - return Receiver, that can only produce rtp.Packet(s)
 	GetTrack(media *Media, codec *Codec) (*Receiver, error)
 
+	// Deprecated: rename to Run()
 	Start() error
+
+	// Deprecated: rename to Close()
 	Stop() error
 }
 
@@ -59,6 +62,7 @@ type Consumer interface {
 
 	AddTrack(media *Media, codec *Codec, track *Receiver) error
 
+	// Deprecated: rename to Close()
 	Stop() error
 }
 
@@ -102,3 +106,60 @@ const (
 	UnsupportedCodec    = "unsupported codec"
 	WrongMediaDirection = "wrong media direction"
 )
+
+type SuperProducer struct {
+	Type      string      `json:"type,omitempty"`
+	URL       string      `json:"url,omitempty"`
+	Medias    []*Media    `json:"medias,omitempty"`
+	Receivers []*Receiver `json:"receivers,omitempty"`
+	Recv      int         `json:"recv,omitempty"`
+}
+
+func (s *SuperProducer) GetMedias() []*Media {
+	return s.Medias
+}
+
+func (s *SuperProducer) GetTrack(media *Media, codec *Codec) (*Receiver, error) {
+	for _, receiver := range s.Receivers {
+		if receiver.Codec == codec {
+			return receiver, nil
+		}
+	}
+	receiver := NewReceiver(media, codec)
+	s.Receivers = append(s.Receivers, receiver)
+	return receiver, nil
+}
+
+func (s *SuperProducer) Close() error {
+	for _, receiver := range s.Receivers {
+		receiver.Close()
+	}
+	return nil
+}
+
+type SuperConsumer struct {
+	Type    string    `json:"type,omitempty"`
+	URL     string    `json:"url,omitempty"`
+	Medias  []*Media  `json:"medias,omitempty"`
+	Senders []*Sender `json:"receivers,omitempty"`
+	Send    int       `json:"recv,omitempty"`
+}
+
+func (s *SuperConsumer) GetMedias() []*Media {
+	return s.Medias
+}
+
+func (s *SuperConsumer) AddTrack(media *Media, codec *Codec, track *Receiver) error {
+	return nil
+}
+
+//func (b *SuperConsumer) WriteTo(w io.Writer) (n int64, err error) {
+//	return 0, nil
+//}
+
+func (s *SuperConsumer) Close() error {
+	for _, sender := range s.Senders {
+		sender.Close()
+	}
+	return nil
+}

pkg/core/readbuffer.go

@@ -12,13 +12,13 @@ const (
 	BufferDrainAndClear = -1
 )
 
-// ReadSeeker support buffering and Seek over buffer
+// ReadBuffer support buffering and Seek over buffer
 // positive BufferSize will enable buffering mode
 // Seek to negative offset will clear buffer
 // Seek with a positive BufferSize will continue buffering after the last read from the buffer
 // Seek with a negative BufferSize will clear buffer after the last read from the buffer
 // Read more than BufferSize will raise error
-type ReadSeeker struct {
+type ReadBuffer struct {
 	io.Reader
 
 	BufferSize int
@@ -27,14 +27,14 @@ type ReadSeeker struct {
 	pos int
 }
 
-func NewReadSeeker(rd io.Reader) *ReadSeeker {
-	if rs, ok := rd.(*ReadSeeker); ok {
+func NewReadBuffer(rd io.Reader) *ReadBuffer {
+	if rs, ok := rd.(*ReadBuffer); ok {
 		return rs
 	}
-	return &ReadSeeker{Reader: rd}
+	return &ReadBuffer{Reader: rd}
 }
 
-func (r *ReadSeeker) Read(p []byte) (n int, err error) {
+func (r *ReadBuffer) Read(p []byte) (n int, err error) {
 	// with zero buffer - read as usual
 	if r.BufferSize == BufferDisable {
 		return r.Reader.Read(p)
@@ -65,7 +65,14 @@ func (r *ReadSeeker) Read(p []byte) (n int, err error) {
 	return
 }
 
-func (r *ReadSeeker) Seek(offset int64, whence int) (int64, error) {
+func (r *ReadBuffer) Close() error {
+	if closer, ok := r.Reader.(io.Closer); ok {
+		return closer.Close()
+	}
+	return nil
+}
+
+func (r *ReadBuffer) Seek(offset int64, whence int) (int64, error) {
 	var pos int
 	switch whence {
 	case io.SeekStart:
@@ -89,17 +96,17 @@ func (r *ReadSeeker) Seek(offset int64, whence int) (int64, error) {
 	return int64(r.pos), nil
 }
 
-func (r *ReadSeeker) Peek(n int) ([]byte, error) {
+func (r *ReadBuffer) Peek(n int) ([]byte, error) {
 	r.BufferSize = n
 	b := make([]byte, n)
 	if _, err := io.ReadAtLeast(r, b, n); err != nil {
 		return nil, err
 	}
-	r.Rewind()
+	r.Reset()
 	return b, nil
 }
 
-func (r *ReadSeeker) Rewind() {
+func (r *ReadBuffer) Reset() {
 	r.BufferSize = BufferDrainAndClear
 	r.pos = 0
 }

pkg/core/readbuffer_test.go

@@ -12,7 +12,7 @@ func TestReadSeeker(t *testing.T) {
 	b := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}
 	buf := bytes.NewReader(b)
 
-	rd := NewReadSeeker(buf)
+	rd := NewReadBuffer(buf)
 	rd.BufferSize = ProbeSize
 
 	// 1. Read to buffer