CEF/mediamtx
1
0
Fork 0
forked from External/mediamtx
Code Pull requests Activity

RTSP client/source: support dynamic H264 SPS/PPS

Browse source
This commit is contained in:
aler9 2022-03-06 15:50:03 +01:00 • committed by Alessandro Ros
parent d929197b21
commit 4d6f8b9b9b
2 changed files with 80 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

105
internal/core/rtsp_source_test.go
View file

@ -216,7 +216,7 @@ func TestRTSPSourceNoPassword(t *testing.T) {
<-done
}
func TestRTSPSourceMissingH264Params(t *testing.T) {
func TestRTSPSourceDynamicH264Params(t *testing.T) {
track, err := gortsplib.NewTrackH264(96, nil, nil, nil)
require.NoError(t, err)
@ -235,35 +235,6 @@ func TestRTSPSourceMissingH264Params(t *testing.T) {
}, stream, nil
},
onPlay: func(ctx *gortsplib.ServerHandlerOnPlayCtx) (*base.Response, error) {
go func() {
time.Sleep(500 * time.Millisecond)
enc := &rtph264.Encoder{PayloadType: 96}
enc.Init()
pkts, err := enc.Encode([][]byte{{5}}, 0) // IDR
require.NoError(t, err)
stream.WritePacketRTP(0, pkts[0], true)
pkts, err = enc.Encode([][]byte{{7, 1, 2, 3}}, 0) // SPS
require.NoError(t, err)
stream.WritePacketRTP(0, pkts[0], true)
pkts, err = enc.Encode([][]byte{{8}}, 0) // PPS
require.NoError(t, err)
stream.WritePacketRTP(0, pkts[0], true)
pkts, err = enc.Encode([][]byte{{5, 1}}, 0) // IDR
require.NoError(t, err)
stream.WritePacketRTP(0, pkts[0], true)
time.Sleep(500 * time.Millisecond)
pkts, err = enc.Encode([][]byte{{5, 2}}, 0) // IDR
require.NoError(t, err)
stream.WritePacketRTP(0, pkts[0], true)
}()
return &base.Response{
StatusCode: base.StatusOK,
}, nil
@ -280,32 +251,66 @@ func TestRTSPSourceMissingH264Params(t *testing.T) {
"hlsDisable: yes\n" +
"paths:\n" +
" proxied:\n" +
" source: rtsp://127.0.0.1:8555/teststream\n" +
" sourceOnDemand: yes\n")
" source: rtsp://127.0.0.1:8555/teststream\n")
require.Equal(t, true, ok)
defer p.close()
received := make(chan struct{})
time.Sleep(1 * time.Second)
c := gortsplib.Client{
OnPacketRTP: func(ctx *gortsplib.ClientOnPacketRTPCtx) {
if ctx.H264NALUs == nil {
return
}
enc := &rtph264.Encoder{PayloadType: 96}
enc.Init()
require.Equal(t, [][]byte{{0x05, 0x02}}, ctx.H264NALUs)
close(received)
},
}
err = c.StartReading("rtsp://127.0.0.1:8554/proxied")
pkts, err := enc.Encode([][]byte{{7, 1, 2, 3}}, 0) // SPS
require.NoError(t, err)
defer c.Close()
stream.WritePacketRTP(0, pkts[0], true)
h264Track, ok := c.Tracks()[0].(*gortsplib.TrackH264)
require.Equal(t, true, ok)
require.Equal(t, []byte{7, 1, 2, 3}, h264Track.SPS())
require.Equal(t, []byte{8}, h264Track.PPS())
pkts, err = enc.Encode([][]byte{{8}}, 0) // PPS
require.NoError(t, err)
stream.WritePacketRTP(0, pkts[0], true)
<-received
func() {
c := gortsplib.Client{}
u, err := base.ParseURL("rtsp://127.0.0.1:8554/proxied")
require.NoError(t, err)
err = c.Start(u.Scheme, u.Host)
require.NoError(t, err)
defer c.Close()
tracks, _, _, err := c.Describe(u)
require.NoError(t, err)
h264Track, ok := tracks[0].(*gortsplib.TrackH264)
require.Equal(t, true, ok)
require.Equal(t, []byte{7, 1, 2, 3}, h264Track.SPS())
require.Equal(t, []byte{8}, h264Track.PPS())
}()
pkts, err = enc.Encode([][]byte{{7, 4, 5, 6}}, 0) // SPS
require.NoError(t, err)
stream.WritePacketRTP(0, pkts[0], true)
pkts, err = enc.Encode([][]byte{{8, 1}}, 0) // PPS
require.NoError(t, err)
stream.WritePacketRTP(0, pkts[0], true)
func() {
c := gortsplib.Client{}
u, err := base.ParseURL("rtsp://127.0.0.1:8554/proxied")
require.NoError(t, err)
err = c.Start(u.Scheme, u.Host)
require.NoError(t, err)
defer c.Close()
tracks, _, _, err := c.Describe(u)
require.NoError(t, err)
h264Track, ok := tracks[0].(*gortsplib.TrackH264)
require.Equal(t, true, ok)
require.Equal(t, []byte{7, 4, 5, 6}, h264Track.SPS())
require.Equal(t, []byte{8, 1}, h264Track.PPS())
}()
}

25
internal/core/stream.go
View file

@ -1,9 +1,11 @@
package core
import (
"bytes"
"sync"
"github.com/aler9/gortsplib"
"github.com/aler9/gortsplib/pkg/h264"
)
type streamNonRTSPReadersMap struct {
@ -78,7 +80,30 @@ func (s *stream) readerRemove(r reader) {
}
}
func (s *stream) updateH264TrackParameters(h264track *gortsplib.TrackH264, nalus [][]byte) {
for _, nalu := range nalus {
typ := h264.NALUType(nalu[0] & 0x1F)
switch typ {
case h264.NALUTypeSPS:
if !bytes.Equal(nalu, h264track.SPS()) {
h264track.SetSPS(append([]byte(nil), nalu...))
}
case h264.NALUTypePPS:
if !bytes.Equal(nalu, h264track.PPS()) {
h264track.SetPPS(append([]byte(nil), nalu...))
}
}
}
}
func (s *stream) writeData(trackID int, data *data) {
track := s.rtspStream.Tracks()[trackID]
if h264track, ok := track.(*gortsplib.TrackH264); ok {
s.updateH264TrackParameters(h264track, data.h264NALUs)
}
// forward to RTSP readers
s.rtspStream.WritePacketRTP(trackID, data.rtp, data.ptsEqualsDTS)