X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv10.rs;h=6a7325fc7f4f542a1a64a2306d816a47c0d53930;hb=fa90ccfb8676a917a02fbb56381f86aa1962d313;hp=3e21315f349d5141d886a2e6ad7fa2d42917a1e2;hpb=5641dccfbf2a70d589cf094a0d4ed5a10f919f00;p=nihav.git diff --git a/nihav-realmedia/src/codecs/rv10.rs b/nihav-realmedia/src/codecs/rv10.rs index 3e21315..6a7325f 100644 --- a/nihav-realmedia/src/codecs/rv10.rs +++ b/nihav-realmedia/src/codecs/rv10.rs @@ -1,5 +1,3 @@ -use std::rc::Rc; -use std::cell::RefCell; use nihav_core::io::bitreader::*; use nihav_core::io::codebook::*; use nihav_core::formats; @@ -23,7 +21,7 @@ struct Tables { } struct RealVideo10Decoder { - info: Rc, + info: NACodecInfoRef, dec: H263BaseDecoder, tables: Tables, w: usize, @@ -59,7 +57,7 @@ struct RV10SliceInfo { impl RV10SliceInfo { fn new(is_p: bool, qscale: u8, mb_x: usize, mb_y: usize, mb_c: usize) -> Self { - RV10SliceInfo { is_p: is_p, qscale: qscale, mb_x: mb_x, mb_y: mb_y, mb_c: mb_c } + RV10SliceInfo { is_p, qscale, mb_x, mb_y, mb_c } } } @@ -69,7 +67,7 @@ impl<'a> RealVideo10BR<'a> { let mut slice_offs = Vec::with_capacity(nslices); { let offs = &src[1..][..nslices * 8]; - let mut br = BitReader::new(offs, offs.len(), BitReaderMode::BE); + let mut br = BitReader::new(offs, BitReaderMode::BE); for _ in 0..nslices { br.skip(32).unwrap(); let off = br.read(32).unwrap(); @@ -78,8 +76,8 @@ impl<'a> RealVideo10BR<'a> { } let soff = nslices * 8 + 1; RealVideo10BR { - br: BitReader::new(&src[soff..], src.len() - soff, BitReaderMode::BE), - tables: tables, + br: BitReader::new(&src[soff..], BitReaderMode::BE), + tables, num_slices: nslices, slice_no: 0, slice_off: slice_offs, @@ -87,10 +85,10 @@ impl<'a> RealVideo10BR<'a> { h: height, mb_w: (width + 15) >> 4, mb_h: (height + 15) >> 4, - new_ver: new_ver, + new_ver, dc_coded: [false; 3], last_dc: [0; 3], - mvmode: mvmode, + mvmode, } } @@ -187,7 +185,7 @@ impl<'a> RealVideo10BR<'a> { } idx += run; validate!(idx < 64); - let oidx = H263_ZIGZAG[idx as usize]; + let oidx = ZIGZAG[idx as usize]; blk[oidx] = level; idx += 1; if last { break; } @@ -381,20 +379,20 @@ impl RealVideo10Decoder { let chroma_dc_cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); let tables = Tables { - intra_mcbpc_cb: intra_mcbpc_cb, - inter_mcbpc_cb: inter_mcbpc_cb, - cbpy_cb: cbpy_cb, - rl_cb: rl_cb, - aic_rl_cb: aic_rl_cb, - mv_cb: mv_cb, - luma_dc_cb: luma_dc_cb, - chroma_dc_cb: chroma_dc_cb, + intra_mcbpc_cb, + inter_mcbpc_cb, + cbpy_cb, + rl_cb, + aic_rl_cb, + mv_cb, + luma_dc_cb, + chroma_dc_cb, }; RealVideo10Decoder{ - info: Rc::new(DUMMY_CODEC_INFO), + info: NACodecInfoRef::default(), dec: H263BaseDecoder::new_with_opts(false, false, false), - tables: tables, + tables, w: 0, h: 0, new_ver: false, @@ -405,13 +403,13 @@ impl RealVideo10Decoder { } impl NADecoder for RealVideo10Decoder { - fn init(&mut self, info: Rc) -> DecoderResult<()> { + fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> { if let NACodecTypeInfo::Video(vinfo) = info.get_properties() { let w = vinfo.get_width(); let h = vinfo.get_height(); let fmt = formats::YUV420_FORMAT; let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(w, 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(); self.w = w; self.h = h; @@ -427,7 +425,7 @@ println!("ver {:06X} -> {}", ver, mic_ver); self.mvmode = MVMode::UMV; } { -let mut br = BitReader::new(src, src.len(), BitReaderMode::BE); +let mut br = BitReader::new(src, BitReaderMode::BE); println!("edata:"); println!("{:08X}", br.read(32).unwrap()); println!("{:08X}", br.read(32).unwrap()); @@ -438,7 +436,7 @@ println!("???"); 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(); //println!(" decode frame size {}, {} slices", src.len(), src[0]+1); @@ -449,21 +447,33 @@ println!("???"); let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo); frm.set_keyframe(self.dec.is_intra()); frm.set_frame_type(if self.dec.is_intra() { FrameType::I } else { FrameType::P }); - Ok(Rc::new(RefCell::new(frm))) + Ok(frm.into_ref()) + } + fn flush(&mut self) { + self.dec.flush(); } } -pub fn get_decoder() -> Box { +pub fn get_decoder() -> Box { Box::new(RealVideo10Decoder::new()) } #[cfg(test)] mod test { - use crate::test::dec_video::test_file_decoding; + use nihav_core::codecs::RegisteredDecoders; + use nihav_core::demuxers::RegisteredDemuxers; + use nihav_core::test::dec_video::*; + use crate::codecs::realmedia_register_all_codecs; + use crate::demuxers::realmedia_register_all_demuxers; #[test] fn test_rv10() { - test_file_decoding("realmedia", "assets/RV/rv10_dnet_640x352_realvideo_encoder_4.0.rm", Some(1000), true, false, None/*Some("rv10")*/); + let mut dmx_reg = RegisteredDemuxers::new(); + realmedia_register_all_demuxers(&mut dmx_reg); + let mut dec_reg = RegisteredDecoders::new(); + realmedia_register_all_codecs(&mut dec_reg); + + test_file_decoding("realmedia", "assets/RV/rv10_dnet_640x352_realvideo_encoder_4.0.rm", Some(1000), true, false, None/*Some("rv10")*/, &dmx_reg, &dec_reg); } } @@ -471,7 +481,7 @@ pub struct CodeReader { codes: &'static [u16], bits: &'static [u8] } impl CodeReader { pub fn new(codes: &'static [u16], bits: &'static [u8]) -> Self { - CodeReader { codes: codes, bits: bits } + CodeReader { codes, bits } } }