package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-06 07:37:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

generate RTCP receiver reports even before receiving RTCP sender reports (#318)

Browse Source 
(https://github.com/bluenviron/mediamtx/issues/1739)
This commit is contained in:
Alessandro Ros
2023-06-26 10:58:02 +02:00
committed by GitHub
parent bf33316d0f
commit 22c2c72ef1
1 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
pkg/rtcpreceiver/rtcpreceiver.go
View File

@@ -27,22 +27,22 @@ type RTCPReceiver struct {
mutex sync.Mutex mutex sync.Mutex
// data from RTP packets // data from RTP packets
initialized bool firstRTPPacketReceived bool
timeInitialized bool timeInitialized bool
sequenceNumberCycles uint16 sequenceNumberCycles uint16
lastSSRC uint32 lastSSRC uint32
lastSequenceNumber uint16 lastSequenceNumber uint16
lastTimeRTP uint32 lastTimeRTP uint32
lastTimeNTP time.Time lastTimeNTP time.Time
totalLost uint32 totalLost uint32
totalLostSinceReport uint32 totalLostSinceReport uint32
totalSinceReport uint32 totalSinceReport uint32
jitter float64 jitter float64
// data from RTCP packets // data from RTCP packets
senderInitialized bool firstSenderReportReceived bool
lastSenderReportNTP uint32 lastSenderReportNTP uint32
lastSenderReportTime time.Time lastSenderReportTime time.Time
terminate chan struct{} terminate chan struct{}
done chan struct{} done chan struct{}
@@ -104,7 +104,7 @@ func (rr *RTCPReceiver) report(ts time.Time) rtcp.Packet {
rr.mutex.Lock() rr.mutex.Lock()
defer rr.mutex.Unlock() defer rr.mutex.Unlock()
if !rr.senderInitialized || !rr.initialized || rr.clockRate == 0 { if !rr.firstRTPPacketReceived || rr.clockRate == 0 {
return nil return nil
} }
@@ -114,21 +114,25 @@ func (rr *RTCPReceiver) report(ts time.Time) rtcp.Packet {
{ {
SSRC: rr.lastSSRC, SSRC: rr.lastSSRC,
LastSequenceNumber: uint32(rr.sequenceNumberCycles)<<16 | uint32(rr.lastSequenceNumber), LastSequenceNumber: uint32(rr.sequenceNumberCycles)<<16 | uint32(rr.lastSequenceNumber),
// middle 32 bits out of 64 in the NTP timestamp of last sender report
LastSenderReport: rr.lastSenderReportNTP,
// equivalent to taking the integer part after multiplying the // equivalent to taking the integer part after multiplying the
// loss fraction by 256 // loss fraction by 256
FractionLost: uint8(float64(rr.totalLostSinceReport*256) / float64(rr.totalSinceReport)), FractionLost: uint8(float64(rr.totalLostSinceReport*256) / float64(rr.totalSinceReport)),
TotalLost: rr.totalLost, TotalLost: rr.totalLost,
// delay, expressed in units of 1/65536 seconds, between Jitter: uint32(rr.jitter),
// receiving the last SR packet from source SSRC_n and sending this
// reception report block
Delay: uint32(ts.Sub(rr.lastSenderReportTime).Seconds() * 65536),
Jitter: uint32(rr.jitter),
}, },
}, },
} }
if rr.firstSenderReportReceived {
// middle 32 bits out of 64 in the NTP timestamp of last sender report
report.Reports[0].LastSenderReport = rr.lastSenderReportNTP
// delay, expressed in units of 1/65536 seconds, between
// receiving the last SR packet from source SSRC_n and sending this
// reception report block
report.Reports[0].Delay = uint32(ts.Sub(rr.lastSenderReportTime).Seconds() * 65536)
}
rr.totalLostSinceReport = 0 rr.totalLostSinceReport = 0
rr.totalSinceReport = 0 rr.totalSinceReport = 0
@@ -141,8 +145,8 @@ func (rr *RTCPReceiver) ProcessPacket(pkt *rtp.Packet, ntp time.Time, ptsEqualsD
defer rr.mutex.Unlock() defer rr.mutex.Unlock()
// first packet // first packet
if !rr.initialized { if !rr.firstRTPPacketReceived {
rr.initialized = true rr.firstRTPPacketReceived = true
rr.totalSinceReport = 1 rr.totalSinceReport = 1
rr.lastSSRC = pkt.SSRC rr.lastSSRC = pkt.SSRC
rr.lastSequenceNumber = pkt.SequenceNumber rr.lastSequenceNumber = pkt.SequenceNumber
@@ -205,7 +209,7 @@ func (rr *RTCPReceiver) ProcessSenderReport(sr *rtcp.SenderReport, ts time.Time)
rr.mutex.Lock() rr.mutex.Lock()
defer rr.mutex.Unlock() defer rr.mutex.Unlock()
rr.senderInitialized = true rr.firstSenderReportReceived = true
rr.lastSenderReportNTP = uint32(sr.NTPTime >> 16) rr.lastSenderReportNTP = uint32(sr.NTPTime >> 16)
rr.lastSenderReportTime = ts rr.lastSenderReportTime = ts
} }
@@ -214,5 +218,5 @@ func (rr *RTCPReceiver) ProcessSenderReport(sr *rtcp.SenderReport, ts time.Time)
func (rr *RTCPReceiver) LastSSRC() (uint32, bool) { func (rr *RTCPReceiver) LastSSRC() (uint32, bool) {
rr.mutex.Lock() rr.mutex.Lock()
defer rr.mutex.Unlock() defer rr.mutex.Unlock()
return rr.lastSSRC, rr.initialized return rr.lastSSRC, rr.firstRTPPacketReceived
} }