hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6487 from sahilyeole/fix/wayland_distorted_stream_scaling

Browse Source 
Fix: wayland fractional scaling distortion
This commit is contained in:
RustDesk 2023-11-21 21:46:32 +08:00 committed by GitHub
commit 4a2bf7a0c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libs/scrap/src/wayland/pipewire.rs
View File

@ -67,13 +67,23 @@ pub struct PipeWireCapturable {
impl PipeWireCapturable {
fn new(conn: Arc<SyncConnection>, fd: OwnedFd, stream: PwStreamInfo) -> Self {
// alternative to get screen resolution as stream.size is not always correct ex: on fractional scaling
// https://github.com/rustdesk/rustdesk/issues/6116#issuecomment-1817724244
let res = get_res(Self {
dbus_conn: conn.clone(),
fd: fd.clone(),
path: stream.path,
source_type: stream.source_type,
position: stream.position,
size: stream.size,
});
Self {
dbus_conn: conn,
fd,
path: stream.path,
source_type: stream.source_type,
position: stream.position,
size: stream.size,
size: res.unwrap_or(stream.size),
}
}
}
@ -114,6 +124,27 @@ impl Capturable for PipeWireCapturable {
}
}
fn get_res(capturable:PipeWireCapturable) -> Result<(usize, usize), Box<dyn Error>> {
let rec = PipeWireRecorder::new(capturable)?;
if let Some(sample) = rec.appsink
.try_pull_sample(gst::ClockTime::from_mseconds(300))
{
let cap = sample
.get_caps()
.ok_or("Failed get caps")?
.get_structure(0)
.ok_or("Failed to get structure")?;
let w: i32 = cap.get_value("width")?.get_some()?;
let h: i32 = cap.get_value("height")?.get_some()?;
let w = w as usize;
let h = h as usize;
Ok((w,h))
}
else {
Err(Box::new(GStreamerError("Error getting screen resolution".into())))
}
}
pub struct PipeWireRecorder {
buffer: Option<gst::MappedBuffer<gst::buffer::Readable>>,
buffer_cropped: Vec<u8>,