Update RTSP Server response with all tracks by default

pkg/rtsp/streamer.go

@@ -9,7 +9,26 @@ import (
 // Element Producer
 
 func (c *Conn) GetMedias() []*streamer.Media {
-	return c.Medias
+	if c.Medias != nil {
+		return c.Medias
+	}
+
+	return []*streamer.Media{
+		{
+			Kind:      streamer.KindVideo,
+			Direction: streamer.DirectionRecvonly,
+			Codecs: []*streamer.Codec{
+				{Name: streamer.CodecAll},
+			},
+		},
+		{
+			Kind:      streamer.KindAudio,
+			Direction: streamer.DirectionRecvonly,
+			Codecs: []*streamer.Codec{
+				{Name: streamer.CodecAll},
+			},
+		},
+	}
 }
 
 func (c *Conn) GetTrack(media *streamer.Media, codec *streamer.Codec) *streamer.Track {
@@ -63,11 +82,20 @@ func (c *Conn) AddTrack(media *streamer.Media, track *streamer.Track) *streamer.
 		codec := track.Codec.Clone()
 		codec.PayloadType = uint8(96 + i)
 
-		for i, m := range c.Medias {
-			if m == media {
-				media.Codecs = []*streamer.Codec{codec}
-				c.Medias[i] = media
-				break
+		if media.MatchAll() {
+			// fill consumer medias list
+			c.Medias = append(c.Medias, &streamer.Media{
+				Kind: media.Kind, Direction: media.Direction,
+				Codecs: []*streamer.Codec{codec},
+			})
+		} else {
+			// find consumer media and replace codec with right one
+			for i, m := range c.Medias {
+				if m == media {
+					media.Codecs = []*streamer.Codec{codec}
+					c.Medias[i] = media
+					break
+				}
 			}
 		}
 

pkg/streamer/media.go

@@ -36,6 +36,9 @@ const (
 	CodecMP3  = "MPA" // payload: 14, aka MPEG-1 Layer III
 
 	CodecELD = "ELD" // AAC-ELD
+
+	CodecAll = "ALL"
+	CodecAny = "ANY"
 )
 
 const PayloadTypeRAW byte = 255
@@ -111,10 +114,6 @@ func (m *Media) MatchMedia(media *Media) *Codec {
 	}
 
 	for _, localCodec := range m.Codecs {
-		if media.Codecs == nil {
-			return localCodec
-		}
-
 		for _, remoteCodec := range media.Codecs {
 			if localCodec.Match(remoteCodec) {
 				return localCodec
@@ -124,6 +123,10 @@ func (m *Media) MatchMedia(media *Media) *Codec {
 	return nil
 }
 
+func (m *Media) MatchAll() bool {
+	return len(m.Codecs) > 0 && m.Codecs[0].Name == CodecAll
+}
+
 // Codec take best from:
 // - deepch/vdk/av.CodecData
 // - pion/webrtc.RTPCodecCapability
@@ -153,6 +156,11 @@ func (c *Codec) Clone() *Codec {
 }
 
 func (c *Codec) Match(codec *Codec) bool {
+	switch codec.Name {
+	case CodecAll, CodecAny:
+		return true
+	}
+
 	return c.Name == codec.Name &&
 		(c.ClockRate == codec.ClockRate || codec.ClockRate == 0) &&
 		(c.Channels == codec.Channels || codec.Channels == 0)
@@ -307,16 +315,12 @@ func ParseQuery(query map[string][]string) (medias []*Media) {
 				media := &Media{Kind: key, Direction: DirectionRecvonly}
 
 				for _, name := range strings.Split(value, ",") {
-					if name == "" {
-						continue
-					}
-
 					name = strings.ToUpper(name)
 
 					// check aliases
 					switch name {
-					case "COPY":
-						name = "" // pass empty codecs list
+					case "", "COPY":
+						name = CodecAny
 					case "MJPEG":
 						name = CodecJPEG
 					case "AAC":

pkg/streamer/media_test.go

@@ -3,6 +3,7 @@ package streamer
 import (
 	"github.com/pion/sdp/v3"
 	"github.com/stretchr/testify/assert"
+	"net/url"
 	"testing"
 )
 
@@ -21,3 +22,21 @@ func TestSDP(t *testing.T) {
 	err = sd.Unmarshal(data)
 	assert.Empty(t, err)
 }
+
+func TestParseQuery(t *testing.T) {
+	u, _ := url.Parse("rtsp://localhost:8554/camera1")
+	medias := ParseQuery(u.Query())
+	assert.Nil(t, medias)
+
+	for _, rawULR := range []string{
+		"rtsp://localhost:8554/camera1?video",
+		"rtsp://localhost:8554/camera1?video=copy",
+		"rtsp://localhost:8554/camera1?video=any",
+	} {
+		u, _ = url.Parse(rawULR)
+		medias = ParseQuery(u.Query())
+		assert.Equal(t, []*Media{
+			{Kind: KindVideo, Direction: DirectionRecvonly, Codecs: []*Codec{{Name: CodecAny}}},
+		}, medias)
+	}
+}