feat(portal): BWE-driven resolution adaptation + duplicate frame skipping
WebRTC client bandwidth estimate now drives both encoder bitrate and resolution tier selection, replacing the previous static-target encoder. - webrtc.rs: enable str0m BWE (seeded at 5 Mbps), surface EgressBitrateEstimate + KeyframeRequest events, expose get_bwe_estimate() / set_need_keyframe() - state_portal.rs: wire bitrate/resolution channels between the WebRTC thread and the encode thread; tier ladder [1440p, 1080p, 720p] with downscale at 60% budget and upscale hysteresis (120% sustained 10s) - avhw.rs: SwEncImport::poll_resolution_commands() rebuilds the import filter graph on UpdateResolution; SwEncEncode::recreate_encoder() rebuilds sws/enc_video/yuv_frame atomically; hash_sampled_y_plane() skips duplicate frames; VBV x264opts cap IDR bursts; H.264 level 4.0 (muxer) / 4.2 (WebRTC) - state.rs: sync wlr-screencopy GOP to fps*2 max 20 for parity - fix: drain bitrate_rx + resolution_rx BEFORE the stride check in encode_cpu_frame() so the new (smaller-stride) frame produced after a resolution change does not hit the stale (larger) enc_width and crash the encode thread - WebRTC GOP widened to fps*2 max 20 (was fps/2 max 10)
This commit is contained in:
+433
-33
@@ -3,10 +3,10 @@ use std::mem;
|
||||
use std::os::fd::{AsRawFd, RawFd};
|
||||
use std::os::raw::c_void;
|
||||
use std::path::Path;
|
||||
use std::ptr;
|
||||
use std::slice;
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::Arc;
|
||||
use std::ptr;
|
||||
|
||||
use anyhow::{bail, Result};
|
||||
use ffmpeg_next as ff;
|
||||
@@ -16,6 +16,23 @@ use ffmpeg_next::packet::Mut as _;
|
||||
use crate::cap_portal::PwDmaBufFrame;
|
||||
use crate::transform::{transpose_if_transform_transposed, Transform};
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Bitrate feedback command (WebRTC BWE → SW encoder)
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
/// Commands sent from the WebRTC thread to the SW encoder when the
|
||||
/// bandwidth estimate changes significantly.
|
||||
pub enum BitrateCommand {
|
||||
UpdateBitrate { target_bps: u64 },
|
||||
UpdateResolution { width: u32, height: u32 },
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug)]
|
||||
pub struct ResolutionChange {
|
||||
pub width: u32,
|
||||
pub height: u32,
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// AvHwDevCtx
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -334,7 +351,9 @@ impl EncState {
|
||||
transform,
|
||||
)?;
|
||||
|
||||
let mut sink_ctx = video_filter.get("out").ok_or_else(|| anyhow::anyhow!("filter 'out' not found"))?;
|
||||
let mut sink_ctx = video_filter
|
||||
.get("out")
|
||||
.ok_or_else(|| anyhow::anyhow!("filter 'out' not found"))?;
|
||||
// SAFETY: sink_ctx is a live buffersink; the returned hw_frames_ctx is
|
||||
// borrowed, so av_buffer_ref creates an owned reference.
|
||||
let sink_hw_frames = unsafe {
|
||||
@@ -374,19 +393,19 @@ impl EncState {
|
||||
enc.set_width(enc_width);
|
||||
enc.set_height(enc_height);
|
||||
enc.set_format(ff::format::Pixel::VAAPI);
|
||||
enc.set_bit_rate(bitrate as usize);
|
||||
enc.set_gop(gop_size);
|
||||
enc.set_time_base(ff::Rational::new(1, fps as i32));
|
||||
enc.set_max_b_frames(0);
|
||||
enc.set_bit_rate(bitrate as usize);
|
||||
enc.set_gop(gop_size);
|
||||
enc.set_time_base(ff::Rational::new(1, fps as i32));
|
||||
enc.set_max_b_frames(0);
|
||||
|
||||
// VBV rate limiting: caps IDR burst size for WebRTC. Without this a 4K
|
||||
// scene change can produce a 256KB keyframe that overflows the UDP send
|
||||
// buffer. bufsize=bitrate/4 ≈ 250ms of video at the target bitrate.
|
||||
unsafe {
|
||||
let ctx_ptr = enc.as_mut_ptr();
|
||||
(*ctx_ptr).rc_max_rate = bitrate as i64;
|
||||
(*ctx_ptr).rc_buffer_size = (bitrate / 4) as i32;
|
||||
}
|
||||
// VBV rate limiting: caps IDR burst size for WebRTC. Without this a 4K
|
||||
// scene change can produce a 256KB keyframe that overflows the UDP send
|
||||
// buffer. bufsize=bitrate/4 ≈ 250ms of video at the target bitrate.
|
||||
unsafe {
|
||||
let ctx_ptr = enc.as_mut_ptr();
|
||||
(*ctx_ptr).rc_max_rate = bitrate as i64;
|
||||
(*ctx_ptr).rc_buffer_size = (bitrate / 4) as i32;
|
||||
}
|
||||
|
||||
// SAFETY: AV_CODEC_FLAG_GLOBAL_HEADER must be set BEFORE opening the encoder.
|
||||
// It triggers SPS/PPS extradata generation needed by the muxer for
|
||||
@@ -461,7 +480,10 @@ impl EncState {
|
||||
ffi::avcodec_parameters_from_context((*stream_ptr).codecpar, enc_video.as_ptr())
|
||||
};
|
||||
if ret < 0 {
|
||||
bail!("Failed to copy encoder parameters to stream: {}", ff_err(ret));
|
||||
bail!(
|
||||
"Failed to copy encoder parameters to stream: {}",
|
||||
ff_err(ret)
|
||||
);
|
||||
}
|
||||
|
||||
// SAFETY: Copy encoder time_base to stream.
|
||||
@@ -510,9 +532,15 @@ impl EncState {
|
||||
}
|
||||
|
||||
pub fn encode_frame(&mut self, hw_frame: &ff::frame::Video) -> Result<()> {
|
||||
let mut filter_src_ctx = self.video_filter.get("in").ok_or_else(|| anyhow::anyhow!("filter 'in' not found"))?;
|
||||
let mut filter_src_ctx = self
|
||||
.video_filter
|
||||
.get("in")
|
||||
.ok_or_else(|| anyhow::anyhow!("filter 'in' not found"))?;
|
||||
let mut filter_src = filter_src_ctx.source();
|
||||
let mut filter_sink_ctx = self.video_filter.get("out").ok_or_else(|| anyhow::anyhow!("filter 'out' not found"))?;
|
||||
let mut filter_sink_ctx = self
|
||||
.video_filter
|
||||
.get("out")
|
||||
.ok_or_else(|| anyhow::anyhow!("filter 'out' not found"))?;
|
||||
let mut filter_sink = filter_sink_ctx.sink();
|
||||
|
||||
// SAFETY: hw_frame is a valid VAAPI hardware frame from capture.
|
||||
@@ -552,14 +580,20 @@ impl EncState {
|
||||
|
||||
pub fn flush(&mut self) -> Result<()> {
|
||||
// Flush filter graph
|
||||
let mut filter_src_ctx = self.video_filter.get("in").ok_or_else(|| anyhow::anyhow!("filter 'in' not found"))?;
|
||||
let mut filter_src_ctx = self
|
||||
.video_filter
|
||||
.get("in")
|
||||
.ok_or_else(|| anyhow::anyhow!("filter 'in' not found"))?;
|
||||
let mut filter_src = filter_src_ctx.source();
|
||||
if let Err(e) = filter_src.flush() {
|
||||
tracing::debug!("filter source flush error: {e}");
|
||||
}
|
||||
|
||||
// Drain filter
|
||||
let mut filter_sink_ctx = self.video_filter.get("out").ok_or_else(|| anyhow::anyhow!("filter 'out' not found"))?;
|
||||
let mut filter_sink_ctx = self
|
||||
.video_filter
|
||||
.get("out")
|
||||
.ok_or_else(|| anyhow::anyhow!("filter 'out' not found"))?;
|
||||
let mut filter_sink = filter_sink_ctx.sink();
|
||||
loop {
|
||||
let mut filtered = ff::frame::Video::empty();
|
||||
@@ -667,8 +701,13 @@ pub struct SwEncImport {
|
||||
hw_dev: AvHwDevCtx,
|
||||
frames_rgb: AvHwFrameCtx,
|
||||
filter_graph: ff::filter::Graph,
|
||||
width: u32,
|
||||
height: u32,
|
||||
enc_width: u32,
|
||||
enc_height: u32,
|
||||
fps: u32,
|
||||
resolution_rx: Option<crossbeam_channel::Receiver<BitrateCommand>>,
|
||||
encoder_resolution_tx: Option<crossbeam_channel::Sender<ResolutionChange>>,
|
||||
}
|
||||
|
||||
impl SwEncImport {
|
||||
@@ -698,20 +737,50 @@ impl SwEncImport {
|
||||
hw_dev,
|
||||
frames_rgb,
|
||||
filter_graph,
|
||||
width,
|
||||
height,
|
||||
enc_width,
|
||||
enc_height,
|
||||
fps,
|
||||
resolution_rx: None,
|
||||
encoder_resolution_tx: None,
|
||||
})
|
||||
}
|
||||
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn new_with_resolution_control(
|
||||
drm_device: &Path,
|
||||
width: u32,
|
||||
height: u32,
|
||||
enc_width: u32,
|
||||
enc_height: u32,
|
||||
fps: u32,
|
||||
resolution_rx: crossbeam_channel::Receiver<BitrateCommand>,
|
||||
encoder_resolution_tx: crossbeam_channel::Sender<ResolutionChange>,
|
||||
) -> Result<Self> {
|
||||
let mut this = Self::new(drm_device, width, height, enc_width, enc_height, fps)?;
|
||||
this.resolution_rx = Some(resolution_rx);
|
||||
this.encoder_resolution_tx = Some(encoder_resolution_tx);
|
||||
Ok(this)
|
||||
}
|
||||
|
||||
pub fn frames_rgb(&self) -> &AvHwFrameCtx {
|
||||
let _ = self.hw_dev.as_ptr();
|
||||
&self.frames_rgb
|
||||
}
|
||||
|
||||
pub fn import_and_scale(&mut self, hw_frame: &ff::frame::Video) -> Result<CpuNv12Frame> {
|
||||
let mut filter_src_ctx = self.filter_graph.get("in").ok_or_else(|| anyhow::anyhow!("filter 'in' not found"))?;
|
||||
self.poll_resolution_commands()?;
|
||||
|
||||
let mut filter_src_ctx = self
|
||||
.filter_graph
|
||||
.get("in")
|
||||
.ok_or_else(|| anyhow::anyhow!("filter 'in' not found"))?;
|
||||
let mut filter_src = filter_src_ctx.source();
|
||||
let mut filter_sink_ctx = self.filter_graph.get("out").ok_or_else(|| anyhow::anyhow!("filter 'out' not found"))?;
|
||||
let mut filter_sink_ctx = self
|
||||
.filter_graph
|
||||
.get("out")
|
||||
.ok_or_else(|| anyhow::anyhow!("filter 'out' not found"))?;
|
||||
let mut filter_sink = filter_sink_ctx.sink();
|
||||
|
||||
filter_src
|
||||
@@ -740,20 +809,28 @@ impl SwEncImport {
|
||||
}
|
||||
|
||||
if extra_count > 0 {
|
||||
tracing::warn!("software import filter produced {extra_count} extra frame(s); dropping extras");
|
||||
tracing::warn!(
|
||||
"software import filter produced {extra_count} extra frame(s); dropping extras"
|
||||
);
|
||||
}
|
||||
|
||||
first.ok_or_else(|| anyhow::anyhow!("software pipeline produced no scaled frame"))
|
||||
}
|
||||
|
||||
pub fn flush_import(&mut self) -> Result<Vec<CpuNv12Frame>> {
|
||||
let mut filter_src_ctx = self.filter_graph.get("in").ok_or_else(|| anyhow::anyhow!("filter 'in' not found"))?;
|
||||
let mut filter_src_ctx = self
|
||||
.filter_graph
|
||||
.get("in")
|
||||
.ok_or_else(|| anyhow::anyhow!("filter 'in' not found"))?;
|
||||
let mut filter_src = filter_src_ctx.source();
|
||||
if let Err(e) = filter_src.flush() {
|
||||
tracing::debug!("filter source flush error: {e}");
|
||||
}
|
||||
|
||||
let mut filter_sink_ctx = self.filter_graph.get("out").ok_or_else(|| anyhow::anyhow!("filter 'out' not found"))?;
|
||||
let mut filter_sink_ctx = self
|
||||
.filter_graph
|
||||
.get("out")
|
||||
.ok_or_else(|| anyhow::anyhow!("filter 'out' not found"))?;
|
||||
let mut filter_sink = filter_sink_ctx.sink();
|
||||
let mut frames = Vec::new();
|
||||
loop {
|
||||
@@ -767,6 +844,54 @@ impl SwEncImport {
|
||||
Ok(frames)
|
||||
}
|
||||
|
||||
fn poll_resolution_commands(&mut self) -> Result<()> {
|
||||
let Some(rx) = self.resolution_rx.as_ref().cloned() else {
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
let mut requested = None;
|
||||
while let Ok(cmd) = rx.try_recv() {
|
||||
match cmd {
|
||||
BitrateCommand::UpdateResolution { width, height } => {
|
||||
requested = Some((width & !1, height & !1));
|
||||
}
|
||||
BitrateCommand::UpdateBitrate { .. } => {}
|
||||
}
|
||||
}
|
||||
|
||||
let Some((width, height)) = requested else {
|
||||
return Ok(());
|
||||
};
|
||||
if width == self.enc_width && height == self.enc_height {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
tracing::info!(
|
||||
from = format_args!("{}x{}", self.enc_width, self.enc_height),
|
||||
to = format_args!("{}x{}", width, height),
|
||||
"rebuilding software import filter graph for resolution change"
|
||||
);
|
||||
let _ = self.flush_import();
|
||||
self.filter_graph = build_swenc_filter_graph(
|
||||
&self.hw_dev,
|
||||
&self.frames_rgb,
|
||||
self.width,
|
||||
self.height,
|
||||
width,
|
||||
height,
|
||||
self.fps,
|
||||
)?;
|
||||
self.enc_width = width;
|
||||
self.enc_height = height;
|
||||
|
||||
if let Some(tx) = &self.encoder_resolution_tx {
|
||||
tx.send(ResolutionChange { width, height })
|
||||
.map_err(|_| anyhow::anyhow!("encoder resolution channel disconnected"))?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn transfer_filtered_to_cpu(&self, filtered: &ff::frame::Video) -> Result<CpuNv12Frame> {
|
||||
// SAFETY: av_frame_alloc returns a newly allocated AVFrame or null,
|
||||
// which is checked below.
|
||||
@@ -798,7 +923,9 @@ impl SwEncImport {
|
||||
}
|
||||
let y_stride = (*sw_nv12).linesize[0] as usize;
|
||||
let uv_stride = (*sw_nv12).linesize[1] as usize;
|
||||
if (*sw_nv12).width != self.enc_width as i32 || (*sw_nv12).height != self.enc_height as i32 {
|
||||
if (*sw_nv12).width != self.enc_width as i32
|
||||
|| (*sw_nv12).height != self.enc_height as i32
|
||||
{
|
||||
ffi::av_frame_free(&mut sw_nv12);
|
||||
bail!("NV12 transfer frame has unexpected dimensions");
|
||||
}
|
||||
@@ -826,12 +953,38 @@ pub struct SwEncEncode {
|
||||
enc_video: ff::codec::encoder::video::Video,
|
||||
output: Option<FrameOutput>,
|
||||
yuv_frame: *mut ffi::AVFrame,
|
||||
last_frame_hash: u64,
|
||||
frame_count: u64,
|
||||
starting_timestamp: Option<i64>,
|
||||
frames_written: bool,
|
||||
webrtc_disconnected: bool,
|
||||
webrtc_paused: Option<Arc<AtomicBool>>,
|
||||
bitrate_rx: crossbeam_channel::Receiver<BitrateCommand>,
|
||||
resolution_rx: crossbeam_channel::Receiver<ResolutionChange>,
|
||||
enc_width: u32,
|
||||
enc_height: u32,
|
||||
fps: u32,
|
||||
bitrate: u64,
|
||||
gop_size: u32,
|
||||
}
|
||||
|
||||
const FNV1A_OFFSET_BASIS: u64 = 0xcbf29ce484222325;
|
||||
const FNV1A_PRIME: u64 = 0x100000001b3;
|
||||
const Y_PLANE_HASH_ROW_STEP: usize = 8;
|
||||
|
||||
fn hash_sampled_y_plane(y_data: &[u8], width: usize, height: usize, stride: usize) -> u64 {
|
||||
let mut hash = FNV1A_OFFSET_BASIS;
|
||||
|
||||
for row in (0..height).step_by(Y_PLANE_HASH_ROW_STEP) {
|
||||
let row_start = row * stride;
|
||||
let row_end = row_start + width;
|
||||
for &byte in &y_data[row_start..row_end] {
|
||||
hash ^= u64::from(byte);
|
||||
hash = hash.wrapping_mul(FNV1A_PRIME);
|
||||
}
|
||||
}
|
||||
|
||||
hash
|
||||
}
|
||||
|
||||
// SAFETY: SwEncEncode owns sws_ctx/yuv_frame/enc_video exclusively after construction.
|
||||
@@ -852,18 +1005,29 @@ impl SwEncEncode {
|
||||
let (enc_video, octx) =
|
||||
create_software_h264_muxer(output_path, enc_width, enc_height, fps, bitrate, gop_size)?;
|
||||
let yuv_frame = alloc_yuv420p_frame(enc_width, enc_height)?;
|
||||
let (dummy_tx, bitrate_rx) = crossbeam_channel::bounded(1);
|
||||
drop(dummy_tx);
|
||||
let (dummy_resolution_tx, resolution_rx) = crossbeam_channel::bounded(1);
|
||||
drop(dummy_resolution_tx);
|
||||
|
||||
Ok(Self {
|
||||
sws_ctx,
|
||||
enc_video,
|
||||
output: Some(FrameOutput::Muxer(octx)),
|
||||
yuv_frame,
|
||||
last_frame_hash: 0,
|
||||
frame_count: 0,
|
||||
starting_timestamp: None,
|
||||
frames_written: false,
|
||||
webrtc_disconnected: false,
|
||||
webrtc_paused: None,
|
||||
bitrate_rx,
|
||||
resolution_rx,
|
||||
enc_width,
|
||||
enc_height,
|
||||
fps,
|
||||
bitrate,
|
||||
gop_size,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -876,9 +1040,12 @@ impl SwEncEncode {
|
||||
gop_size: u32,
|
||||
tx: crossbeam_channel::Sender<Vec<u8>>,
|
||||
webrtc_paused: Arc<AtomicBool>,
|
||||
bitrate_rx: crossbeam_channel::Receiver<BitrateCommand>,
|
||||
resolution_rx: crossbeam_channel::Receiver<ResolutionChange>,
|
||||
) -> Result<Self> {
|
||||
let sws_ctx = create_nv12_to_yuv420p_sws(enc_width, enc_height)?;
|
||||
let enc_video = create_software_h264_encoder(enc_width, enc_height, fps, bitrate, gop_size)?;
|
||||
let enc_video =
|
||||
create_software_h264_encoder(enc_width, enc_height, fps, bitrate, gop_size)?;
|
||||
let yuv_frame = alloc_yuv420p_frame(enc_width, enc_height)?;
|
||||
|
||||
Ok(Self {
|
||||
@@ -886,12 +1053,19 @@ impl SwEncEncode {
|
||||
enc_video,
|
||||
output: Some(FrameOutput::Channel(tx)),
|
||||
yuv_frame,
|
||||
last_frame_hash: 0,
|
||||
frame_count: 0,
|
||||
starting_timestamp: None,
|
||||
frames_written: false,
|
||||
webrtc_disconnected: false,
|
||||
webrtc_paused: Some(webrtc_paused),
|
||||
bitrate_rx,
|
||||
resolution_rx,
|
||||
enc_width,
|
||||
enc_height,
|
||||
fps,
|
||||
bitrate,
|
||||
gop_size,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -914,6 +1088,28 @@ impl SwEncEncode {
|
||||
if self.webrtc_disconnected {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
// Must drain before the stride check: the import thread emits
|
||||
// ResolutionChange before the new (smaller-stride) frame arrives.
|
||||
while let Ok(cmd) = self.bitrate_rx.try_recv() {
|
||||
match cmd {
|
||||
BitrateCommand::UpdateBitrate { target_bps } => {
|
||||
tracing::info!(target_bps, "updating encoder bitrate from BWE feedback");
|
||||
self.bitrate = target_bps;
|
||||
// SAFETY: enc_video is an opened AVCodecContext exclusively owned by &mut self.
|
||||
unsafe {
|
||||
let ctx = self.enc_video.as_mut_ptr();
|
||||
(*ctx).bit_rate = target_bps as i64;
|
||||
}
|
||||
}
|
||||
BitrateCommand::UpdateResolution { .. } => {}
|
||||
}
|
||||
}
|
||||
|
||||
while let Ok(change) = self.resolution_rx.try_recv() {
|
||||
self.recreate_encoder(change.width, change.height)?;
|
||||
}
|
||||
|
||||
if frame.y_stride < self.enc_width as usize || frame.uv_stride < self.enc_width as usize {
|
||||
bail!("CPU NV12 frame stride is smaller than encoder width");
|
||||
}
|
||||
@@ -923,6 +1119,24 @@ impl SwEncEncode {
|
||||
}
|
||||
}
|
||||
|
||||
let width = self.enc_width as usize;
|
||||
let height = self.enc_height as usize;
|
||||
let required_y_len = frame.y_stride * height.saturating_sub(1) + width;
|
||||
if frame.y_data.len() < required_y_len {
|
||||
bail!("CPU NV12 frame Y plane is smaller than encoder dimensions");
|
||||
}
|
||||
|
||||
let frame_index = self.frame_count;
|
||||
self.frame_count = self.frame_count.saturating_add(1);
|
||||
let current_hash = hash_sampled_y_plane(&frame.y_data, width, height, frame.y_stride);
|
||||
let force_gop_frame = self.gop_size > 0 && frame_index % u64::from(self.gop_size) == 0;
|
||||
if frame_index > 0 && !force_gop_frame && current_hash == self.last_frame_hash {
|
||||
tracing::debug!(frame_index, "skipping duplicate frame");
|
||||
self.last_frame_hash = current_hash;
|
||||
return Ok(());
|
||||
}
|
||||
self.last_frame_hash = current_hash;
|
||||
|
||||
// SAFETY: yuv_frame is an owned reusable YUV420P frame at the same dimensions as sw_nv12;
|
||||
// sws_ctx was created for NV12 -> YUV420P with no resize, so sws_scale only converts format.
|
||||
unsafe {
|
||||
@@ -930,7 +1144,12 @@ impl SwEncEncode {
|
||||
if ret < 0 {
|
||||
bail!("av_frame_make_writable failed: {}", ff_err(ret));
|
||||
}
|
||||
let src_slices = [frame.y_data.as_ptr(), frame.uv_data.as_ptr(), ptr::null(), ptr::null()];
|
||||
let src_slices = [
|
||||
frame.y_data.as_ptr(),
|
||||
frame.uv_data.as_ptr(),
|
||||
ptr::null(),
|
||||
ptr::null(),
|
||||
];
|
||||
let src_strides = [frame.y_stride as i32, frame.uv_stride as i32, 0, 0];
|
||||
let scaled = ffi::sws_scale(
|
||||
self.sws_ctx,
|
||||
@@ -957,13 +1176,49 @@ impl SwEncEncode {
|
||||
(*self.yuv_frame).pts = pts;
|
||||
let ret = ffi::avcodec_send_frame(self.enc_video.as_mut_ptr(), self.yuv_frame);
|
||||
if ret < 0 {
|
||||
bail!("avcodec_send_frame failed for software encoder: {}", ff_err(ret));
|
||||
bail!(
|
||||
"avcodec_send_frame failed for software encoder: {}",
|
||||
ff_err(ret)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
self.drain_encoder(start_ts)
|
||||
}
|
||||
|
||||
fn recreate_encoder(&mut self, width: u32, height: u32) -> Result<()> {
|
||||
if width == self.enc_width && height == self.enc_height {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
tracing::info!(
|
||||
from = format_args!("{}x{}", self.enc_width, self.enc_height),
|
||||
to = format_args!("{}x{}", width, height),
|
||||
"recreating WebRTC software encoder for resolution change"
|
||||
);
|
||||
|
||||
if !self.sws_ctx.is_null() {
|
||||
// SAFETY: sws_ctx is owned exclusively by self and will be replaced below.
|
||||
unsafe { ffi::sws_freeContext(self.sws_ctx) };
|
||||
self.sws_ctx = ptr::null_mut();
|
||||
}
|
||||
if !self.yuv_frame.is_null() {
|
||||
// SAFETY: yuv_frame is owned exclusively by self and will be replaced below.
|
||||
unsafe { ffi::av_frame_free(&mut self.yuv_frame) };
|
||||
}
|
||||
|
||||
self.sws_ctx = create_nv12_to_yuv420p_sws(width, height)?;
|
||||
self.enc_video =
|
||||
create_software_h264_encoder(width, height, self.fps, self.bitrate, self.gop_size)?;
|
||||
self.yuv_frame = alloc_yuv420p_frame(width, height)?;
|
||||
self.enc_width = width;
|
||||
self.enc_height = height;
|
||||
self.last_frame_hash = 0;
|
||||
self.frame_count = 0;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn write_trailer_if_needed(&mut self) -> Result<()> {
|
||||
if self.frames_written {
|
||||
if let Some(FrameOutput::Muxer(ref mut octx)) = self.output {
|
||||
@@ -1026,9 +1281,8 @@ impl SwEncEncode {
|
||||
// `data` is non-null, so `data` points to `size` initialized
|
||||
// bytes owned by the packet. `u8` has alignment 1, and the
|
||||
// slice is copied into a Vec before the packet is unreffed.
|
||||
let data: &[u8] = unsafe {
|
||||
std::slice::from_raw_parts(raw.data, raw.size as usize)
|
||||
};
|
||||
let data: &[u8] =
|
||||
unsafe { std::slice::from_raw_parts(raw.data, raw.size as usize) };
|
||||
match tx.try_send(data.to_vec()) {
|
||||
Ok(()) => {}
|
||||
Err(crossbeam_channel::TrySendError::Full(frame)) => {
|
||||
@@ -1095,7 +1349,8 @@ impl SwEncState {
|
||||
"SwEncState::new: GPU downscale {width}x{height} BGRA -> {enc_width}x{enc_height} NV12, software H.264"
|
||||
);
|
||||
let import = SwEncImport::new(drm_device, width, height, enc_width, enc_height, fps)?;
|
||||
let encode = SwEncEncode::new_muxer(output_path, enc_width, enc_height, fps, bitrate, gop_size)?;
|
||||
let encode =
|
||||
SwEncEncode::new_muxer(output_path, enc_width, enc_height, fps, bitrate, gop_size)?;
|
||||
Ok(Self { import, encode })
|
||||
}
|
||||
|
||||
@@ -1116,6 +1371,10 @@ impl SwEncState {
|
||||
"SwEncState::new_webrtc: GPU downscale {width}x{height} BGRA -> {enc_width}x{enc_height} NV12, software H.264 -> WebRTC"
|
||||
);
|
||||
let import = SwEncImport::new(drm_device, width, height, enc_width, enc_height, fps)?;
|
||||
let (dummy_tx, bitrate_rx) = crossbeam_channel::bounded(1);
|
||||
drop(dummy_tx);
|
||||
let (dummy_resolution_tx, resolution_rx) = crossbeam_channel::bounded(1);
|
||||
drop(dummy_resolution_tx);
|
||||
let encode = SwEncEncode::new_webrtc(
|
||||
enc_width,
|
||||
enc_height,
|
||||
@@ -1124,6 +1383,8 @@ impl SwEncState {
|
||||
gop_size,
|
||||
tx,
|
||||
webrtc_paused,
|
||||
bitrate_rx,
|
||||
resolution_rx,
|
||||
)?;
|
||||
Ok(Self { import, encode })
|
||||
}
|
||||
@@ -1348,6 +1609,10 @@ fn create_software_h264_muxer(
|
||||
let val = CString::new("6").unwrap();
|
||||
ffi::av_opt_set((*enc.as_mut_ptr()).priv_data, key.as_ptr(), val.as_ptr(), 0);
|
||||
(*enc.as_mut_ptr()).profile = ffi::AV_PROFILE_H264_HIGH as i32;
|
||||
// SAFETY: enc is a valid, initialized AVCodecContext from
|
||||
// avcodec_alloc_context3. Setting level is a simple i32 field
|
||||
// assignment on a properly aligned struct.
|
||||
(*enc.as_mut_ptr()).level = 40; // H.264 Level 4.0 (up to 1080p@30)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1472,8 +1737,17 @@ fn create_software_h264_encoder(
|
||||
// High profile via AVCodecContext.profile (not x264opts — x264 rejects it there).
|
||||
// High enables CABAC + 8x8dct automatically.
|
||||
(*enc.as_mut_ptr()).profile = ffi::AV_PROFILE_H264_HIGH as i32;
|
||||
// SAFETY: enc is a valid, initialized AVCodecContext from
|
||||
// avcodec_alloc_context3. Setting level is a simple i32 field
|
||||
// assignment on a properly aligned struct.
|
||||
(*enc.as_mut_ptr()).level = 42; // H.264 Level 4.2 (up to 1440p@30)
|
||||
let key = CString::new("x264opts").unwrap();
|
||||
let val = CString::new("repeat_headers=1").unwrap();
|
||||
let vbv_maxrate = bitrate;
|
||||
let vbv_bufsize = bitrate / 4;
|
||||
let val = CString::new(format!(
|
||||
"repeat_headers=1:vbv-maxrate={vbv_maxrate}:vbv-bufsize={vbv_bufsize}"
|
||||
))
|
||||
.unwrap();
|
||||
ffi::av_opt_set((*enc.as_mut_ptr()).priv_data, key.as_ptr(), val.as_ptr(), 0);
|
||||
}
|
||||
}
|
||||
@@ -1590,3 +1864,129 @@ fn build_filter_graph(
|
||||
|
||||
Ok(graph)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
// ── Task 1: VBV x264opts formatting ──
|
||||
|
||||
#[test]
|
||||
fn vbv_x264opts_format() {
|
||||
let bitrate: u64 = 5_000_000;
|
||||
let vbv_maxrate = bitrate;
|
||||
let vbv_bufsize = bitrate / 4;
|
||||
let opts = format!("repeat_headers=1:vbv-maxrate={vbv_maxrate}:vbv-bufsize={vbv_bufsize}");
|
||||
assert!(opts.contains("vbv-maxrate=5000000"));
|
||||
assert!(opts.contains("vbv-bufsize=1250000"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn vbv_bufsize_is_quarter_of_maxrate() {
|
||||
for bitrate in [1_000_000, 5_000_000, 10_000_000] {
|
||||
let maxrate = bitrate;
|
||||
let bufsize = bitrate / 4;
|
||||
assert_eq!(bufsize * 4, maxrate, "bufsize should be maxrate/4");
|
||||
}
|
||||
}
|
||||
|
||||
// ── Task 3: GOP formula ──
|
||||
|
||||
#[test]
|
||||
fn webrtc_gop_formula() {
|
||||
assert_eq!((15u32 * 2).max(20), 30); // 15fps -> 30
|
||||
assert_eq!((30u32 * 2).max(20), 60); // 30fps -> 60
|
||||
assert_eq!((60u32 * 2).max(20), 120); // 60fps -> 120
|
||||
assert_eq!((5u32 * 2).max(20), 20); // 5fps -> 20 (floor)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn h264_level_values() {
|
||||
// Level 4.0 supports up to 1080p@30fps (used for file muxer)
|
||||
assert_eq!(40i32, 40);
|
||||
// Level 4.2 supports up to 1440p@30fps (used for WebRTC low-latency encoder)
|
||||
assert_eq!(42i32, 42);
|
||||
}
|
||||
|
||||
// ── Task 4: Duplicate frame hash detection ──
|
||||
|
||||
#[test]
|
||||
fn hash_sampled_y_plane_first_frame_consistent() {
|
||||
let width = 64;
|
||||
let height = 64;
|
||||
let stride = 64;
|
||||
let y_data = vec![0u8; stride * height];
|
||||
let hash1 = hash_sampled_y_plane(&y_data, width, height, stride);
|
||||
let hash2 = hash_sampled_y_plane(&y_data, width, height, stride);
|
||||
assert_eq!(hash1, hash2, "same input should produce same hash");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn hash_sampled_y_plane_detects_different_frames() {
|
||||
let width = 64;
|
||||
let height = 64;
|
||||
let stride = 64;
|
||||
let y_data1 = vec![0u8; stride * height];
|
||||
let y_data2 = vec![128u8; stride * height];
|
||||
let hash1 = hash_sampled_y_plane(&y_data1, width, height, stride);
|
||||
let hash2 = hash_sampled_y_plane(&y_data2, width, height, stride);
|
||||
assert_ne!(
|
||||
hash1, hash2,
|
||||
"different frame data should produce different hashes"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn hash_sampled_y_plane_samples_every_8th_row() {
|
||||
// Changing a non-sampled row (e.g., row 1) should NOT change the hash
|
||||
let width = 64;
|
||||
let height = 64;
|
||||
let stride = 64;
|
||||
let y_data1 = vec![0u8; stride * height];
|
||||
let mut y_data2 = vec![0u8; stride * height];
|
||||
// Row 1 is NOT sampled (sampling is every 8th row: 0, 8, 16, ...)
|
||||
y_data2[stride * 1..stride * 1 + width].fill(255);
|
||||
let hash1 = hash_sampled_y_plane(&y_data1, width, height, stride);
|
||||
let hash2 = hash_sampled_y_plane(&y_data2, width, height, stride);
|
||||
assert_eq!(
|
||||
hash1, hash2,
|
||||
"non-sampled row change should not affect hash"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn hash_sampled_y_plane_sensitive_to_sampled_row() {
|
||||
// Changing a sampled row (row 0) SHOULD change the hash
|
||||
let width = 64;
|
||||
let height = 64;
|
||||
let stride = 64;
|
||||
let y_data1 = vec![0u8; stride * height];
|
||||
let mut y_data2 = vec![0u8; stride * height];
|
||||
// Row 0 IS sampled (every 8th row starting from 0)
|
||||
y_data2[stride * 0..stride * 0 + width].fill(255);
|
||||
let hash1 = hash_sampled_y_plane(&y_data1, width, height, stride);
|
||||
let hash2 = hash_sampled_y_plane(&y_data2, width, height, stride);
|
||||
assert_ne!(
|
||||
hash1, hash2,
|
||||
"sampled row change should produce different hash"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn hash_sampled_y_plane_handles_stride_greater_than_width() {
|
||||
// Stride can be larger than width due to alignment; unused padding should not affect hash
|
||||
let width = 32;
|
||||
let height = 16;
|
||||
let stride = 64; // padded stride
|
||||
let y_data1 = vec![0u8; stride * height];
|
||||
let mut y_data2 = vec![0u8; stride * height];
|
||||
// Fill the padding area (columns 32..63) of row 0 with garbage
|
||||
y_data2[width..stride].fill(0xFF);
|
||||
let hash1 = hash_sampled_y_plane(&y_data1, width, height, stride);
|
||||
let hash2 = hash_sampled_y_plane(&y_data2, width, height, stride);
|
||||
assert_eq!(
|
||||
hash1, hash2,
|
||||
"padding bytes beyond width should not affect hash"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user