X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fcodecs%2Fclearvideo.rs;h=ba23148dddd77dfb7b9a77bd2079de31396a2120;hb=03accf760cf79bc56d7c6dc6e82cd885fb7e1e13;hp=face26cfd4cf0c1ec32f6db7812a3f73202e2bd1;hpb=b70cc0062fd4d791ee20f23439a3b08a04921835;p=nihav.git

diff --git a/nihav-commonfmt/src/codecs/clearvideo.rs b/nihav-commonfmt/src/codecs/clearvideo.rs
index face26c..ba23148 100644
--- a/nihav-commonfmt/src/codecs/clearvideo.rs
+++ b/nihav-commonfmt/src/codecs/clearvideo.rs
@@ -1,5 +1,3 @@
-use std::rc::Rc;
-use std::cell::RefCell;
 use nihav_core::io::byteio::{ByteReader,MemoryReader};
 use nihav_core::io::bitreader::*;
 use nihav_core::io::codebook::*;
@@ -270,7 +268,7 @@ fn put_blocks(buf: &mut NAVideoBuffer<u8>, xpos: usize, ypos: usize, blk: &[[i32
     let mut idxu = buf.get_offset(1) + xpos *  8 + ypos *  8 * strideu;
     let mut idxv = buf.get_offset(2) + xpos *  8 + ypos *  8 * stridev;
 
-    let mut data = buf.get_data_mut();
+    let data = buf.get_data_mut().unwrap();
     let framebuf: &mut [u8] = data.as_mut_slice();
 
     for j in 0..8 {
@@ -328,7 +326,7 @@ fn copy_block(dst: &mut NAVideoBuffer<u8>, src: &NAVideoBuffer<u8>,
     let sbuf: &[u8] = sdta.as_slice();
     let dstride     = dst.get_stride(plane);
     let mut doff    = dst.get_offset(plane) + x + y * dstride;
-    let mut ddta    = dst.get_data_mut();
+    let ddta        = dst.get_data_mut().unwrap();
     let dbuf: &mut [u8] = ddta.as_mut_slice();
     for _ in 0..size {
         let dst = &mut dbuf[doff..][..size];
@@ -351,7 +349,7 @@ fn copyadd_block(dst: &mut NAVideoBuffer<u8>, src: &NAVideoBuffer<u8>,
     let sbuf: &[u8] = sdta.as_slice();
     let dstride     = dst.get_stride(plane);
     let mut doff    = dst.get_offset(plane) + x + y * dstride;
-    let mut ddta    = dst.get_data_mut();
+    let ddta        = dst.get_data_mut().unwrap();
     let dbuf: &mut [u8] = ddta.as_mut_slice();
     for _ in 0..size {
         let dst = &mut dbuf[doff..][..size];
@@ -404,7 +402,7 @@ fn extend_edges(buf: &mut NAVideoBuffer<u8>, tile_size: usize) {
         let size = if comp == 0 { tile_size } else { tile_size >> 1 };
         let stride = buf.get_stride(comp);
         let planeoff = buf.get_offset(comp);
-        let mut data = buf.get_data_mut();
+        let data = buf.get_data_mut().unwrap();
         let framebuf: &mut [u8] = data.as_mut_slice();
 
         let right  = size - (w & (size - 1));
@@ -430,7 +428,7 @@ fn extend_edges(buf: &mut NAVideoBuffer<u8>, tile_size: usize) {
 
 #[allow(dead_code)]
 struct ClearVideoDecoder {
-    info:    Rc<NACodecInfo>,
+    info:    NACodecInfoRef,
     dc_cb:   Codebook<i8>,
     ac_cb:   Codebook<u16>,
     frmmgr:  HAMShuffler,
@@ -530,7 +528,7 @@ fn decode_tile_info(br: &mut BitReader, lc: &[LevelCodes], level: usize) -> Deco
 
 impl ClearVideoDecoder {
     fn new(is_rm: bool) -> Self {
-        let dummy_info = Rc::new(DUMMY_CODEC_INFO);
+        let dummy_info = NACodecInfo::new_dummy();
         let mut coderead = CLVDCCodeReader{};
         let dc_cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap();
         let mut coderead = CLVACCodeReader{};
@@ -683,7 +681,7 @@ impl ClearVideoDecoder {
 }
 
 impl NADecoder for ClearVideoDecoder {
-    fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+    fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
         if info.get_extradata().is_none() { return Err(DecoderError::InvalidData); }
         if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
             let w = vinfo.get_width();
@@ -691,7 +689,7 @@ impl NADecoder for ClearVideoDecoder {
             let f = vinfo.is_flipped();
             let fmt = formats::YUV420_FORMAT;
             let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(w, h, f, 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();
             self.frmmgr.clear();
             let edata = info.get_extradata().unwrap();
 //todo detect simply by extradata contents?
@@ -728,7 +726,7 @@ impl NADecoder for ClearVideoDecoder {
             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 is_intra = (src[off] & 2) == 2;
@@ -759,7 +757,7 @@ impl NADecoder for ClearVideoDecoder {
         } else {
             frm.set_frame_type(FrameType::P);
         }
-        Ok(Rc::new(RefCell::new(frm)))
+        Ok(frm.into_ref())
     }
 }
 
@@ -784,8 +782,8 @@ mod test {
         generic_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
         generic_register_all_codecs(&mut dec_reg);
-        test_file_decoding("avi", "assets/TalkingHead_352x288.avi", Some(10), true, false, None/*Some("clv")*/, &dmx_reg, &dec_reg);
-//         test_file_decoding("avi", "assets/basketball.avi", None/*Some(10)*/, true, false, Some("clv1"));
+        test_file_decoding("avi", "assets/Misc/TalkingHead_352x288.avi", Some(10), true, false, None/*Some("clv")*/, &dmx_reg, &dec_reg);
+//         test_file_decoding("avi", "assets/Misc/basketball.avi", None/*Some(10)*/, true, false, Some("clv1"));
 //panic!("debug");
     }
 }