Merge branch 'main' into multicast

kelvinlawson · web-flow · commit 4b097c0b99f4 · 2026-01-07T13:47:09.000Z
diff --git a/examples/client-play-format-h264-mpeg4audio-to-disk/mpegts_muxer.go b/examples/client-play-format-h264-mpeg4audio-to-disk/mpegts_muxer.go
@@ -8,6 +8,7 @@ import (
 	"github.com/bluenviron/gortsplib/v5/pkg/format"
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/h264"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts"
+	tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs"
 )
 
 func multiplyAndDivide(v, m, d int64) int64 {
@@ -41,11 +42,11 @@ func (e *mpegtsMuxer) initialize() error {
 	e.b = bufio.NewWriter(e.f)
 
 	e.h264Track = &mpegts.Track{
-		Codec: &mpegts.CodecH264{},
+		Codec: &tscodecs.H264{},
 	}
 
 	e.mpeg4AudioTrack = &mpegts.Track{
-		Codec: &mpegts.CodecMPEG4Audio{
+		Codec: &tscodecs.MPEG4Audio{
 			Config: *e.mpeg4AudioFormat.Config,
 		},
 	}
diff --git a/examples/client-play-format-h264-to-disk/mpegts_muxer.go b/examples/client-play-format-h264-to-disk/mpegts_muxer.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/h264"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts"
+	tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs"
 )
 
 // mpegtsMuxer allows to save a H264 stream into a MPEG-TS file.
@@ -31,7 +32,7 @@ func (e *mpegtsMuxer) initialize() error {
 	e.b = bufio.NewWriter(e.f)
 
 	e.track = &mpegts.Track{
-		Codec: &mpegts.CodecH264{},
+		Codec: &tscodecs.H264{},
 	}
 
 	e.w = &mpegts.Writer{W: e.b, Tracks: []*mpegts.Track{e.track}}
diff --git a/examples/client-play-format-h265-to-disk/mpegts_muxer.go b/examples/client-play-format-h265-to-disk/mpegts_muxer.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/h265"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts"
+	tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs"
 )
 
 // mpegtsMuxer allows to save a H265 stream into a MPEG-TS file.
@@ -32,7 +33,7 @@ func (e *mpegtsMuxer) initialize() error {
 	e.b = bufio.NewWriter(e.f)
 
 	e.track = &mpegts.Track{
-		Codec: &mpegts.CodecH265{},
+		Codec: &tscodecs.H265{},
 	}
 
 	e.w = &mpegts.Writer{W: e.b, Tracks: []*mpegts.Track{e.track}}
diff --git a/examples/client-play-format-mpeg4audio-to-disk/main.go b/examples/client-play-format-mpeg4audio-to-disk/main.go
@@ -8,6 +8,7 @@ import (
 	"github.com/bluenviron/gortsplib/v5/pkg/base"
 	"github.com/bluenviron/gortsplib/v5/pkg/format"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts"
+	tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs"
 	"github.com/pion/rtp"
 )
 
@@ -59,7 +60,7 @@ func main() {
 		fileName: "mystream.ts",
 		format:   forma,
 		track: &mpegts.Track{
-			Codec: &mpegts.CodecMPEG4Audio{
+			Codec: &tscodecs.MPEG4Audio{
 				Config: *forma.Config,
 			},
 		},
diff --git a/examples/client-play-format-opus-to-disk/main.go b/examples/client-play-format-opus-to-disk/main.go
@@ -8,6 +8,7 @@ import (
 	"github.com/bluenviron/gortsplib/v5/pkg/base"
 	"github.com/bluenviron/gortsplib/v5/pkg/format"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts"
+	tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs"
 	"github.com/pion/rtp"
 )
 
@@ -59,7 +60,7 @@ func main() {
 		fileName: "mystream.ts",
 		format:   forma,
 		track: &mpegts.Track{
-			Codec: &mpegts.CodecOpus{
+			Codec: &tscodecs.Opus{
 				ChannelCount: forma.ChannelCount,
 			},
 		},
diff --git a/examples/client-record-format-h264-from-disk/main.go b/examples/client-record-format-h264-from-disk/main.go
@@ -14,6 +14,7 @@ import (
 	"github.com/bluenviron/gortsplib/v5/pkg/description"
 	"github.com/bluenviron/gortsplib/v5/pkg/format"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts"
+	tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs"
 	"github.com/pion/rtp"
 )
 
@@ -25,7 +26,7 @@ import (
 
 func findTrack(r *mpegts.Reader) (*mpegts.Track, error) {
 	for _, track := range r.Tracks() {
-		if _, ok := track.Codec.(*mpegts.CodecH264); ok {
+		if _, ok := track.Codec.(*tscodecs.H264); ok {
 			return track, nil
 		}
 	}
diff --git a/examples/server-play-format-h264-from-disk/file_streamer.go b/examples/server-play-format-h264-from-disk/file_streamer.go
@@ -12,6 +12,7 @@ import (
 	"github.com/bluenviron/gortsplib/v5"
 	"github.com/bluenviron/gortsplib/v5/pkg/format"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts"
+	tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs"
 	"github.com/pion/rtp"
 )
 
@@ -26,7 +27,7 @@ func randUint32() (uint32, error) {
 
 func findTrack(r *mpegts.Reader) (*mpegts.Track, error) {
 	for _, track := range r.Tracks() {
-		if _, ok := track.Codec.(*mpegts.CodecH264); ok {
+		if _, ok := track.Codec.(*tscodecs.H264); ok {
 			return track, nil
 		}
 	}
diff --git a/examples/server-record-format-h264-to-disk/mpegts_muxer.go b/examples/server-record-format-h264-to-disk/mpegts_muxer.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/h264"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts"
+	tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs"
 )
 
 // mpegtsMuxer allows to save a H264 stream into a MPEG-TS file.
@@ -31,7 +32,7 @@ func (e *mpegtsMuxer) initialize() error {
 	e.b = bufio.NewWriter(e.f)
 
 	e.track = &mpegts.Track{
-		Codec: &mpegts.CodecH264{},
+		Codec: &tscodecs.H264{},
 	}
 
 	e.w = &mpegts.Writer{W: e.b, Tracks: []*mpegts.Track{e.track}}
diff --git a/go.mod b/go.mod
@@ -3,12 +3,12 @@ module github.com/bluenviron/gortsplib/v5
 go 1.24.0
 
 require (
-	github.com/bluenviron/mediacommon/v2 v2.5.3
+	github.com/bluenviron/mediacommon/v2 v2.6.0
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.3
 	github.com/pion/rtcp v1.2.16
-	github.com/pion/rtp v1.8.26
-	github.com/pion/sdp/v3 v3.0.16
+	github.com/pion/rtp v1.9.0
+	github.com/pion/sdp/v3 v3.0.17
 	github.com/pion/srtp/v3 v3.0.9
 	github.com/stretchr/testify v1.11.1
 	golang.org/x/net v0.48.0
diff --git a/go.sum b/go.sum
@@ -2,8 +2,8 @@ github.com/asticode/go-astikit v0.30.0 h1:DkBkRQRIxYcknlaU7W7ksNfn4gMFsB0tqMJflx
 github.com/asticode/go-astikit v0.30.0/go.mod h1:h4ly7idim1tNhaVkdVBeXQZEE3L0xblP7fCWbgwipF0=
 github.com/asticode/go-astits v1.14.0 h1:zkgnZzipx2XX5mWycqsSBeEyDH58+i4HtyF4j2ROb00=
 github.com/asticode/go-astits v1.14.0/go.mod h1:QSHmknZ51pf6KJdHKZHJTLlMegIrhega3LPWz3ND/iI=
-github.com/bluenviron/mediacommon/v2 v2.5.3 h1:espW+MsV1IYH6WE3QGa1UgPnIp13JuJG4VqGvoqseBU=
-github.com/bluenviron/mediacommon/v2 v2.5.3/go.mod h1:5V15TiOfeaNVmZPVuOqAwqQSWyvMV86/dijDKu5q9Zs=
+github.com/bluenviron/mediacommon/v2 v2.6.0 h1:wZAPXwv7V78Cx2x7cToYIHOLToHl6APcvHbdQT+gOkg=
+github.com/bluenviron/mediacommon/v2 v2.6.0/go.mod h1:5V15TiOfeaNVmZPVuOqAwqQSWyvMV86/dijDKu5q9Zs=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -17,10 +17,10 @@ github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
 github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
 github.com/pion/rtcp v1.2.16 h1:fk1B1dNW4hsI78XUCljZJlC4kZOPk67mNRuQ0fcEkSo=
 github.com/pion/rtcp v1.2.16/go.mod h1:/as7VKfYbs5NIb4h6muQ35kQF/J0ZVNz2Z3xKoCBYOo=
-github.com/pion/rtp v1.8.26 h1:VB+ESQFQhBXFytD+Gk8cxB6dXeVf2WQzg4aORvAvAAc=
-github.com/pion/rtp v1.8.26/go.mod h1:rF5nS1GqbR7H/TCpKwylzeq6yDM+MM6k+On5EgeThEM=
-github.com/pion/sdp/v3 v3.0.16 h1:0dKzYO6gTAvuLaAKQkC02eCPjMIi4NuAr/ibAwrGDCo=
-github.com/pion/sdp/v3 v3.0.16/go.mod h1:9tyKzznud3qiweZcD86kS0ff1pGYB3VX+Bcsmkx6IXo=
+github.com/pion/rtp v1.9.0 h1:NL2nGZPXhjnTQGRgsDZRv0ZTo0Or5fkjCy9o9PtBHBU=
+github.com/pion/rtp v1.9.0/go.mod h1:rF5nS1GqbR7H/TCpKwylzeq6yDM+MM6k+On5EgeThEM=
+github.com/pion/sdp/v3 v3.0.17 h1:9SfLAW/fF1XC8yRqQ3iWGzxkySxup4k4V7yN8Fs8nuo=
+github.com/pion/sdp/v3 v3.0.17/go.mod h1:9tyKzznud3qiweZcD86kS0ff1pGYB3VX+Bcsmkx6IXo=
 github.com/pion/srtp/v3 v3.0.9 h1:lRGF4G61xxj+m/YluB3ZnBpiALSri2lTzba0kGZMrQY=
 github.com/pion/srtp/v3 v3.0.9/go.mod h1:E+AuWd7Ug2Fp5u38MKnhduvpVkveXJX6J4Lq4rxUYt8=
 github.com/pion/transport/v3 v3.1.1 h1:Tr684+fnnKlhPceU+ICdrw6KKkTms+5qHMgw6bIkYOM=
diff --git a/pkg/auth/verify.go b/pkg/auth/verify.go
@@ -31,11 +31,11 @@ func urlMatches(expected string, received string, isSetup bool) bool {
 		return true
 	}
 
-	// in SETUP requests, VLC uses the base URL of the stream
-	// instead of the URL of the track.
-	// Strip the control attribute to obtain the URL of the stream.
+	// in SETUP requests, some clients do not use the track URL:
+	// - VLC uses the stream base URL (with trailing slash)
+	// - HappyTime NVR uses the stream URL (without trailing slash)
 	if isSetup {
-		if m := reControlAttribute.FindStringSubmatch(expected); m != nil && received == m[1] {
+		if m := reControlAttribute.FindStringSubmatch(expected); m != nil && (received == m[1] || (received+"/") == m[1]) {
 			return true
 		}
 	}
diff --git a/pkg/auth/verify_test.go b/pkg/auth/verify_test.go
@@ -48,6 +48,13 @@ var casesVerify = []struct {
 				"uri=\"rtsp://myhost/mypath?key=val/\", response=\"5ca5ceeca20a05e9a3f49ecde4b42655\"",
 		},
 	},
+	{
+		"digest happytime",
+		base.HeaderValue{
+			`Digest username="myuser", realm="myrealm", nonce="f49ac6dd0ba708d4becddc9692d1f2ce", ` +
+				`uri="rtsp://myhost/mypath?key=val", response="c11a6e92b449f221dabf494a7a837ee3"`,
+		},
+	},
 }
 
 func TestVerify(t *testing.T) {
diff --git a/pkg/description/session.go b/pkg/description/session.go
@@ -21,7 +21,7 @@ func atLeastOneHasMID(medias []*Media) bool {
 	return false
 }
 
-func atLeastOneDoesntHaveMID(medias []*Media) bool {
+func atLeastOneDoesNotHaveMID(medias []*Media) bool {
 	for _, media := range medias {
 		if media.ID == "" {
 			return true
@@ -30,6 +30,24 @@ func atLeastOneDoesntHaveMID(medias []*Media) bool {
 	return false
 }
 
+func atLeastOneIsNotBackChannel(medias []*Media) bool {
+	for _, media := range medias {
+		if !media.IsBackChannel {
+			return true
+		}
+	}
+	return false
+}
+
+func atLeastOneIsBackChannel(medias []*Media) bool {
+	for _, media := range medias {
+		if media.IsBackChannel {
+			return true
+		}
+	}
+	return false
+}
+
 func hasMediaWithID(medias []*Media, id string) bool {
 	for _, media := range medias {
 		if media.ID == id {
@@ -119,10 +137,19 @@ func (d *Session) Unmarshal(ssd *sdp.SessionDescription) error {
 		d.Medias[i] = &m
 	}
 
-	if atLeastOneHasMID(d.Medias) && atLeastOneDoesntHaveMID(d.Medias) {
+	if atLeastOneHasMID(d.Medias) && atLeastOneDoesNotHaveMID(d.Medias) {
 		return fmt.Errorf("media IDs sent partially")
 	}
 
+	// Some cameras mark medias as back channels even though they are not.
+	// Try to detect this by checking whether in the full SDP there are both
+	// back channels and standard channels, unmarking back channels otherwise.
+	if !atLeastOneIsNotBackChannel(d.Medias) {
+		for _, m := range d.Medias {
+			m.IsBackChannel = false
+		}
+	}
+
 	for _, attr := range ssd.Attributes {
 		if attr.Key == "group" && strings.HasPrefix(attr.Value, "FEC ") {
 			group := SessionFECGroup(strings.Split(attr.Value[len("FEC "):], " "))
@@ -197,12 +224,20 @@ func (d Session) Marshal() ([]byte, error) {
 	}
 
 	sout.MediaDescriptions = make([]*psdp.MediaDescription, len(d.Medias))
+	atLeastOneIsBackChannel := atLeastOneIsBackChannel(d.Medias)
 
 	for i, media := range d.Medias {
 		med, err := media.Marshal()
 		if err != nil {
 			return nil, err
 		}
+
+		if !media.IsBackChannel && atLeastOneIsBackChannel {
+			med.Attributes = append(med.Attributes, psdp.Attribute{
+				Key: "recvonly",
+			})
+		}
+
 		sout.MediaDescriptions[i] = med
 	}
 
diff --git a/pkg/description/session_test.go b/pkg/description/session_test.go
diff --git a/server_record_test.go b/server_record_test.go

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`"github.com/bluenviron/gortsplib/v5/pkg/format"`
`9`	`9`	`"github.com/bluenviron/mediacommon/v2/pkg/codecs/h264"`
`10`	`10`	`"github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts"`
	`11`	`+ tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs"`
`11`	`12`	`)`
`12`	`13`
`13`	`14`	`func multiplyAndDivide(v, m, d int64) int64 {`
`@@ -41,11 +42,11 @@ func (e *mpegtsMuxer) initialize() error {`
`41`	`42`	`e.b = bufio.NewWriter(e.f)`
`42`	`43`
`43`	`44`	`e.h264Track = &mpegts.Track{`
`44`		`- Codec: &mpegts.CodecH264{},`
	`45`	`+ Codec: &tscodecs.H264{},`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`e.mpeg4AudioTrack = &mpegts.Track{`
`48`		`- Codec: &mpegts.CodecMPEG4Audio{`
	`49`	`+ Codec: &tscodecs.MPEG4Audio{`
`49`	`50`	`Config: *e.mpeg4AudioFormat.Config,`
`50`	`51`	`},`
`51`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`"github.com/bluenviron/mediacommon/v2/pkg/codecs/h264"`
`8`	`8`	`"github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts"`
	`9`	`+ tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs"`
`9`	`10`	`)`
`10`	`11`
`11`	`12`	`// mpegtsMuxer allows to save a H264 stream into a MPEG-TS file.`
`@@ -31,7 +32,7 @@ func (e *mpegtsMuxer) initialize() error {`
`31`	`32`	`e.b = bufio.NewWriter(e.f)`
`32`	`33`
`33`	`34`	`e.track = &mpegts.Track{`
`34`		`- Codec: &mpegts.CodecH264{},`
	`35`	`+ Codec: &tscodecs.H264{},`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`e.w = &mpegts.Writer{W: e.b, Tracks: []*mpegts.Track{e.track}}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import (`
`14`	`14`	`"github.com/bluenviron/gortsplib/v5/pkg/description"`
`15`	`15`	`"github.com/bluenviron/gortsplib/v5/pkg/format"`
`16`	`16`	`"github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts"`
	`17`	`+ tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs"`
`17`	`18`	`"github.com/pion/rtp"`
`18`	`19`	`)`
`19`	`20`
`@@ -25,7 +26,7 @@ import (`
`25`	`26`
`26`	`27`	`func findTrack(r mpegts.Reader) (mpegts.Track, error) {`
`27`	`28`	`for _, track := range r.Tracks() {`
`28`		`- if _, ok := track.Codec.(*mpegts.CodecH264); ok {`
	`29`	`+ if _, ok := track.Codec.(*tscodecs.H264); ok {`
`29`	`30`	`return track, nil`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import (`
`12`	`12`	`"github.com/bluenviron/gortsplib/v5"`
`13`	`13`	`"github.com/bluenviron/gortsplib/v5/pkg/format"`
`14`	`14`	`"github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts"`
	`15`	`+ tscodecs "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts/codecs"`
`15`	`16`	`"github.com/pion/rtp"`
`16`	`17`	`)`
`17`	`18`
`@@ -26,7 +27,7 @@ func randUint32() (uint32, error) {`
`26`	`27`
`27`	`28`	`func findTrack(r mpegts.Reader) (mpegts.Track, error) {`
`28`	`29`	`for _, track := range r.Tracks() {`
`29`		`- if _, ok := track.Codec.(*mpegts.CodecH264); ok {`
	`30`	`+ if _, ok := track.Codec.(*tscodecs.H264); ok {`
`30`	`31`	`return track, nil`
`31`	`32`	`}`
`32`	`33`	`}`