switch NACodecInfo to Arc

[nihav.git] / nihav-rad / src / codecs / smacker.rs

diff --git a/nihav-rad/src/codecs/smacker.rs b/nihav-rad/src/codecs/smacker.rs
index 85d0e4fceed48bc903c0d03938458e39ae06a44d..bc27ab0b31a6616d5761c6cf97d1d319f5d911ca 100644 (file)
--- a/nihav-rad/src/codecs/smacker.rs
+++ b/nihav-rad/src/codecs/smacker.rs
@@ -160,7 +160,9 @@ impl SmackerTree16 {
     }
     fn reset(&mut self) {
         for i in 0..self.last.len() {
-            self.tree[self.last[i]] = 0;
+            if self.last[i] != SMK_LAST_UNINIT {
+                self.tree[self.last[i]] = 0;
+            }
         }
     }
 }
@@ -208,7 +210,7 @@ const SMK_BLOCK_RUNS: [usize; 64] = [
 ];
 
 struct SmackerVideoDecoder {
-    info:       Rc<NACodecInfo>,
+    info:       NACodecInfoRef,
     mmap_tree:  SmackerTree16,
     mclr_tree:  SmackerTree16,
     full_tree:  SmackerTree16,
@@ -225,9 +227,8 @@ struct SmackerVideoDecoder {
 
 impl SmackerVideoDecoder {
     fn new() -> Self {
-        let dummy_info = Rc::new(DUMMY_CODEC_INFO);
         Self {
-            info:       dummy_info,
+            info:       NACodecInfoRef::default(),
             mmap_tree:  SmackerTree16::new(),
             mclr_tree:  SmackerTree16::new(),
             full_tree:  SmackerTree16::new(),
@@ -359,7 +360,7 @@ impl SmackerVideoDecoder {
     }
     fn output_frame(&self, buf: &mut NAVideoBuffer<u8>) {
         let stride = buf.get_stride(0);
-        let mut data = buf.get_data_mut();
+        let data = buf.get_data_mut().unwrap();
         let dst = data.as_mut_slice();
         let is_scaled = (self.flags & SMK_FLAG_SCALED) != 0;
         let is_interlaced = (self.flags & SMK_FLAG_INTERLACED) != 0;
@@ -386,7 +387,7 @@ impl SmackerVideoDecoder {
 }
 
 impl NADecoder for SmackerVideoDecoder {
-    fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+    fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
         if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
             let w = vinfo.get_width();
             let h = vinfo.get_height();
@@ -426,8 +427,7 @@ impl NADecoder for SmackerVideoDecoder {
                 out_h <<= 1;
             }
             let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(w, out_h, false, fmt));
-            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 {
@@ -451,7 +451,7 @@ impl NADecoder for SmackerVideoDecoder {
             is_intra = self.decode_frame(&mut br)?;
             self.output_frame(&mut buf);
             let paloff = buf.get_offset(1);
-            let mut data = buf.get_data_mut();
+            let data = buf.get_data_mut().unwrap();
             let dst = data.as_mut_slice();
             let palout = &mut dst[paloff..][..PAL_SIZE];
             palout.copy_from_slice(&src[0..PAL_SIZE]);
@@ -492,7 +492,7 @@ impl SmackerAudioDecoder {
 }
 
 impl NADecoder for SmackerAudioDecoder {
-    fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+    fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
         if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
             self.bits = ainfo.get_format().get_bits();
             let fmt = if self.bits == 8 { SND_U8_FORMAT } else { SND_S16P_FORMAT };
@@ -541,7 +541,7 @@ impl NADecoder for SmackerAudioDecoder {
                 abuf = alloc_audio_buffer(self.ainfo, samples, self.chmap.clone())?;
                 let mut adata = abuf.get_abuf_i16().unwrap();
                 let offs: [usize; 2] = [0, adata.get_offset(1)];
-                let mut dst = adata.get_data_mut();
+                let dst = adata.get_data_mut().unwrap();
                 for ch in 0..nch {
                     dst[offs[ch]] = pred[ch];
                 }
@@ -557,7 +557,7 @@ impl NADecoder for SmackerAudioDecoder {
                 samples = unp_size / nch;
                 abuf = alloc_audio_buffer(self.ainfo, samples, self.chmap.clone())?;
                 let mut adata = abuf.get_abuf_u8().unwrap();
-                let mut dst = adata.get_data_mut();
+                let dst = adata.get_data_mut().unwrap();
                 if stereo {
                     let mut trees: [SmackerTree8; 2] = [SmackerTree8::new(), SmackerTree8::new()];
                     trees[0].decode(&mut br)?;