修复屏幕尺寸问题

Author: pysrc

dsclient/src/client.rs

@@ -10,8 +10,6 @@ use std::hash::Hasher;
 use std::io::Read;
 use std::io::Write;
 use std::net::TcpStream;
-use std::sync::atomic::AtomicI32;
-use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::sync::RwLock;
 
@@ -111,19 +109,13 @@ fn draw(host: String, pwd: String) {
     let iw = (((meta[0] as u16) << 8) | meta[1] as u16) as i32;
     let ih = (((meta[2] as u16) << 8) | meta[3] as u16) as i32;
 
-    let wh = Arc::new((AtomicI32::new(iw), AtomicI32::new(ih)));
-
-
-    // let dlen = (w * h * 3) as usize;
-
-    let work_buf = Arc::new(RwLock::new((0usize, 0usize, Vec::<u8>::new())));
+    let work_buf = Arc::new(RwLock::new(vec![0u8; (iw * ih * 3) as _]));
     let draw_work_buf = work_buf.clone();
     let mut hooked = false;
     let mut bmap = bitmap::Bitmap::new();
     let mut cmd_buf = [0u8; 5];
-    let wh1 = wh.clone();
     frame.handle(move |f, ev| {
-        let (w, h) = (wh1.0.load(Ordering::Relaxed), wh1.1.load(Ordering::Relaxed));
+        let (w, h) = (iw, ih);
         match ev {
             Event::Enter => {
                 // 进入窗口
@@ -223,7 +215,7 @@ fn draw(host: String, pwd: String) {
         if let Ok(p) = draw_work_buf.read() {
             unsafe {
                 if let Ok(mut image) =
-                    image::RgbImage::from_data2(&p.2, p.0 as _, p.1 as _, enums::ColorDepth::Rgb8 as i32, 0)
+                    image::RgbImage::from_data2(&p, iw as _, ih as _, enums::ColorDepth::Rgb8 as i32, 0)
                 {
                     image.scale(frame.width(), frame.height(), false, true);
                     image.draw(frame.x(), frame.y(), frame.width(), frame.height());             
@@ -265,12 +257,7 @@ fn draw(host: String, pwd: String) {
                 for ele in pkgs {
                     let (y, u, v) = ele.data();
                     if let Ok(mut p) = work_buf.write() {
-                        p.0 = ele.width();
-                        p.1 = ele.height();
-                        wh.0.store(ele.width() as _, Ordering::Relaxed);
-                        wh.1.store(ele.height() as _, Ordering::Relaxed);
-                        p.2.resize(ele.width() * ele.height() * 3, 0u8);
-                        dscom::convert::i420_to_rgb(ele.width(), ele.height(), y, u, v, &mut p.2);
+                        dscom::convert::i420_to_rgb(ele.width(), ele.height(), y, u, v, &mut p, iw as _, ih as _);
                     }
                     tx.send(Msg::Draw);
                 }

dscom/src/convert.rs

@@ -48,23 +48,28 @@ fn clamp(x: i32) -> u8 {
 }
 
 #[allow(dead_code)]
-pub fn i420_to_rgb(width: usize, height: usize, sy: &[u8], su: &[u8], sv: &[u8], dest: &mut [u8]) {
+pub fn i420_to_rgb(width: usize, height: usize, sy: &[u8], su: &[u8], sv: &[u8], dest: &mut [u8], crop_width: usize, crop_height: usize) {
+    // 确保裁剪尺寸不超过原始尺寸
+    let crop_width = crop_width.min(width);
+    let crop_height = crop_height.min(height);
     let uvw = width >> 1;
-    for i in 0..height {
+    for i in 0..crop_height {
         let sw = i * width;
+        let swc = i * crop_width;
         let t = (i >> 1) * uvw;
-        for j in 0..width {
-            let mut rgbstart = sw + j;
+        for j in 0..crop_width {
+            let rgbstart = sw + j;
+            let mut rgbstartc = swc + j;
             let uvi = t + (j >> 1);
 
             let y = sy[rgbstart] as i32;
             let u = su[uvi] as i32 - 128;
             let v = sv[uvi] as i32 - 128;
 
-            rgbstart *= 3;
-            dest[rgbstart] = clamp(y + (v * 359 >> 8));
-            dest[rgbstart + 1] = clamp(y - (u * 88 >> 8) - (v * 182 >> 8));
-            dest[rgbstart + 2] = clamp(y + (u * 453 >> 8));
+            rgbstartc *= 3;
+            dest[rgbstartc] = clamp(y + (v * 359 >> 8));
+            dest[rgbstartc + 1] = clamp(y - (u * 88 >> 8) - (v * 182 >> 8));
+            dest[rgbstartc + 2] = clamp(y + (u * 453 >> 8));
 
         }
     }

dsserver/src/server.rs

@@ -1,4 +1,3 @@
-use enigo::agent::Agent;
 use enigo::Axis;
 use enigo::Coordinate;
 use enigo::Direction;