X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fcodecs%2Fclearvideo.rs;h=67a98639e855b90fb8a4d06cf93df50bd9627bf1;hb=01613464323864a655c994820d3c43df1954e3b2;hp=51f93da24fc1b4366f5dbe0ab5118fbafc23b157;hpb=c3904fe5804a28e73822c27c69ba10a716cb290d;p=nihav.git diff --git a/nihav-commonfmt/src/codecs/clearvideo.rs b/nihav-commonfmt/src/codecs/clearvideo.rs index 51f93da..67a9863 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, 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, src: &NAVideoBuffer, 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, src: &NAVideoBuffer, 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, 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, tile_size: usize) { #[allow(dead_code)] struct ClearVideoDecoder { - info: Rc, + info: NACodecInfoRef, dc_cb: Codebook, ac_cb: Codebook, 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) -> DecoderResult<()> { + fn init(&mut self, _supp: &mut NADecoderSupport, 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? @@ -713,7 +711,7 @@ impl NADecoder for ClearVideoDecoder { Err(DecoderError::InvalidData) } } - fn decode(&mut self, pkt: &NAPacket) -> DecoderResult { + fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { let src = pkt.get_buffer(); if src.len() <= 1 { return Err(DecoderError::ShortData); } let off = if self.is_rm { @@ -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; @@ -737,7 +735,7 @@ impl NADecoder for ClearVideoDecoder { let vinfo = self.info.get_properties().get_video_info().unwrap(); let bufret = alloc_video_buffer(vinfo, self.tsize); if let Err(_) = bufret { return Err(DecoderError::InvalidData); } - let mut bufinfo = bufret.unwrap(); + let bufinfo = bufret.unwrap(); let mut buf = bufinfo.get_vbuf().unwrap(); if is_intra { @@ -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"); } }