From 7d3646b95b49eef522c3782a2eff4d5fa95bb1b6 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Fri, 19 Jun 2026 17:30:23 +0100 Subject: [PATCH] Buffer Muninn RUDP media sender --- Cargo.lock | 1 + crates/muninn-daemon/Cargo.toml | 1 + crates/muninn-daemon/src/main.rs | 21 +++++++++++++++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 96cd258..e5b74ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -509,6 +509,7 @@ dependencies = [ "serde", "serde_bytes", "serde_json", + "socket2", "windows-sys 0.59.0", ] diff --git a/crates/muninn-daemon/Cargo.toml b/crates/muninn-daemon/Cargo.toml index 44ffbb6..79219b3 100644 --- a/crates/muninn-daemon/Cargo.toml +++ b/crates/muninn-daemon/Cargo.toml @@ -19,6 +19,7 @@ rmp-serde = "1.3" serde = { version = "1", features = ["derive"] } serde_bytes = "0.11" serde_json = "1" +socket2 = "0.5" [target.'cfg(windows)'.dependencies] windows-sys = { version = "0.59", features = [ diff --git a/crates/muninn-daemon/src/main.rs b/crates/muninn-daemon/src/main.rs index 0a1a5c9..173f9ef 100644 --- a/crates/muninn-daemon/src/main.rs +++ b/crates/muninn-daemon/src/main.rs @@ -65,7 +65,7 @@ const MUNINN_RUDP_MEDIA_MAX_FRAGMENT_BYTES: usize = MUNINN_RUDP_IPV4_UDP_PAYLOAD - MUNINN_RUDP_FIXED_HEADER_BYTES - crate::media_packetizer::MUNINN_MEDIA_RUDP_CHANNEL.len(); const MUNINN_RUDP_MEDIA_RESEND_DELAY_MS: u64 = 5; -const MUNINN_RUDP_MEDIA_RECEIVER_ASSEMBLY_DEADLINE_MS: u64 = 800; +const MUNINN_RUDP_MEDIA_RECEIVER_ASSEMBLY_DEADLINE_MS: u64 = 1_200; const MUNINN_RUDP_MEDIA_RECEIVER_GAP_WAIT_MS: u64 = 16; const MUNINN_RUDP_MEDIA_REPAIR_CACHE_CHUNKS: usize = 16_384; const MUNINN_RUDP_MEDIA_REPAIR_BURST_CHUNKS: usize = 512; @@ -74,6 +74,7 @@ const MUNINN_RUDP_MEDIA_REPAIR_MIN_CHUNKS_PER_SECOND: usize = 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_ACTIVE_CATALOG_REPUBLISH_MS: u64 = 2_000; const PS_MOVE_LED_REPORT_LEN: usize = 49; @@ -1917,6 +1918,7 @@ fn open_media_rudp_transport(options: &Options) -> Result Result Result<()> { + let socket = socket2::SockRef::from(socket); + socket + .set_send_buffer_size(MUNINN_RUDP_MEDIA_SOCKET_BUFFER_BYTES) + .context("setting Muninn media RUDP send buffer")?; + socket + .set_recv_buffer_size(MUNINN_RUDP_MEDIA_SOCKET_BUFFER_BYTES) + .context("setting Muninn media RUDP receive buffer")?; + Ok(()) +} + fn muninn_media_rudp_options( socket: UdpSocket, endpoint: SocketAddr, @@ -6529,8 +6542,8 @@ mod tests { MUNINN_RUDP_MEDIA_RECEIVER_ASSEMBLY_DEADLINE_MS as u32 ); assert!(decoded.urls[0].contains("delivery=unreliable")); - assert!(decoded.urls[0].contains("reliable_expire_after_ms=800")); - assert!(decoded.urls[0].contains("assembly_deadline_ms=800")); + assert!(decoded.urls[0].contains("reliable_expire_after_ms=1200")); + assert!(decoded.urls[0].contains("assembly_deadline_ms=1200")); } #[test] @@ -6719,7 +6732,7 @@ mod tests { assert_eq!( plan.targets, vec![ - "rudp://10.77.0.2:5204/muninn.raven.av.rudp?channel=media&format=muninn-typed-media&connection=0x6d750001&profile=muninn.rudp.low_latency_h264_lan.v1&delivery=unreliable&sender_resend_delay_ms=5&reliable_expire_after_ms=800&assembly_deadline_ms=800&gap_wait_ms=16" + "rudp://10.77.0.2:5204/muninn.raven.av.rudp?channel=media&format=muninn-typed-media&connection=0x6d750001&profile=muninn.rudp.low_latency_h264_lan.v1&delivery=unreliable&sender_resend_delay_ms=5&reliable_expire_after_ms=1200&assembly_deadline_ms=1200&gap_wait_ms=16" ] ); assert!(!plan.command_line.contains("tee"));