444

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

libs/scrap/src/common/quartz.rs

@@ -1,18 +1,16 @@
-use crate::quartz;
+use crate::{quartz, Pixfmt};
 use std::marker::PhantomData;
 use std::sync::{Arc, Mutex, TryLockError};
-use std::{io, mem, ops};
+use std::{io, mem};
 
 pub struct Capturer {
     inner: quartz::Capturer,
     frame: Arc<Mutex<Option<quartz::Frame>>>,
-    use_yuv: bool,
-    i420: 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> {
         let frame = Arc::new(Mutex::new(None));
 
         let f = frame.clone();
@@ -20,11 +18,7 @@ impl Capturer {
             display.0,
             display.width(),
             display.height(),
-            if use_yuv {
-                quartz::PixelFormat::YCbCr420Video
-            } else {
-                quartz::PixelFormat::Argb8888
-            },
+            quartz::PixelFormat::Argb8888,
             Default::default(),
             move |inner| {
                 if let Ok(mut f) = f.lock() {
@@ -37,8 +31,6 @@ impl Capturer {
         Ok(Capturer {
             inner,
             frame,
-            use_yuv,
-            i420: Vec::new(),
             saved_raw_data: Vec::new(),
         })
     }
@@ -53,10 +45,6 @@ impl Capturer {
 }
 
 impl crate::TraitCapturer for Capturer {
-    fn set_use_yuv(&mut self, use_yuv: bool) {
-        self.use_yuv = use_yuv;
-    }
-
     fn frame<'a>(&'a mut self, _timeout_ms: std::time::Duration) -> io::Result<Frame<'a>> {
         match self.frame.try_lock() {
             Ok(mut handle) => {
@@ -66,9 +54,7 @@ impl crate::TraitCapturer for Capturer {
                 match frame {
                     Some(mut frame) => {
                         crate::would_block_if_equal(&mut self.saved_raw_data, frame.inner())?;
-                        if self.use_yuv {
-                            frame.nv12_to_i420(self.width(), self.height(), &mut self.i420);
-                        }
+                        frame.surface_to_bgra(self.height());
                         Ok(Frame(frame, PhantomData))
                     }
 
@@ -85,11 +71,20 @@ impl crate::TraitCapturer for Capturer {
 
 pub struct Frame<'a>(pub quartz::Frame, PhantomData<&'a [u8]>);
 
-impl<'a> ops::Deref for Frame<'a> {
-    type Target = [u8];
-    fn deref(&self) -> &[u8] {
+impl<'a> crate::TraitFrame for Frame<'a> {
+    fn data(&self) -> &[u8] {
         &*self.0
     }
+
+    fn stride(&self) -> Vec<usize> {
+        let mut v = Vec::new();
+        v.push(self.0.stride());
+        v
+    }
+
+    fn pixfmt(&self) -> Pixfmt {
+        Pixfmt::BGRA
+    }
 }
 
 pub struct Display(quartz::Display);