Code refactoring for #1762

pkg/preload/consumer.go

@@ -1,82 +0,0 @@
-package preload
-
-import (
-	"net/url"
-	"strings"
-
-	"github.com/AlexxIT/go2rtc/pkg/core"
-	"github.com/pion/rtp"
-)
-
-type Preload struct {
-	core.Connection
-	closed core.Waiter
-}
-
-func NewPreload(name string, query url.Values) *Preload {
-	medias := core.ParseQuery(query)
-
-	for _, value := range query["microphone"] {
-		media := &core.Media{Kind: core.KindAudio, Direction: core.DirectionRecvonly}
-
-		for _, name := range strings.Split(value, ",") {
-			name = strings.ToUpper(name)
-			switch name {
-			case "", "COPY":
-				name = core.CodecAny
-			}
-			media.Codecs = append(media.Codecs, &core.Codec{Name: name})
-		}
-
-		medias = append(medias, media)
-	}
-
-	if len(medias) == 0 {
-		medias = []*core.Media{
-			{
-				Kind:      core.KindVideo,
-				Direction: core.DirectionSendonly,
-				Codecs:    []*core.Codec{{Name: core.CodecAny}},
-			},
-			{
-				Kind:      core.KindAudio,
-				Direction: core.DirectionSendonly,
-				Codecs:    []*core.Codec{{Name: core.CodecAny}},
-			},
-		}
-	}
-
-	return &Preload{
-		Connection: core.Connection{
-			ID:         core.NewID(),
-			FormatName: "preload",
-			Medias:     medias,
-		},
-	}
-}
-
-func (p *Preload) AddTrack(media *core.Media, codec *core.Codec, track *core.Receiver) error {
-	sender := core.NewSender(media, track.Codec)
-	sender.Handler = func(pkt *rtp.Packet) {
-		p.Send += pkt.MarshalSize()
-	}
-	sender.HandleRTP(track)
-	p.Senders = append(p.Senders, sender)
-	return nil
-}
-
-func (p *Preload) Start() error {
-	p.closed.Wait()
-	return nil
-}
-
-func (p *Preload) Stop() error {
-	for _, receiver := range p.Receivers {
-		receiver.Close()
-	}
-	for _, sender := range p.Senders {
-		sender.Close()
-	}
-	p.closed.Done(nil)
-	return nil
-}

pkg/probe/consumer.go

@@ -11,7 +11,7 @@ type Probe struct {
 	core.Connection
 }
 
-func NewProbe(query url.Values) *Probe {
+func Create(name string, query url.Values) *Probe {
 	medias := core.ParseQuery(query)
 
 	for _, value := range query["microphone"] {
@@ -32,39 +32,18 @@ func NewProbe(query url.Values) *Probe {
 	return &Probe{
 		Connection: core.Connection{
 			ID:         core.NewID(),
-			FormatName: "probe",
+			FormatName: name,
 			Medias:     medias,
 		},
 	}
 }
 
-func (p *Probe) GetMedias() []*core.Media {
-	return p.Medias
-}
-
 func (p *Probe) AddTrack(media *core.Media, codec *core.Codec, track *core.Receiver) error {
 	sender := core.NewSender(media, track.Codec)
-	sender.Bind(track)
+	sender.Handler = func(pkt *core.Packet) {
+		p.Send += len(pkt.Payload)
+	}
+	sender.HandleRTP(track)
 	p.Senders = append(p.Senders, sender)
 	return nil
 }
-
-func (p *Probe) GetTrack(media *core.Media, codec *core.Codec) (*core.Receiver, error) {
-	receiver := core.NewReceiver(media, codec)
-	p.Receivers = append(p.Receivers, receiver)
-	return receiver, nil
-}
-
-func (p *Probe) Start() error {
-	return nil
-}
-
-func (p *Probe) Stop() error {
-	for _, receiver := range p.Receivers {
-		receiver.Close()
-	}
-	for _, sender := range p.Senders {
-		sender.Close()
-	}
-	return nil
-}