servius/songbird
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix(receive): Handle sleds of identical RTP timestamps (#249)

Browse Source 
Bots joining calls with users seem to provoke large runs of packets
with identical timestamps -- the existing logic was intended to handle this catchup case in addition to the normal (+=960) at all
times.

However, we were checking that a packet was modulo greater-than
the next ts, rather than modulo less-than. Simple enough to fix.
This commit is contained in:
Kyle Simpson
2024-08-24 22:38:09 +01:00
committed by GitHub
parent ec665a8f87
commit 530286c6a6
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -42,7 +42,7 @@ simd-json = { features = ["serde_impl"], optional = true, version = "0.13" }
socket2 = { optional = true, version = "0.5" } socket2 = { optional = true, version = "0.5" }
streamcatcher = { optional = true, version = "1" } streamcatcher = { optional = true, version = "1" }
stream_lib = { default-features = false, optional = true, version = "0.4.2" } stream_lib = { default-features = false, optional = true, version = "0.4.2" }
symphonia = { default_features = false, optional = true, version = "0.5.2" } symphonia = { default-features = false, optional = true, version = "0.5.2" }
symphonia-core = { optional = true, version = "0.5.2" } symphonia-core = { optional = true, version = "0.5.2" }
tokio = { default-features = false, optional = true, version = "1.0" } tokio = { default-features = false, optional = true, version = "1.0" }
tokio-tungstenite = { optional = true, version = "0.21" } tokio-tungstenite = { optional = true, version = "0.21" }

13
src/driver/tasks/udp_rx/playout_buffer.rs
View File

@@ -77,7 +77,7 @@ impl PlayoutBuffer {
if desired_index < 0 { if desired_index < 0 {
trace!("Missed packet arrived late, discarding from playout."); trace!("Missed packet arrived late, discarding from playout.");
} else if desired_index >= 64 { } else if desired_index >= 64 {
trace!("Packet arrived beyond playout max length."); trace!("Packet arrived beyond playout max length: wanted slot {desired_index}.");
} else { } else {
let index = desired_index as usize; let index = desired_index as usize;
while self.buffer.len() <= index { while self.buffer.len() <= index {
@@ -101,10 +101,15 @@ impl PlayoutBuffer {
let rtp = RtpPacket::new(&pkt.packet) let rtp = RtpPacket::new(&pkt.packet)
.expect("FATAL: earlier valid packet now invalid (fetch)"); .expect("FATAL: earlier valid packet now invalid (fetch)");
// The curr_ts captures the current playout point; we want to
// be able to emit *all* packets with a smaller timestamp.
// However, we need to handle this in a wrap-safe way.
// ts_diff shows where the current time lies if we treat packet_ts
// as 0, s.t. ts_diff >= 0 (equiv) packet_time <= curr_time.
let curr_ts = self.current_timestamp.unwrap(); let curr_ts = self.current_timestamp.unwrap();
let ts_diff = curr_ts - rtp.get_timestamp().0; let ts_diff = (curr_ts - rtp.get_timestamp().0).0 as i32;
if (ts_diff.0 as i32) <= 0 { if ts_diff >= 0 {
self.next_seq = (rtp.get_sequence() + 1).0; self.next_seq = (rtp.get_sequence() + 1).0;
PacketLookup::Packet(pkt) PacketLookup::Packet(pkt)
@@ -142,5 +147,5 @@ impl PlayoutBuffer {
#[inline] #[inline]
fn reset_timeout(packet: &RtpPacket<'_>, config: &Config) -> RtpTimestamp { fn reset_timeout(packet: &RtpPacket<'_>, config: &Config) -> RtpTimestamp {
let t_shift = MONO_FRAME_SIZE * config.playout_buffer_length.get(); let t_shift = MONO_FRAME_SIZE * config.playout_buffer_length.get();
(packet.get_timestamp() - (t_shift as u32)).0 (packet.get_timestamp() + (t_shift as u32)).0
} }