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 eae23d4aff70bd376d3072d85313b4cecf3fa1ad..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
         }
@@ -168,7 +168,7 @@ impl Default for FrameBuf {
 
 #[derive(Default)]
 struct TM1Decoder {
-    info:           Rc<NACodecInfo>,
+    info:           NACodecInfoRef,
     last_delta_set: usize,
     last_table_idx: usize,
     delta_tables:   DeltaTables,
@@ -515,10 +515,10 @@ impl TM1Decoder {
 }
 
 impl NADecoder for TM1Decoder {
-    fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+    fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
         if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
             let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(vinfo.get_width(), vinfo.get_height(), false, YUV410_FORMAT));
-            self.info = Rc::new(NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()));
+            self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref();
             Ok(())
         } else {
             Err(DecoderError::InvalidData)
@@ -578,7 +578,7 @@ impl NADecoder for TM1Decoder {
             let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), NABufferType::None);
             frm.set_keyframe(false);
             frm.set_frame_type(FrameType::Skip);
-            return Ok(Rc::new(RefCell::new(frm)));
+            return Ok(frm.into_ref());
         }
         let compr_info = cinfo.unwrap();
         let is_24bit = !is_sprite && compr_info.is_24bit;
@@ -625,7 +625,7 @@ impl NADecoder for TM1Decoder {
             if let Some(mut buf) = self.lastframe.get16() {
                 let stride = buf.get_stride(0);
                 {
-                    let mut data = buf.get_data_mut();
+                    let data = buf.get_data_mut().unwrap();
                     if !is_sprite {
                         self.decode_16bit(data.as_mut_slice(), stride, out_width, height, &mut mask, &mut index)?;
                     } else {
@@ -644,7 +644,7 @@ impl NADecoder for TM1Decoder {
             if let Some(mut buf) = self.lastframe.get24() {
                 let stride = buf.get_stride(0);
                 {
-                    let mut data = buf.get_data_mut();
+                    let data = buf.get_data_mut().unwrap();
                     self.decode_24bit(data.as_mut_slice(), stride, out_width, height, &mut mask, &mut index)?;
                 }
                 bufinfo = NABufferType::VideoPacked(buf);
@@ -656,7 +656,7 @@ impl NADecoder for TM1Decoder {
         let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo);
         frm.set_keyframe(is_intra || is_sprite);
         frm.set_frame_type(if is_intra { FrameType::I } else { FrameType::P });
-        Ok(Rc::new(RefCell::new(frm)))
+        Ok(frm.into_ref())
     }
 }