Merge pull request #27 from lilyyy411/master

Store `Sample` directly instead of copying out of it.

src/pipeline.rs

@@ -9,6 +9,8 @@ use std::{
     },
 };
 
+use crate::video::Frame;
+
 #[repr(C)]
 struct Uniforms {
     rect: [f32; 4],
@@ -383,7 +385,7 @@ impl VideoPipeline {
 pub(crate) struct VideoPrimitive {
     video_id: u64,
     alive: Arc<AtomicBool>,
-    frame: Arc<Mutex<Vec<u8>>>,
+    frame: Arc<Mutex<Frame>>,
     size: (u32, u32),
     upload_frame: bool,
 }
@@ -392,7 +394,7 @@ impl VideoPrimitive {
     pub fn new(
         video_id: u64,
         alive: Arc<AtomicBool>,
-        frame: Arc<Mutex<Vec<u8>>>,
+        frame: Arc<Mutex<Frame>>,
         size: (u32, u32),
         upload_frame: bool,
     ) -> Self {
@@ -423,15 +425,17 @@ impl Primitive for VideoPrimitive {
         let pipeline = storage.get_mut::<VideoPipeline>().unwrap();
 
         if self.upload_frame {
+            if let Some(readable) = self.frame.lock().expect("lock frame mutex").readable() {
                 pipeline.upload(
                     device,
                     queue,
                     self.video_id,
                     &self.alive,
                     self.size,
-                self.frame.lock().expect("lock frame mutex").as_slice(),
+                    readable.as_slice(),
                 );
             }
+        }
 
         pipeline.prepare(
             queue,

src/video.rs

@@ -41,6 +41,26 @@ impl From<u64> for Position {
     }
 }
 
+#[derive(Debug)]
+pub(crate) struct Frame(gst::Sample);
+
+impl Frame {
+    pub fn new() -> Self {
+        Self(gst::Sample::builder().build())
+    }
+    pub fn store(&mut self, sample: gst::Sample) -> Option<()> {
+        if sample.buffer().is_some() {
+            self.0 = sample;
+            Some(())
+        } else {
+            None
+        }
+    }
+    pub fn readable(&self) -> Option<gst::BufferMap<gst::buffer::Readable>> {
+        self.0.buffer().map(|x| x.map_readable().ok()).flatten()
+    }
+}
+
 #[derive(Debug)]
 pub(crate) struct Internal {
     pub(crate) id: u64,
@@ -57,7 +77,7 @@ pub(crate) struct Internal {
     pub(crate) speed: f64,
     pub(crate) sync_av: bool,
 
-    pub(crate) frame: Arc<Mutex<Vec<u8>>>,
+    pub(crate) frame: Arc<Mutex<Frame>>,
     pub(crate) upload_frame: Arc<AtomicBool>,
     pub(crate) last_frame_time: Arc<Mutex<Instant>>,
     pub(crate) looping: bool,
@@ -222,7 +242,6 @@ impl Video {
         let video_sink = video_sink.downcast::<gst_app::AppSink>().unwrap();
 
         let text_sink: gst::Element = pipeline.property("text-sink");
-        //let pad = text_sink.pads().get(0).cloned().unwrap();
         let text_sink = text_sink.downcast::<gst_app::AppSink>().unwrap();
 
         Self::from_gst_pipeline(pipeline, video_sink, Some(text_sink))
@@ -293,11 +312,7 @@ impl Video {
         let sync_av = pipeline.has_property("av-offset", None);
 
         // NV12 = 12bpp
-        let frame = Arc::new(Mutex::new(vec![
+        let frame = Arc::new(Mutex::new(Frame::new()));
-            0u8;
-            (width as usize * height as usize * 3)
-                .div_ceil(2)
-        ]));
         let upload_frame = Arc::new(AtomicBool::new(false));
         let alive = Arc::new(AtomicBool::new(true));
         let last_frame_time = Arc::new(Mutex::new(Instant::now()));
@@ -336,11 +351,11 @@ impl Video {
 
                     let buffer = sample.buffer().ok_or(gst::FlowError::Error)?;
                     let pts = buffer.pts().unwrap_or_default();
-                    let map = buffer.map_readable().map_err(|_| gst::FlowError::Error)?;
+                    {
-
+                        let mut frame_guard =
-                    let mut frame = frame_ref.lock().map_err(|_| gst::FlowError::Error)?;
+                            frame_ref.lock().map_err(|_| gst::FlowError::Error)?;
-                    let frame_len = frame.len();
+                        *frame_guard = Frame(sample);
-                    frame.copy_from_slice(&map.as_slice()[..frame_len]);
+                    }
 
                     upload_frame_ref.swap(true, Ordering::SeqCst);
 
@@ -574,15 +589,13 @@ impl Video {
                     while !inner.upload_frame.load(Ordering::SeqCst) {
                         std::hint::spin_loop();
                     }
+                    let frame_guard = inner.frame.lock().map_err(|_| Error::Lock)?;
+                    let frame = frame_guard.readable().ok_or(Error::Lock)?;
+
                     Ok(img::Handle::from_rgba(
                         inner.width as u32 / downscale,
                         inner.height as u32 / downscale,
-                        yuv_to_rgba(
+                        yuv_to_rgba(frame.as_slice(), width as _, height as _, downscale),
-                            &inner.frame.lock().map_err(|_| Error::Lock)?,
-                            width as _,
-                            height as _,
-                            downscale,
-                        ),
                     ))
                 })
                 .collect()