Skip to content

Windows video playback optimisations #1454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richiemcilroy merged 9 commits into from
Dec 17, 2025
Merged

Windows video playback optimisations #1454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e532663
Add dynamic texture allocation and scaling to YUV converter
richiemcilroy Dec 17, 2025
0191193
Add hardware decoder capability checks and threading config
richiemcilroy Dec 17, 2025
4c48ebd
Add decoder capability queries and zero-copy fallback
richiemcilroy Dec 17, 2025
8521adf
Add parallel SIMD YUV conversion with progress tracking
richiemcilroy Dec 17, 2025
fd8aa63
Refactor error formatting and allow redundant closure lint
richiemcilroy Dec 17, 2025
fae0156
clippy
richiemcilroy Dec 17, 2025
e171607
clippy
richiemcilroy Dec 17, 2025
b4bffad
clippy
richiemcilroy Dec 17, 2025
ed8f831
clippy
richiemcilroy Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 15 additions & 24 deletions crates/frame-converter/src/d3d11.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,15 @@ pub struct D3D11Converter {
fn get_gpu_info(device: &ID3D11Device) -> Result<GpuInfo, ConvertError> {
unsafe {
let dxgi_device: IDXGIDevice = device.cast().map_err(|e| {
ConvertError::HardwareUnavailable(format!("Failed to get DXGI device: {:?}", e))
ConvertError::HardwareUnavailable(format!("Failed to get DXGI device: {e:?}"))
})?;

let adapter: IDXGIAdapter = dxgi_device.GetAdapter().map_err(|e| {
ConvertError::HardwareUnavailable(format!("Failed to get adapter: {:?}", e))
ConvertError::HardwareUnavailable(format!("Failed to get adapter: {e:?}"))
})?;

let desc = adapter.GetDesc().map_err(|e| {
ConvertError::HardwareUnavailable(format!("Failed to get adapter description: {:?}", e))
ConvertError::HardwareUnavailable(format!("Failed to get adapter description: {e:?}"))
})?;

let description = String::from_utf16_lossy(
Expand Down Expand Up @@ -165,8 +165,7 @@ impl D3D11Converter {
)
.map_err(|e| {
ConvertError::HardwareUnavailable(format!(
"D3D11CreateDevice failed (no hardware GPU available?): {:?}",
e
"D3D11CreateDevice failed (no hardware GPU available?): {e:?}"
))
})?;

Expand All @@ -193,13 +192,12 @@ impl D3D11Converter {

let video_device: ID3D11VideoDevice = device.cast().map_err(|e| {
ConvertError::HardwareUnavailable(format!(
"GPU does not support D3D11 Video API (ID3D11VideoDevice): {:?}",
e
"GPU does not support D3D11 Video API (ID3D11VideoDevice): {e:?}"
))
})?;

let video_context: ID3D11VideoContext = context.cast().map_err(|e| {
ConvertError::HardwareUnavailable(format!("Failed to get ID3D11VideoContext: {:?}", e))
ConvertError::HardwareUnavailable(format!("Failed to get ID3D11VideoContext: {e:?}"))
})?;

let content_desc = D3D11_VIDEO_PROCESSOR_CONTENT_DESC {
Expand All @@ -225,8 +223,8 @@ impl D3D11Converter {
.CreateVideoProcessorEnumerator(&content_desc)
.map_err(|e| {
ConvertError::HardwareUnavailable(format!(
"CreateVideoProcessorEnumerator failed (format {:?}->{:?} not supported by GPU?): {:?}",
config.input_format, config.output_format, e
"CreateVideoProcessorEnumerator failed (format {:?}->{:?} not supported by GPU?): {e:?}",
config.input_format, config.output_format
))
})?
};
Expand All @@ -235,10 +233,7 @@ impl D3D11Converter {
video_device
.CreateVideoProcessor(&enumerator, 0)
.map_err(|e| {
ConvertError::HardwareUnavailable(format!(
"CreateVideoProcessor failed: {:?}",
e
))
ConvertError::HardwareUnavailable(format!("CreateVideoProcessor failed: {e:?}"))
})?
};

Expand Down Expand Up @@ -351,9 +346,7 @@ impl FrameConverter for D3D11Converter {
0,
Some(&mut mapped),
)
.map_err(|e| {
ConvertError::ConversionFailed(format!("Map input failed: {:?}", e))
})?;
.map_err(|e| ConvertError::ConversionFailed(format!("Map input failed: {e:?}")))?;

copy_frame_to_mapped(&input, mapped.pData as *mut u8, mapped.RowPitch as usize);

Expand Down Expand Up @@ -385,7 +378,7 @@ impl FrameConverter for D3D11Converter {
Some(&mut input_view),
)
.map_err(|e| {
ConvertError::ConversionFailed(format!("CreateInputView failed: {:?}", e))
ConvertError::ConversionFailed(format!("CreateInputView failed: {e:?}"))
})?;
let input_view = input_view.ok_or_else(|| {
ConvertError::ConversionFailed("CreateInputView returned null".to_string())
Expand All @@ -411,7 +404,7 @@ impl FrameConverter for D3D11Converter {
Some(&mut output_view),
)
.map_err(|e| {
ConvertError::ConversionFailed(format!("CreateOutputView failed: {:?}", e))
ConvertError::ConversionFailed(format!("CreateOutputView failed: {e:?}"))
})?;
let output_view = output_view.ok_or_else(|| {
ConvertError::ConversionFailed("CreateOutputView returned null".to_string())
Expand All @@ -435,7 +428,7 @@ impl FrameConverter for D3D11Converter {
.video_context
.VideoProcessorBlt(&resources.processor, &output_view, 0, &[stream])
.map_err(|e| {
ConvertError::ConversionFailed(format!("VideoProcessorBlt failed: {:?}", e))
ConvertError::ConversionFailed(format!("VideoProcessorBlt failed: {e:?}"))
})?;

if !self.verified_gpu_usage.swap(true, Ordering::Relaxed) {
Expand All @@ -459,9 +452,7 @@ impl FrameConverter for D3D11Converter {
0,
Some(&mut mapped),
)
.map_err(|e| {
ConvertError::ConversionFailed(format!("Map output failed: {:?}", e))
})?;
.map_err(|e| ConvertError::ConversionFailed(format!("Map output failed: {e:?}")))?;

let mut output =
frame::Video::new(self.output_format, self.output_width, self.output_height);
Expand Down Expand Up @@ -533,7 +524,7 @@ fn create_texture(
device
.CreateTexture2D(&desc, None, Some(&mut texture))
.map_err(|e| {
ConvertError::HardwareUnavailable(format!("CreateTexture2D failed: {:?}", e))
ConvertError::HardwareUnavailable(format!("CreateTexture2D failed: {e:?}"))
})?;
texture.ok_or_else(|| {
ConvertError::HardwareUnavailable("CreateTexture2D returned null".to_string())
Expand Down
5 changes: 2 additions & 3 deletions crates/recording/src/output_pipeline/win.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,7 @@ impl Muxer for WindowsMuxer {
Ok(guard) => guard,
Err(poisoned) => {
return fallback(Some(format!(
"Failed to lock output mutex: {}",
poisoned
"Failed to lock output mutex: {poisoned}"
)));
}
};
Expand Down Expand Up @@ -541,7 +540,7 @@ impl Muxer for WindowsCameraMuxer {
let mut output_guard = match output.lock() {
Ok(guard) => guard,
Err(poisoned) => {
let msg = format!("Failed to lock output mutex: {}", poisoned);
let msg = format!("Failed to lock output mutex: {poisoned}");
let _ = ready_tx.send(Err(anyhow!("{}", msg)));
return Err(anyhow!("{}", msg));
}
Expand Down
1 change: 1 addition & 0 deletions crates/rendering/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ tokio.workspace = true
ffmpeg.workspace = true
futures = { workspace = true }
futures-intrusive = "0.5.0"
rayon = "1.10"
image = "0.25.2"
log = "0.4"
serde = { workspace = true }
Expand Down
Loading