X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Ftruemotionrt.rs;h=12548ef302719698dff09b1ab6d3cf80f6d19746;hb=2422d9699cd56cbb86ac32b3e8dd026e20a89db5;hp=3881ee7e3e15a3b1d1700bb3daebe91b146e9987;hpb=1b8522d6275f5a8e252b7c7283ed4d80a594db93;p=nihav.git

diff --git a/nihav-duck/src/codecs/truemotionrt.rs b/nihav-duck/src/codecs/truemotionrt.rs
index 3881ee7..12548ef 100644
--- a/nihav-duck/src/codecs/truemotionrt.rs
+++ b/nihav-duck/src/codecs/truemotionrt.rs
@@ -3,7 +3,7 @@ use nihav_core::io::bitreader::*;
 
 #[derive(Default)]
 struct TMRTDecoder {
-    info:       Rc<NACodecInfo>,
+    info:       NACodecInfoRef,
 }
 
 const TMRT_DELTA_TAB: [&[i16]; 3] = [
@@ -35,10 +35,10 @@ impl TMRTDecoder {
 }
 
 impl NADecoder for TMRTDecoder {
-    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)
@@ -62,7 +62,7 @@ impl NADecoder for TMRTDecoder {
         let myinfo = NAVideoInfo::new(width, height, false, YUV410_FORMAT);
         let bufret = alloc_video_buffer(myinfo, 2);
         if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
-        let mut bufinfo = bufret.unwrap();
+        let bufinfo = bufret.unwrap();
         let mut buf = bufinfo.get_vbuf().unwrap();
 
         let mut br = BitReader::new(&src[hdr_size..], src.len() - hdr_size, BitReaderMode::LE);
@@ -72,7 +72,7 @@ impl NADecoder for TMRTDecoder {
             let (w, h)  = buf.get_dimensions(plane);
             let off     = buf.get_offset(plane);
             let stride  = buf.get_stride(plane);
-            let mut data = buf.get_data_mut();
+            let data = buf.get_data_mut().unwrap();
             let dst = data.as_mut_slice();
             self.decode_plane(&mut br, dst, off, stride, w, h, hscale, dbits, plane > 0)?;
         }