switch NABufferType to use refs for video buffers

[nihav.git] / nihav-duck / src / codecs / truemotion1.rs

diff --git a/nihav-duck/src/codecs/truemotion1.rs b/nihav-duck/src/codecs/truemotion1.rs
index b8edd4e383050ce4b5bbdeaaec3fdd91987151df..c205b3cb9fee5fa51952f836338d60ecc4cb4fd5 100644 (file)
--- a/nihav-duck/src/codecs/truemotion1.rs
+++ b/nihav-duck/src/codecs/truemotion1.rs
@@ -129,27 +129,27 @@ impl Default for DeltaTables {
 }
 
 struct FrameBuf {
-    last16: Option<NAVideoBuffer<u16>>,
-    last24: Option<NAVideoBuffer<u8>>,
+    last16: Option<NAVideoBufferRef<u16>>,
+    last24: Option<NAVideoBufferRef<u8>>,
 }
 
 impl FrameBuf {
-    fn set16(&mut self, buf: NAVideoBuffer<u16>) { self.last16 = Some(buf); }
-    fn set24(&mut self, buf: NAVideoBuffer<u8>)  { self.last24 = Some(buf); }
-    fn get16(&mut self) -> Option<NAVideoBuffer<u16>> {
+    fn set16(&mut self, buf: NAVideoBufferRef<u16>) { self.last16 = Some(buf); }
+    fn set24(&mut self, buf: NAVideoBufferRef<u8>)  { self.last24 = Some(buf); }
+    fn get16(&mut self) -> Option<NAVideoBufferRef<u16>> {
         if let Some(ref mut frm) = self.last16 {
             let newfrm = frm.copy_buffer();
-            *frm = newfrm.clone();
-            Some(newfrm)
+            *frm = newfrm.clone().into_ref();
+            Some(newfrm.into_ref())
         } else {
             None
         }
     }
-    fn get24(&mut self) -> Option<NAVideoBuffer<u8>> {
+    fn get24(&mut self) -> Option<NAVideoBufferRef<u8>> {
         if let Some(ref mut frm) = self.last24 {
             let newfrm = frm.copy_buffer();
-            *frm = newfrm.clone();
-            Some(newfrm)
+            *frm = newfrm.clone().into_ref();
+            Some(newfrm.into_ref())
         } else {
             None
         }