减少压缩体积

Author: pysrc

dsweb-core/src/config.rs

@@ -1,5 +1,5 @@
-// 传输像素保留位数（右边0越多压缩程度越大）
-pub const BIT_MASK: u8 = 0b1111_1000;
+// 传输像素保留位数（0~8,越大压缩率越高，失真率越高）
+pub const BIT_MASK: u8 = 4;
 
 // 最小检测区域宽
 pub const SW: usize = 100;

dsweb-core/src/imop.rs

@@ -17,9 +17,9 @@ pub fn sub_areas_bgra(bgra: &[u8], recs: &mut Vec<Vec<u8>>, w: usize, h: usize,
                         let g = bgra[index + 1];
                         let b = bgra[index];
                         let rec_index = (j*sw + k) * 3;
-                        rec[rec_index] = r & config::BIT_MASK;
-                        rec[rec_index+1] = g & config::BIT_MASK;
-                        rec[rec_index+2] = b & config::BIT_MASK;
+                        rec[rec_index] = r >> config::BIT_MASK;
+                        rec[rec_index+1] = g >> config::BIT_MASK;
+                        rec[rec_index+2] = b >> config::BIT_MASK;
                     }
                 }
             }

dsweb-core/src/server.rs

@@ -138,8 +138,8 @@ fn screen_stream(mut stream: Writer<TcpStream>, running: Arc<AtomicBool>) {
     let (mut a, srw, srh) = get_rgb_block(w, h, sw, sh, 2);
     let block_len = srw * srh;
     let (mut b, _, _) = get_rgb_block(w, h, sw, sh, 2);
-    // 发送w, h, sw, sh
-    let mut meta = vec![0u8;8];
+    // 发送w, h, sw, sh, mask
+    let mut meta = vec![0u8;9];
     meta[0] = (w >> 8) as u8;
     meta[1] = w as u8;
     meta[2] = (h >> 8) as u8;
@@ -148,6 +148,7 @@ fn screen_stream(mut stream: Writer<TcpStream>, running: Arc<AtomicBool>) {
     meta[5] = sw as u8;
     meta[6] = (sh >> 8) as u8;
     meta[7] = sh as u8;
+    meta[8] = config::BIT_MASK;
     (stream, _) = ws_send(stream, meta);
     let mut sendbuf = Vec::<u8>::with_capacity(1024 * 4);
     while running.load(Ordering::Relaxed) {

dsweb-front/src/lib.rs

@@ -45,17 +45,19 @@ pub fn start_websocket(canvas_id: &str, host: &str) -> Result<WebSocket, JsValue
     let (fw, fh) = (Rc::new(RwLock::new(0u32)), Rc::new(RwLock::new(0u32)));
     let canvas1 = canvas.clone();
     let (tfw, tfh) = (fw.clone(), fh.clone());
+    let mut bit_mask = 0u8;
     let onmessage_callback = Closure::wrap(Box::new(move |e: MessageEvent| {
         if let Ok(abuf) = e.data().dyn_into::<js_sys::ArrayBuffer>() {
             let array = js_sys::Uint8Array::new(&abuf);
             let data = array.to_vec();
             let len = array.byte_length() as usize;
-            if len == 8 {
+            if len == 9 {
                 // 初始化w, h
                 let w = ((data[0] as u32) << 8) | (data[1] as u32);
                 let h = ((data[2] as u32) << 8) | (data[3] as u32);
                 sw = ((data[4] as u32) << 8) | (data[5] as u32);
                 sh = ((data[6] as u32) << 8) | (data[7] as u32);
+                bit_mask = data[8];
                 srw = (w / sw) + if w % sw == 0 {0u32} else {1u32};
                 if let Ok(mut tfw) = tfw.write() {
                     *tfw = w;
@@ -83,7 +85,7 @@ pub fn start_websocket(canvas_id: &str, host: &str) -> Result<WebSocket, JsValue
                         .chunks_exact_mut(4)
                         .zip((temp[2..]).chunks_exact(3))
                         .for_each(|(c, b)| {
-                            (c[0], c[1], c[2], c[3]) = (b[0], b[1], b[2], 255u8);
+                            (c[0], c[1], c[2], c[3]) = (b[0] << bit_mask, b[1] << bit_mask, b[2] << bit_mask, 255u8);
                         });
                     let im = ImageData::new_with_u8_clamped_array_and_sh(Clamped(&real_img), sw, sh)
                         .unwrap();