BIG rewrite stream info

pkg/mjpeg/client.go

@@ -1,75 +0,0 @@
-package mjpeg
-
-import (
-	"errors"
-	"io"
-	"net/http"
-
-	"github.com/AlexxIT/go2rtc/pkg/core"
-	"github.com/AlexxIT/go2rtc/pkg/tcp"
-	"github.com/pion/rtp"
-)
-
-type Client struct {
-	core.Listener
-
-	UserAgent  string
-	RemoteAddr string
-
-	closed bool
-	res    *http.Response
-
-	medias   []*core.Media
-	receiver *core.Receiver
-
-	recv int
-}
-
-func NewClient(res *http.Response) *Client {
-	return &Client{res: res}
-}
-
-func (c *Client) Handle() error {
-	body, err := io.ReadAll(c.res.Body)
-	if err != nil {
-		return err
-	}
-
-	pkt := &rtp.Packet{
-		Header:  rtp.Header{Timestamp: core.Now90000()},
-		Payload: body,
-	}
-	c.receiver.WriteRTP(pkt)
-
-	c.recv += len(body)
-
-	req := c.res.Request
-
-	for !c.closed {
-		res, err := tcp.Do(req)
-		if err != nil {
-			return err
-		}
-
-		if res.StatusCode != http.StatusOK {
-			return errors.New("wrong status: " + res.Status)
-		}
-
-		body, err = io.ReadAll(res.Body)
-		if err != nil {
-			return err
-		}
-
-		c.recv += len(body)
-
-		if c.receiver != nil {
-			pkt = &rtp.Packet{
-				Header:  rtp.Header{Timestamp: core.Now90000()},
-				Payload: body,
-			}
-			c.receiver.WriteRTP(pkt)
-		}
-	}
-
-	return nil
-}

pkg/mjpeg/consumer.go

@@ -8,26 +8,30 @@ import (
 )
 
 type Consumer struct {
-	core.SuperConsumer
+	core.Connection
 	wr *core.WriteBuffer
 }
 
 func NewConsumer() *Consumer {
-	return &Consumer{
-		core.SuperConsumer{
-			Type: "MJPEG passive consumer",
-			Medias: []*core.Media{
-				{
-					Kind:      core.KindVideo,
-					Direction: core.DirectionSendonly,
-					Codecs: []*core.Codec{
-						{Name: core.CodecJPEG},
-						{Name: core.CodecRAW},
-					},
-				},
+	medias := []*core.Media{
+		{
+			Kind:      core.KindVideo,
+			Direction: core.DirectionSendonly,
+			Codecs: []*core.Codec{
+				{Name: core.CodecJPEG},
+				{Name: core.CodecRAW},
 			},
 		},
-		core.NewWriteBuffer(nil),
+	}
+	wr := core.NewWriteBuffer(nil)
+	return &Consumer{
+		Connection: core.Connection{
+			ID:         core.NewID(),
+			FormatName: "mjpeg",
+			Medias:     medias,
+			Transport:  wr,
+		},
+		wr: wr,
 	}
 }
 
@@ -53,8 +57,3 @@ func (c *Consumer) AddTrack(media *core.Media, _ *core.Codec, track *core.Receiv
 func (c *Consumer) WriteTo(wr io.Writer) (int64, error) {
 	return c.wr.WriteTo(wr)
 }
-
-func (c *Consumer) Stop() error {
-	_ = c.SuperConsumer.Close()
-	return c.wr.Close()
-}

pkg/mjpeg/producer.go

@@ -1,61 +0,0 @@
-package mjpeg
-
-import (
-	"encoding/json"
-
-	"github.com/AlexxIT/go2rtc/pkg/core"
-)
-
-func (c *Client) GetMedias() []*core.Media {
-	if c.medias == nil {
-		c.medias = []*core.Media{{
-			Kind:      core.KindVideo,
-			Direction: core.DirectionRecvonly,
-			Codecs: []*core.Codec{
-				{
-					Name:        core.CodecJPEG,
-					ClockRate:   90000,
-					PayloadType: core.PayloadTypeRAW,
-				},
-			},
-		}}
-	}
-	return c.medias
-}
-
-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 {
-	// https://github.com/AlexxIT/go2rtc/issues/278
-	return c.Handle()
-}
-
-func (c *Client) Stop() error {
-	if c.receiver != nil {
-		c.receiver.Close()
-	}
-	// important for close reader/writer gorutines
-	_ = c.res.Body.Close()
-	c.closed = true
-	return nil
-}
-
-func (c *Client) MarshalJSON() ([]byte, error) {
-	info := &core.Info{
-		Type:       "JPEG active producer",
-		URL:        c.res.Request.URL.String(),
-		RemoteAddr: c.RemoteAddr,
-		UserAgent:  c.UserAgent,
-		Medias:     c.medias,
-		Recv:       c.recv,
-	}
-	if c.receiver != nil {
-		info.Receivers = []*core.Receiver{c.receiver}
-	}
-	return json.Marshal(info)
-}