dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-08-23 22:49:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix skipped packets accounting. (#4604)

Browse Source 
* Fix skipped packets accounting.

No need to copy unskipped packet RTP header to skipped packet.
That was causing padding bytes to be counted.

Also use Header.PaddingSize as base PaddingSize is deprecated.

* PaddingSize in header in utils
This commit is contained in:
Raja Subramanian
2026-06-18 11:58:39 +05:30
committed by GitHub
parent b882ccc86d
commit c6303bb15a
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sfu/buffer/buffer_base.go
+11 -16
View File
@@ -742,25 +742,20 @@ func (b *BufferBase) HandleIncomingPacketLocked(
b.processAudioSsrcLevelHeaderExtension(rtpPacket, arrivalTime)
if len(skippedSeqs) > 0 {
skippedRtpPkt := rtp.Packet{
Header: rtpPacket.Header,
}
skippedRtpPkt.Marker = false
// Use the current highest timestamp to prevent the case of old sequence number and newer timestamp.
// It is possible that the skipped packet is older. An example sequence
// - Packet 10, skipped 6, 7, 9 -> Packet 8 is unknown at this point
// - Packet 11, skipped 8 -> this would cause sequence number be older, but using timestamp from Packet 11 will make time stamp diff +ve
skippedRtpPkt.Timestamp = b.rtpStats.HighestTimestamp()
// - Packet 11, skipped 8 -> this would cause sequence number to be older, but using timestamp from Packet 11 will make time stamp diff +ve
ts := b.rtpStats.HighestTimestamp()
for _, sn := range skippedSeqs {
skippedRtpPkt.SequenceNumber = sn
flowState := b.rtpStats.Update(
arrivalTime,
skippedRtpPkt.Header.SequenceNumber,
skippedRtpPkt.Header.Timestamp,
skippedRtpPkt.Header.Marker,
skippedRtpPkt.Header.MarshalSize(),
len(skippedRtpPkt.Payload),
int(skippedRtpPkt.PaddingSize),
sn,
ts,
false, // no marker
0, // no header for skipped packet, so 0 size
0, // no payload
0, // no padding
)
if flowState.UnhandledReason == rtpstats.RTPFlowUnhandledReasonNone && !flowState.IsOutOfOrder {
if err := b.snRangeMap.ExcludeRange(flowState.ExtSequenceNumber, flowState.ExtSequenceNumber+1); err != nil {
@@ -790,7 +785,7 @@ func (b *BufferBase) HandleIncomingPacketLocked(
rtpPacket.Header.Marker,
rtpPacket.Header.MarshalSize(),
len(rtpPacket.Payload),
int(rtpPacket.PaddingSize),
int(rtpPacket.Header.PaddingSize),
)
switch flowState.UnhandledReason {
case rtpstats.RTPFlowUnhandledReasonNone:
@@ -808,7 +803,7 @@ func (b *BufferBase) HandleIncomingPacketLocked(
rtpPacket.Header.Marker,
rtpPacket.Header.MarshalSize(),
len(rtpPacket.Payload),
int(rtpPacket.PaddingSize),
int(rtpPacket.Header.PaddingSize),
)
default:
return 0, fmt.Errorf("unhandled reason: %s", flowState.UnhandledReason.String())
@@ -866,7 +861,7 @@ func (b *BufferBase) HandleIncomingPacketLocked(
"timestamp", rtpPacket.Timestamp,
"extTimestamp", flowState.ExtTimestamp,
"payloadSize", len(rtpPacket.Payload),
"paddingSize", rtpPacket.PaddingSize,
"paddingSize", rtpPacket.Header.PaddingSize,
"rtpStats", b.rtpStats,
"rtpStatsLite", b.rtpStatsLite,
"snRangeMap", b.snRangeMap,
pkg/sfu/testutils/data.go
+2 -2
View File
@@ -54,9 +54,9 @@ func GetTestExtPacket(params *TestExtPacketParams) (*buffer.ExtPacket, error) {
SequenceNumber: params.SequenceNumber,
Timestamp: params.Timestamp,
SSRC: params.SSRC,
PaddingSize: params.PaddingSize,
},
Payload: make([]byte, params.PayloadSize),
PaddingSize: params.PaddingSize,
Payload: make([]byte, params.PayloadSize),
}
raw, err := packet.Marshal()