From dd2315262b3060edd573e8fdf7415cd504afae91 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Thu, 18 Jun 2026 17:21:00 +0100 Subject: [PATCH] Encode Annex B streams for Muninn media senders --- crates/muninn-daemon/src/media_packetizer.rs | 69 ++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/crates/muninn-daemon/src/media_packetizer.rs b/crates/muninn-daemon/src/media_packetizer.rs index d47486b..0def37d 100644 --- a/crates/muninn-daemon/src/media_packetizer.rs +++ b/crates/muninn-daemon/src/media_packetizer.rs @@ -164,6 +164,13 @@ pub struct VideoAnnexBStreamPacketizeOptions<'a> { pub max_payload_bytes: usize, } +pub struct VideoAnnexBStreamWireOptions<'a> { + pub packetize: VideoAnnexBStreamPacketizeOptions<'a>, + pub stored_at: &'a str, + pub source_runtime_id: &'a str, + pub source_role: &'a str, +} + pub struct AudioPacketizeOptions<'a> { pub stream_id: &'a str, pub session_id: &'a str, @@ -1000,6 +1007,23 @@ pub fn encode_media_wire_records( .collect() } +pub fn encode_video_annex_b_stream_wire_records( + options: VideoAnnexBStreamWireOptions<'_>, + input: &[u8], +) -> Result>> { + let records = packetize_video_annex_b_stream(options.packetize, input)?; + let wire_records = records + .into_iter() + .map(MuninnMediaWireRecord::Video) + .collect::>(); + encode_media_wire_records( + &wire_records, + options.stored_at, + options.source_runtime_id, + options.source_role, + ) +} + pub fn decode_media_wire_record(payload: &[u8]) -> Result { let message = decode_cultnet_message_from_slice(payload, CultNetWireContract::CultNetSchemaV0)?; let CultNetMessage::DocumentPutRaw { document, .. } = message else { @@ -2405,6 +2429,51 @@ mod tests { Ok(()) } + #[test] + fn media_wire_encodes_annex_b_stream_for_sender() -> Result<()> { + let mut stream = Vec::new(); + stream.extend_from_slice(&start_code()); + stream.extend_from_slice(&[0x65, 0x80]); + stream.extend_from_slice(&start_code()); + stream.extend_from_slice(&[0x41, 0x80]); + + let wire = encode_video_annex_b_stream_wire_records( + VideoAnnexBStreamWireOptions { + packetize: VideoAnnexBStreamPacketizeOptions { + stream_id: "muninn.raven.av.rudp", + session_id: "session-1", + codec: "h264", + first_frame_id: 9, + first_pts_ticks: 27_000, + frame_duration_ticks: 3_000, + timebase_num: 1, + timebase_den: 90_000, + deadline_delay_ticks: 1_800, + max_payload_bytes: 16, + }, + stored_at: "2026-06-18T00:00:00Z", + source_runtime_id: "muninn-test", + source_role: "media-test", + }, + &stream, + )?; + + assert_eq!(wire.len(), 2); + let first = decode_media_wire_record(&wire[0])?; + let second = decode_media_wire_record(&wire[1])?; + let MuninnMediaWireRecord::Video(first) = first else { + panic!("expected video media record"); + }; + let MuninnMediaWireRecord::Video(second) = second else { + panic!("expected video media record"); + }; + assert_eq!(first.frame_id, 9); + assert_eq!(first.deadline_ticks, 28_800); + assert_eq!(second.frame_id, 10); + assert_eq!(second.deadline_ticks, 31_800); + Ok(()) + } + #[test] fn media_wire_round_trips_audio_document() -> Result<()> { let record = packetize_audio_packet(