oiupoyt/scythe
1
1
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

fix: Resolve Wayland EIO (-5) DMA-BUF to VAAPI mapping crash by passing DRM format modifiers

Browse source
This commit is contained in:
katR 2026-09-02 07:47:18 +05:30
parent 5fac181cfe
commit 82904833f0
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/capture/mod.rs
View file

@ -12,7 +12,7 @@ pub enum Frame {
DmaBuf {
width: u32,
height: u32,
format: u32,
format: u32, modifier: u64,
fd: RawFd,
stride: u32,
offset: u32,

3
src/capture/wayland_stream.rs
View file

@ -78,7 +78,8 @@ impl PipeWireStream {
let frame = Frame::DmaBuf {
width: user_data.format.size().width,
height: user_data.format.size().height,
format: 0x34325241, // DRM_FORMAT_ARGB8888
format: 0x34325241, // DRM_FORMAT_ARGB8888
modifier: user_data.format.modifier(),
fd: data.fd(),
stride: data.chunk().stride() as u32,
offset: data.chunk().offset(),

4
src/encoder.rs
View file

@ -140,13 +140,13 @@ impl VaapiEncoder {
av_frame_free(&mut nv12_frame);
av_frame_free(&mut bgra_frame);
}
Frame::DmaBuf { width: dma_width, height: dma_height, format, fd, stride, offset } => {
Frame::DmaBuf { width: dma_width, height: dma_height, format, modifier, fd, stride, offset } => {
let mut drm_desc = AVDRMFrameDescriptor {
nb_objects: 1,
objects: [AVDRMObjectDescriptor {
fd: *fd,
size: 0, // usually ignored or mapped by driver
format_modifier: 0, // DRM_FORMAT_MOD_LINEAR (or read from PipeWire format)
format_modifier: *modifier,
}, std::mem::zeroed(), std::mem::zeroed(), std::mem::zeroed()],
nb_layers: 1,
layers: [AVDRMLayerDescriptor {