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

rtsp server: generate RTCP sender reports automatically; stop routing RTCP packets

Browse source
This commit is contained in:
aler9 2022-03-24 15:38:54 +01:00
parent a6986e9fa4
commit f53b316c0d
13 changed files with 8 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/core/hls_source.go
View file

@ -11,7 +11,6 @@ import (
"github.com/aler9/rtsp-simple-server/internal/hls"
"github.com/aler9/rtsp-simple-server/internal/logger"
"github.com/aler9/rtsp-simple-server/internal/rtcpsenderset"
)
const (
@ -90,7 +89,6 @@ outer:
func (s *hlsSource) runInner() bool {
var stream *stream
var rtcpSenders *rtcpsenderset.RTCPSenderSet
var videoTrackID int
var audioTrackID int
var videoEnc *rtph264.Encoder
@ -99,7 +97,6 @@ func (s *hlsSource) runInner() bool {
defer func() {
if stream != nil {
s.parent.onSourceStaticSetNotReady(pathSourceStaticSetNotReadyReq{source: s})
rtcpSenders.Close()
}
}()
@ -134,7 +131,6 @@ func (s *hlsSource) runInner() bool {
s.Log(logger.Info, "ready")
stream = res.stream
rtcpSenders = rtcpsenderset.New(tracks, stream.writePacketRTCP)
return nil
}
@ -150,7 +146,6 @@ func (s *hlsSource) runInner() bool {
}
for _, pkt := range pkts {
rtcpSenders.OnPacketRTP(videoTrackID, pkt)
stream.writePacketRTP(videoTrackID, pkt)
}
}
@ -166,7 +161,6 @@ func (s *hlsSource) runInner() bool {
}
for _, pkt := range pkts {
rtcpSenders.OnPacketRTP(audioTrackID, pkt)
stream.writePacketRTP(audioTrackID, pkt)
}
}