Rewrite magic source

pkg/magic/bitstream/producer.go

@@ -2,7 +2,6 @@ package bitstream
 
 import (
 	"encoding/hex"
-	"encoding/json"
 	"errors"
 	"io"
 
@@ -13,17 +12,13 @@ import (
 	"github.com/pion/rtp"
 )
 
-type Client struct {
-	rd *core.ReadSeeker
-
-	media    *core.Media
-	receiver *core.Receiver
-
-	recv int
+type Producer struct {
+	core.SuperProducer
+	rd *core.ReadBuffer
 }
 
-func Open(r io.Reader) (*Client, error) {
-	rd := core.NewReadSeeker(r)
+func Open(r io.Reader) (*Producer, error) {
+	rd := core.NewReadBuffer(r)
 
 	buf, err := rd.Peek(256)
 	if err != nil {
@@ -43,30 +38,19 @@ func Open(r io.Reader) (*Client, error) {
 		return nil, errors.New("bitstream: unsupported header: " + hex.EncodeToString(buf[:8]))
 	}
 
-	client := &Client{
-		rd: rd,
-		media: &core.Media{
+	prod := &Producer{rd: rd}
+	prod.Type = "Bitstream producer"
+	prod.Medias = []*core.Media{
+		{
 			Kind:      core.KindVideo,
 			Direction: core.DirectionRecvonly,
 			Codecs:    []*core.Codec{codec},
 		},
 	}
-
-	return client, nil
+	return prod, nil
 }
 
-func (c *Client) GetMedias() []*core.Media {
-	return []*core.Media{c.media}
-}
-
-func (c *Client) GetTrack(media *core.Media, codec *core.Codec) (*core.Receiver, error) {
-	if c.receiver == nil {
-		c.receiver = core.NewReceiver(media, codec)
-	}
-	return c.receiver, nil
-}
-
-func (c *Client) Start() error {
+func (c *Producer) Start() error {
 	var buf []byte
 
 	b := make([]byte, core.BufferSize)
@@ -76,7 +60,7 @@ func (c *Client) Start() error {
 			return err
 		}
 
-		c.recv += n
+		c.Recv += n
 
 		buf = append(buf, b[:n]...)
 
@@ -89,7 +73,7 @@ func (c *Client) Start() error {
 			Header:  rtp.Header{Timestamp: core.Now90000()},
 			Payload: annexb.EncodeToAVCC(buf[:i], true),
 		}
-		c.receiver.WriteRTP(pkt)
+		c.Receivers[0].WriteRTP(pkt)
 
 		//log.Printf("[AVC] %v, len: %d", h264.Types(pkt.Payload), len(pkt.Payload))
 
@@ -97,22 +81,7 @@ func (c *Client) Start() error {
 	}
 }
 
-func (c *Client) Stop() error {
-	if c.receiver != nil {
-		c.receiver.Close()
-	}
-	if closer, ok := c.rd.Reader.(io.Closer); ok {
-		return closer.Close()
-	}
-	return nil
-}
-
-func (c *Client) MarshalJSON() ([]byte, error) {
-	info := &core.Info{
-		Type:      "Bitstream active producer",
-		Medias:    []*core.Media{c.media},
-		Receivers: []*core.Receiver{c.receiver},
-		Recv:      c.recv,
-	}
-	return json.Marshal(info)
+func (c *Producer) Stop() error {
+	_ = c.SuperProducer.Close()
+	return c.rd.Close()
 }

pkg/magic/keyframe.go

@@ -43,7 +43,7 @@ func (k *Keyframe) AddTrack(media *core.Media, _ *core.Codec, track *core.Receiv
 			if !h264.IsKeyframe(packet.Payload) {
 				return
 			}
-			b := annexb.DecodeAVCC(packet.Payload)
+			b := annexb.DecodeAVCC(packet.Payload, true)
 			k.Fire(b)
 		}
 

pkg/magic/mjpeg/producer.go

@@ -2,26 +2,22 @@ package mjpeg
 
 import (
 	"bytes"
-	"encoding/json"
 	"io"
 
 	"github.com/AlexxIT/go2rtc/pkg/core"
 	"github.com/pion/rtp"
 )
 
-type Client struct {
-	rd *core.ReadSeeker
-
-	media    *core.Media
-	receiver *core.Receiver
-
-	recv int
+type Producer struct {
+	core.SuperProducer
+	rd *core.ReadBuffer
 }
 
-func NewClient(rd io.Reader) *Client {
-	return &Client{
-		rd: core.NewReadSeeker(rd),
-		media: &core.Media{
+func Open(rd io.Reader) (*Producer, error) {
+	prod := &Producer{rd: core.NewReadBuffer(rd)}
+	prod.Type = "MJPEG producer"
+	prod.Medias = []*core.Media{
+		{
 			Kind:      core.KindVideo,
 			Direction: core.DirectionRecvonly,
 			Codecs: []*core.Codec{
@@ -33,20 +29,10 @@ func NewClient(rd io.Reader) *Client {
 			},
 		},
 	}
+	return prod, nil
 }
 
-func (c *Client) GetMedias() []*core.Media {
-	return []*core.Media{c.media}
-}
-
-func (c *Client) GetTrack(media *core.Media, codec *core.Codec) (*core.Receiver, error) {
-	if c.receiver == nil {
-		c.receiver = core.NewReceiver(media, codec)
-	}
-	return c.receiver, nil
-}
-
-func (c *Client) Start() error {
+func (c *Producer) Start() error {
 	var buf []byte                     // total bufer
 	b := make([]byte, core.BufferSize) // reading buffer
 
@@ -59,7 +45,7 @@ func (c *Client) Start() error {
 				return err
 			}
 
-			c.recv += n
+			c.Recv += n
 
 			buf = append(buf, b[:n]...)
 
@@ -77,7 +63,7 @@ func (c *Client) Start() error {
 			Header:  rtp.Header{Timestamp: core.Now90000()},
 			Payload: buf[:i],
 		}
-		c.receiver.WriteRTP(pkt)
+		c.Receivers[0].WriteRTP(pkt)
 
 		//log.Printf("[mjpeg] ts=%d size=%d", pkt.Header.Timestamp, len(pkt.Payload))
 
@@ -85,22 +71,7 @@ func (c *Client) Start() error {
 	}
 }
 
-func (c *Client) Stop() error {
-	if c.receiver != nil {
-		c.receiver.Close()
-	}
-	if closer, ok := c.rd.Reader.(io.Closer); ok {
-		return closer.Close()
-	}
-	return nil
-}
-
-func (c *Client) MarshalJSON() ([]byte, error) {
-	info := &core.Info{
-		Type:      "MJPEG active producer",
-		Medias:    []*core.Media{c.media},
-		Receivers: []*core.Receiver{c.receiver},
-		Recv:      c.recv,
-	}
-	return json.Marshal(info)
+func (c *Producer) Stop() error {
+	_ = c.SuperProducer.Close()
+	return c.rd.Close()
 }

pkg/magic/producer.go

@@ -15,7 +15,7 @@ import (
 )
 
 func Open(r io.Reader) (core.Producer, error) {
-	rd := core.NewReadSeeker(r)
+	rd := core.NewReadBuffer(r)
 
 	b, err := rd.Peek(4)
 	if err != nil {
@@ -27,7 +27,7 @@ func Open(r io.Reader) (core.Producer, error) {
 		return bitstream.Open(rd)
 
 	case bytes.HasPrefix(b, []byte{0xFF, 0xD8}):
-		return mjpeg.NewClient(rd), nil
+		return mjpeg.Open(rd)
 
 	case bytes.HasPrefix(b, []byte(flv.Signature)):
 		return flv.Open(rd)