From 73e29cb07bcc721fbdc0c6a5b75ff5ec263c95c0 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Fri, 19 Jun 2026 17:54:49 +0100 Subject: [PATCH] Pace Muninn RUDP media sends --- crates/muninn-daemon/src/main.rs | 62 ++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/crates/muninn-daemon/src/main.rs b/crates/muninn-daemon/src/main.rs index 173f9ef..a82fc54 100644 --- a/crates/muninn-daemon/src/main.rs +++ b/crates/muninn-daemon/src/main.rs @@ -75,6 +75,8 @@ const MUNINN_RUDP_MEDIA_REPAIR_MAX_CHUNKS_PER_SECOND: usize = 4_096; const MUNINN_RUDP_MEDIA_REPAIR_ADD_CHUNKS_PER_SECOND: usize = 256; const MUNINN_RUDP_MEDIA_REPAIR_RECOVERY_INTERVAL_MS: u64 = 2_000; const MUNINN_RUDP_MEDIA_SOCKET_BUFFER_BYTES: usize = 4 * 1024 * 1024; +const MUNINN_RUDP_MEDIA_SEND_PACE_EVERY_PAYLOADS: usize = 16; +const MUNINN_RUDP_MEDIA_SEND_PACE_SLEEP_US: u64 = 500; const MUNINN_RUDP_ACTIVE_CATALOG_REPUBLISH_MS: u64 = 2_000; const PS_MOVE_LED_REPORT_LEN: usize = 49; @@ -167,6 +169,8 @@ struct MuninnRudpMediaProfile { sender_queue_deadline_ms: u64, sender_resend_delay_ms: u64, sender_reliable_expire_after_ms: u64, + sender_pace_every_payloads: usize, + sender_pace_sleep_us: u64, receiver_assembly_deadline_ms: u64, receiver_gap_wait_ms: u64, } @@ -1414,6 +1418,10 @@ fn run_rudp_mux_once( MUNINN_RUDP_MEDIA_REPAIR_INITIAL_CHUNKS_PER_SECOND, MUNINN_RUDP_MEDIA_REPAIR_BURST_CHUNKS, ); + let mut send_pacer = MuninnRudpMediaSendPacer::new( + media_profile.sender_pace_every_payloads, + Duration::from_micros(media_profile.sender_pace_sleep_us), + ); let result = loop { match payload_rx.recv_timeout(Duration::from_millis(5)) { Ok(Ok(queued)) => { @@ -1429,6 +1437,7 @@ fn run_rudp_mux_once( &repair_cache, &mut repair_budget, &media_profile, + &mut send_pacer, payloads_dropped, )?; record_receiver_keyframe_pressure( @@ -1466,6 +1475,7 @@ fn run_rudp_mux_once( queued.payload.clone(), queued.queued_at, Duration::from_millis(media_profile.sender_queue_deadline_ms), + &mut send_pacer, )? { payloads_dropped += 1; continue; @@ -1477,6 +1487,7 @@ fn run_rudp_mux_once( &repair_cache, &mut repair_budget, &media_profile, + &mut send_pacer, payloads_dropped, )?; record_receiver_keyframe_pressure( @@ -1515,6 +1526,7 @@ fn run_rudp_mux_once( &repair_cache, &mut repair_budget, &media_profile, + &mut send_pacer, payloads_dropped, )?; record_receiver_keyframe_pressure( @@ -1768,10 +1780,14 @@ fn send_rudp_media_payload_with_backpressure( payload: MuninnMediaSendPayload, queued_at: Instant, max_age: Duration, + send_pacer: &mut MuninnRudpMediaSendPacer, ) -> Result { loop { match transport.send(payload.channel_id, payload.payload.clone()) { - Ok(()) => return Ok(true), + Ok(()) => { + send_pacer.observe_sent_payload(); + return Ok(true); + } Err(error) if is_would_block_error(&error) => { if media_payload_queue_age_exceeded(queued_at, Instant::now(), max_age) { return Ok(false); @@ -1786,6 +1802,35 @@ fn send_rudp_media_payload_with_backpressure( } } +#[derive(Debug)] +struct MuninnRudpMediaSendPacer { + payloads_since_pause: usize, + every_payloads: usize, + sleep_for: Duration, +} + +impl MuninnRudpMediaSendPacer { + fn new(every_payloads: usize, sleep_for: Duration) -> Self { + Self { + payloads_since_pause: 0, + every_payloads: every_payloads.max(1), + sleep_for, + } + } + + fn observe_sent_payload(&mut self) { + if self.sleep_for.is_zero() { + return; + } + self.payloads_since_pause = self.payloads_since_pause.saturating_add(1); + if self.payloads_since_pause < self.every_payloads { + return; + } + self.payloads_since_pause = 0; + thread::sleep(self.sleep_for); + } +} + fn is_would_block_error(error: &anyhow::Error) -> bool { error.chain().any(|cause| { cause @@ -1840,6 +1885,7 @@ fn poll_rudp_media_receiver_feedback( repair_cache: &RecentVideoChunkRepairCache, repair_budget: &mut MuninnRudpRepairBudget, media_profile: &MuninnRudpMediaProfile, + send_pacer: &mut MuninnRudpMediaSendPacer, queue_dropped: u64, ) -> Result<()> { loop { @@ -1859,6 +1905,7 @@ fn poll_rudp_media_receiver_feedback( payload, Instant::now(), Duration::from_millis(media_profile.sender_queue_deadline_ms), + send_pacer, )? { stats.repaired_video_chunks = stats.repaired_video_chunks.saturating_add(1); } @@ -1918,7 +1965,8 @@ fn open_media_rudp_transport(options: &Options) -> Result