Tune Muninn RUDP stream quality profile
This commit is contained in:
parent
37b2915afa
commit
ea5c9bc3be
2 changed files with 76 additions and 14 deletions
|
|
@ -55,8 +55,9 @@ const MUNINN_MEDIA_RUDP_CONNECTION_ID: u32 = 0x6d75_0001;
|
|||
const MUNINN_OBS_CATALOG_RUDP_CONNECTION_ID: u32 = 0x6d75_0003;
|
||||
const MUNINN_MEDIA_SEND_QUEUE_DEADLINE_MS: u64 = 75;
|
||||
const MUNINN_RUDP_MEDIA_PROFILE_ID: &str = "muninn.rudp.low_latency_h264_lan.v1";
|
||||
const MUNINN_RUDP_MEDIA_VIDEO_BITRATE_KBPS: u32 = 24_000;
|
||||
const MUNINN_RUDP_MEDIA_PACKET_BYTES: usize = 900;
|
||||
const MUNINN_RUDP_MEDIA_VIDEO_BITRATE_KBPS: u32 = 48_000;
|
||||
const MUNINN_RUDP_MEDIA_VBV_FRAME_BUDGETS: u32 = 4;
|
||||
const MUNINN_RUDP_MEDIA_PACKET_BYTES: usize = 800;
|
||||
const MUNINN_RUDP_IPV4_UDP_PAYLOAD_BYTES: usize = 1_472;
|
||||
const MUNINN_RUDP_FIXED_HEADER_BYTES: usize = 36;
|
||||
const MUNINN_RUDP_MEDIA_MAX_FRAGMENT_BYTES: usize = MUNINN_RUDP_IPV4_UDP_PAYLOAD_BYTES
|
||||
|
|
@ -5196,7 +5197,10 @@ fn muninn_rudp_video_bitrate_arg(profile: &MuninnRudpMediaProfile) -> String {
|
|||
fn muninn_rudp_video_vbv_buffer_arg(options: &Options, profile: &MuninnRudpMediaProfile) -> String {
|
||||
let framerate = options.framerate.max(1);
|
||||
let frame_budget_kbits = profile.video_bitrate_kbps.div_ceil(framerate).max(1);
|
||||
format!("{frame_budget_kbits}k")
|
||||
let burst_budget_kbits = frame_budget_kbits
|
||||
.saturating_mul(MUNINN_RUDP_MEDIA_VBV_FRAME_BUDGETS)
|
||||
.max(frame_budget_kbits);
|
||||
format!("{burst_budget_kbits}k")
|
||||
}
|
||||
|
||||
fn muninn_rudp_video_gop_frames(options: &Options) -> u32 {
|
||||
|
|
@ -6296,15 +6300,15 @@ mod tests {
|
|||
);
|
||||
assert!(
|
||||
args.windows(2)
|
||||
.any(|pair| pair[0] == "-b:v" && pair[1] == "24000k")
|
||||
.any(|pair| pair[0] == "-b:v" && pair[1] == "48000k")
|
||||
);
|
||||
assert!(
|
||||
args.windows(2)
|
||||
.any(|pair| pair[0] == "-maxrate" && pair[1] == "24000k")
|
||||
.any(|pair| pair[0] == "-maxrate" && pair[1] == "48000k")
|
||||
);
|
||||
assert!(
|
||||
args.windows(2)
|
||||
.any(|pair| pair[0] == "-bufsize" && pair[1] == "400k")
|
||||
.any(|pair| pair[0] == "-bufsize" && pair[1] == "3200k")
|
||||
);
|
||||
assert!(
|
||||
args.windows(2)
|
||||
|
|
@ -6338,7 +6342,7 @@ mod tests {
|
|||
}
|
||||
|
||||
#[test]
|
||||
fn rudp_video_vbv_buffer_tracks_single_frame_budget() {
|
||||
fn rudp_video_vbv_buffer_tracks_lan_burst_budget() {
|
||||
let thirty_fps = Options::parse(
|
||||
["activate", "--media-transport", "rudp", "--framerate", "30"]
|
||||
.into_iter()
|
||||
|
|
@ -6355,11 +6359,11 @@ mod tests {
|
|||
|
||||
assert_eq!(
|
||||
muninn_rudp_video_vbv_buffer_arg(&thirty_fps, &profile),
|
||||
"800k"
|
||||
"6400k"
|
||||
);
|
||||
assert_eq!(
|
||||
muninn_rudp_video_vbv_buffer_arg(&sixty_fps, &profile),
|
||||
"400k"
|
||||
"3200k"
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -6383,7 +6387,7 @@ mod tests {
|
|||
}
|
||||
|
||||
#[test]
|
||||
fn default_rudp_media_packet_size_keeps_compact_typed_video_wire_under_udp_mtu() {
|
||||
fn default_rudp_media_packet_size_keeps_late_typed_video_wire_under_udp_mtu() {
|
||||
let mut access_unit = Vec::new();
|
||||
access_unit.extend_from_slice(&[0, 0, 0, 1, 0x65]);
|
||||
access_unit.resize(MUNINN_RUDP_MEDIA_PACKET_BYTES, 0x80);
|
||||
|
|
@ -6394,8 +6398,8 @@ mod tests {
|
|||
stream_id: "muninn.raven.av.rudp",
|
||||
session_id: "session-1",
|
||||
codec: "h264",
|
||||
first_frame_id: 1,
|
||||
first_pts_ticks: 0,
|
||||
first_frame_id: 1_000_000,
|
||||
first_pts_ticks: 3_000_000_000,
|
||||
frame_duration_ticks: 3_000,
|
||||
timebase_num: 1,
|
||||
timebase_den: 90_000,
|
||||
|
|
@ -7227,7 +7231,7 @@ Device 00:07:04:A8:00:D0 (public)
|
|||
media_profile
|
||||
.get("video_bufsize")
|
||||
.and_then(|value| value.as_str()),
|
||||
Some("400k")
|
||||
Some("6400k")
|
||||
);
|
||||
assert_eq!(
|
||||
media_profile
|
||||
|
|
|
|||
|
|
@ -885,7 +885,9 @@ pub fn packetize_video_access_unit(
|
|||
timebase_num: options.timebase_num,
|
||||
timebase_den: options.timebase_den,
|
||||
keyframe: access_unit.keyframe,
|
||||
dependency_frame_id: if access_unit.keyframe {
|
||||
dependency_frame_id: if access_unit.keyframe
|
||||
|| !access_unit_references_previous_frame(options.codec, access_unit)
|
||||
{
|
||||
None
|
||||
} else {
|
||||
options.frame_id.checked_sub(1)
|
||||
|
|
@ -1792,10 +1794,34 @@ fn is_h264_vcl_nal(nal_type: u8) -> bool {
|
|||
matches!(nal_type, 1..=5)
|
||||
}
|
||||
|
||||
fn access_unit_references_previous_frame(codec: &str, access_unit: &VideoAccessUnit) -> bool {
|
||||
if access_unit.keyframe {
|
||||
return false;
|
||||
}
|
||||
match normalized_video_codec(codec).as_deref() {
|
||||
Some("h264") => h264_access_unit_has_reference_vcl(&access_unit.bytes).unwrap_or(true),
|
||||
_ => true,
|
||||
}
|
||||
}
|
||||
|
||||
fn h264_access_unit_has_reference_vcl(input: &[u8]) -> Result<bool> {
|
||||
let nal_units = annex_b_nal_units(input, "H.264", h264_nal_type)?;
|
||||
Ok(nal_units
|
||||
.iter()
|
||||
.any(|nal| is_h264_vcl_nal(nal.nal_type) && h264_nal_ref_idc(nal.payload) > 0))
|
||||
}
|
||||
|
||||
fn h264_nal_type(payload: &[u8]) -> Option<u8> {
|
||||
payload.first().map(|byte| byte & 0x1f)
|
||||
}
|
||||
|
||||
fn h264_nal_ref_idc(payload: &[u8]) -> u8 {
|
||||
payload
|
||||
.first()
|
||||
.map(|byte| (byte >> 5) & 0x03)
|
||||
.unwrap_or_default()
|
||||
}
|
||||
|
||||
fn h264_first_mb_in_slice(nal_payload: &[u8]) -> Option<u64> {
|
||||
if nal_payload.len() < 2 {
|
||||
return None;
|
||||
|
|
@ -2104,6 +2130,38 @@ mod tests {
|
|||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn packetizes_non_reference_h264_p_frames_without_dependency() -> 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(&[0x01, 0x80]);
|
||||
|
||||
let records = packetize_video_annex_b_stream(
|
||||
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,
|
||||
},
|
||||
&stream,
|
||||
)?;
|
||||
|
||||
assert_eq!(records.len(), 2);
|
||||
assert!(records[0].keyframe);
|
||||
assert_eq!(records[0].dependency_frame_id, None);
|
||||
assert!(!records[1].keyframe);
|
||||
assert_eq!(records[1].dependency_frame_id, None);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rejects_negative_annex_b_stream_deadline_delay() {
|
||||
let error = packetize_video_annex_b_stream(
|
||||
|
|
|
|||
Loading…
Reference in a new issue