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

implement packet reordering for UDP / Multicast transports (#132)

Browse Source 
* implement packet reordering for UDP transport

* rtcpreceiver: stop handling unordered / duplicate packets

* remote useless Sleep() from tests
This commit is contained in:
Alessandro Ros
2022-07-05 23:29:03 +02:00
committed by GitHub
parent c6221476fc
commit df7336b5e8
12 changed files with 376 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
pkg/rtcpreceiver/rtcpreceiver.go
View File

@@ -151,49 +151,45 @@ func (rr *RTCPReceiver) ProcessPacketRTP(ts time.Time, pkt *rtp.Packet, ptsEqual
} else {
diff := int32(pkt.Header.SequenceNumber) - int32(*rr.lastSequenceNumber)
// following packet or following packet after an overflow
if diff > 0 || diff < -0x0FFF {
// overflow
if diff < -0x0FFF {
rr.sequenceNumberCycles++
// overflow
if diff < -0x0FFF {
rr.sequenceNumberCycles++
}
// detect lost packets
if pkt.Header.SequenceNumber != (*rr.lastSequenceNumber + 1) {
rr.totalLost += uint32(uint16(diff) - 1)
rr.totalLostSinceReport += uint32(uint16(diff) - 1)
// allow up to 24 bits
if rr.totalLost > 0xFFFFFF {
rr.totalLost = 0xFFFFFF
}
// detect lost packets
if pkt.Header.SequenceNumber != (*rr.lastSequenceNumber + 1) {
rr.totalLost += uint32(uint16(diff) - 1)
rr.totalLostSinceReport += uint32(uint16(diff) - 1)
// allow up to 24 bits
if rr.totalLost > 0xFFFFFF {
rr.totalLost = 0xFFFFFF
}
if rr.totalLostSinceReport > 0xFFFFFF {
rr.totalLostSinceReport = 0xFFFFFF
}
}
rr.totalSinceReport += uint32(uint16(diff))
v := pkt.Header.SequenceNumber
rr.lastSequenceNumber = &v
if ptsEqualsDTS {
if rr.lastRTPTimeRTP != nil {
// update jitter
// https://tools.ietf.org/html/rfc3550#page-39
D := ts.Sub(rr.lastRTPTimeTime).Seconds()*rr.clockRate -
(float64(pkt.Header.Timestamp) - float64(*rr.lastRTPTimeRTP))
if D < 0 {
D = -D
}
rr.jitter += (D - rr.jitter) / 16
}
v := pkt.Header.Timestamp
rr.lastRTPTimeRTP = &v
rr.lastRTPTimeTime = ts
if rr.totalLostSinceReport > 0xFFFFFF {
rr.totalLostSinceReport = 0xFFFFFF
}
}
// ignore invalid packets (diff = 0) or reordered packets (diff < 0)
rr.totalSinceReport += uint32(uint16(diff))
v := pkt.Header.SequenceNumber
rr.lastSequenceNumber = &v
if ptsEqualsDTS {
if rr.lastRTPTimeRTP != nil {
// update jitter
// https://tools.ietf.org/html/rfc3550#page-39
D := ts.Sub(rr.lastRTPTimeTime).Seconds()*rr.clockRate -
(float64(pkt.Header.Timestamp) - float64(*rr.lastRTPTimeRTP))
if D < 0 {
D = -D
}
rr.jitter += (D - rr.jitter) / 16
}
v := pkt.Header.Timestamp
rr.lastRTPTimeRTP = &v
rr.lastRTPTimeTime = ts
}
}
}