444

Signed-off-by: 21pages <pages21@163.com>

libs/scrap/src/x11/capturer.rs

@@ -2,6 +2,8 @@ use std::{io, ptr, slice};
 
 use hbb_common::libc;
 
+use crate::Frame;
+
 use super::ffi::*;
 use super::Display;
 
@@ -12,13 +14,11 @@ pub struct Capturer {
     buffer: *const u8,
 
     size: usize,
-    use_yuv: bool,
-    yuv: Vec<u8>,
     saved_raw_data: Vec<u8>, // for faster compare and copy
 }
 
 impl Capturer {
-    pub fn new(display: Display, use_yuv: bool) -> io::Result<Capturer> {
+    pub fn new(display: Display) -> io::Result<Capturer> {
         // Calculate dimensions.
 
         let pixel_width = 4;
@@ -67,17 +67,11 @@ impl Capturer {
             xcbid,
             buffer,
             size,
-            use_yuv,
-            yuv: Vec::new(),
             saved_raw_data: Vec::new(),
         };
         Ok(c)
     }
 
-    pub fn set_use_yuv(&mut self, use_yuv: bool) {
-        self.use_yuv = use_yuv;
-    }
-
     pub fn display(&self) -> &Display {
         &self.display
     }
@@ -103,16 +97,13 @@ impl Capturer {
         }
     }
 
-    pub fn frame<'b>(&'b mut self) -> std::io::Result<&'b [u8]> {
+    pub fn frame<'b>(&'b mut self) -> std::io::Result<Frame> {
         self.get_image();
         let result = unsafe { slice::from_raw_parts(self.buffer, self.size) };
         crate::would_block_if_equal(&mut self.saved_raw_data, result)?;
-        Ok(if self.use_yuv {
-            crate::common::bgra_to_i420(self.display.w(), self.display.h(), &result, &mut self.yuv);
-            &self.yuv[..]
-        } else {
-            result
-        })
+        Ok(
+            Frame::new(result, crate::Pixfmt::BGRA, self.display.h())
+       )
     }
 }