X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Ftruemotionrt.rs;h=7119061288e1b1c14802c90d9ee81e690e90bfa2;hb=08a1fab72215ea7716f51adf7008f85372e80c71;hp=a4ea0ac139dbd55796166c76f06687224b3ea423;hpb=b70cc0062fd4d791ee20f23439a3b08a04921835;p=nihav.git

diff --git a/nihav-duck/src/codecs/truemotionrt.rs b/nihav-duck/src/codecs/truemotionrt.rs
index a4ea0ac..7119061 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,16 +35,16 @@ impl TMRTDecoder {
 }
 
 impl NADecoder for TMRTDecoder {
-    fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+    fn init(&mut self, _supp: &mut NADecoderSupport, 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)
         }
     }
-    fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
+    fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
         let src = pkt.get_buffer();
         validate!(src.len() > 10);
         let hdr_size = (src[0].rotate_left(3) & 0x7F) as usize;
@@ -60,9 +60,7 @@ impl NADecoder for TMRTDecoder {
         let height = (hdr[5] as usize) | ((hdr[6] as usize) << 8);
 
         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 bufinfo = bufret.unwrap();
+        let bufinfo = alloc_video_buffer(myinfo, 2)?;
         let mut buf = bufinfo.get_vbuf().unwrap();
 
         let mut br = BitReader::new(&src[hdr_size..], src.len() - hdr_size, BitReaderMode::LE);
@@ -72,7 +70,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)?;
         }
@@ -80,11 +78,13 @@ impl NADecoder for TMRTDecoder {
         let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo);
         frm.set_keyframe(true);
         frm.set_frame_type(FrameType::I);
-        Ok(Rc::new(RefCell::new(frm)))
+        Ok(frm.into_ref())
+    }
+    fn flush(&mut self) {
     }
 }
 
-pub fn get_decoder() -> Box<NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder + Send> {
     Box::new(TMRTDecoder::new())
 }