X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv10.rs;h=7c317af52db93c91fe1f30de49cdf0118f7ad1bf;hp=3e21315f349d5141d886a2e6ad7fa2d42917a1e2;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=5641dccfbf2a70d589cf094a0d4ed5a10f919f00 diff --git a/nihav-realmedia/src/codecs/rv10.rs b/nihav-realmedia/src/codecs/rv10.rs index 3e21315..7c317af 100644 --- a/nihav-realmedia/src/codecs/rv10.rs +++ b/nihav-realmedia/src/codecs/rv10.rs @@ -1,14 +1,13 @@ -use std::rc::Rc; -use std::cell::RefCell; use nihav_core::io::bitreader::*; use nihav_core::io::codebook::*; use nihav_core::formats; use nihav_core::frame::*; use nihav_core::codecs::*; -use nihav_core::codecs::h263::*; -use nihav_core::codecs::h263::code::H263BlockDSP; -use nihav_core::codecs::h263::decoder::*; -use nihav_core::codecs::h263::data::*; +use nihav_codec_support::codecs::{MV, ZIGZAG}; +use nihav_codec_support::codecs::h263::*; +use nihav_codec_support::codecs::h263::code::H263BlockDSP; +use nihav_codec_support::codecs::h263::decoder::*; +use nihav_codec_support::codecs::h263::data::*; #[allow(dead_code)] struct Tables { @@ -23,7 +22,7 @@ struct Tables { } struct RealVideo10Decoder { - info: Rc, + info: NACodecInfoRef, dec: H263BaseDecoder, tables: Tables, w: usize, @@ -59,7 +58,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 +68,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 +77,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 +86,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, } } @@ -171,7 +170,11 @@ impl<'a> RealVideo10BR<'a> { level = code.get_level(); last = code.is_last(); if br.read_bool()? { level = -level; } - level = (level * q) + q_add; + if level >= 0 { + level = (level * q) + q_add; + } else { + level = (level * q) - q_add; + } } else { last = br.read_bool()?; run = br.read(6)? as u8; @@ -181,13 +184,17 @@ impl<'a> RealVideo10BR<'a> { let top = br.read_s(6)? as i16; level = (top << 5) | low; } - level = (level * q) + q_add; + if level >= 0 { + level = (level * q) + q_add; + } else { + level = (level * q) - q_add; + } if level < -2048 { level = -2048; } if level > 2047 { level = 2047; } } 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; } @@ -250,6 +257,7 @@ impl<'a> BlockDecoder for RealVideo10BR<'a> { if dquant { let idx = br.read(2)? as usize; q = ((q as i16) + (H263_DQUANT_TAB[idx] as i16)) as u8; + validate!(q < 32); } Ok(BlockInfo::new(Type::I, cbp, q)) }, @@ -268,6 +276,7 @@ impl<'a> BlockDecoder for RealVideo10BR<'a> { if dquant { let idx = br.read(2)? as usize; q = ((q as i16) + (H263_DQUANT_TAB[idx] as i16)) as u8; + validate!(q < 32); } let binfo = BlockInfo::new(Type::I, cbp, q); return Ok(binfo); @@ -281,6 +290,7 @@ impl<'a> BlockDecoder for RealVideo10BR<'a> { if dquant { let idx = br.read(2)? as usize; q = ((q as i16) + (H263_DQUANT_TAB[idx] as i16)) as u8; + validate!(q < 32); } let mut binfo = BlockInfo::new(Type::P, cbp, q); if !is_4x4 { @@ -381,20 +391,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), - dec: H263BaseDecoder::new_with_opts(false, false, false), - tables: tables, + info: NACodecInfoRef::default(), + dec: H263BaseDecoder::new_with_opts(0), + tables, w: 0, h: 0, new_ver: false, @@ -405,13 +415,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; @@ -420,28 +430,22 @@ impl NADecoder for RealVideo10Decoder { let ver = ((src[4] as u32) << 12) | ((src[5] as u32) << 4) | ((src[6] as u32) >> 4); let maj_ver = ver >> 16; let mic_ver = ver & 0xFF; -println!("ver {:06X} -> {}", ver, mic_ver); validate!(maj_ver == 1); - self.new_ver = mic_ver > 1; + self.new_ver = mic_ver > 0; + if mic_ver == 2 { + self.dec = H263BaseDecoder::new_with_opts(H263DEC_OPT_HAS_OBMC); + } if (src[3] & 1) != 0 { self.mvmode = MVMode::UMV; } -{ -let mut br = BitReader::new(src, src.len(), BitReaderMode::BE); -println!("edata:"); -println!("{:08X}", br.read(32).unwrap()); -println!("{:08X}", br.read(32).unwrap()); -} Ok(()) } else { -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); let mut ibr = RealVideo10BR::new(&src, &self.tables, self.w, self.h, self.new_ver, self.mvmode); let bufinfo = self.dec.parse_frame(&mut ibr, &self.bdsp)?; @@ -449,21 +453,74 @@ 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(); + } +} + +impl NAOptionHandler for RealVideo10Decoder { + fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } + fn set_options(&mut self, _options: &[NAOption]) { } + fn query_option_value(&self, _name: &str) -> Option { None } } -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_codec_support::test::dec_video::*; + use crate::realmedia_register_all_decoders; + use crate::realmedia_register_all_demuxers; + #[test] + fn test_rv10_old() { + let mut dmx_reg = RegisteredDemuxers::new(); + realmedia_register_all_demuxers(&mut dmx_reg); + let mut dec_reg = RegisteredDecoders::new(); + realmedia_register_all_decoders(&mut dec_reg); + + test_decoding("realmedia", "realvideo1", "assets/RV/thankyou.rm", + Some(1000), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ + [0x8bba459c, 0xe6e8e01c, 0x36f90595, 0xb268adee], + [0x32ca9567, 0xedc13b6f, 0xbee77cfd, 0xc7ebe24b], + [0xcf1865b6, 0xea7cf1b2, 0x30a5a622, 0xe5775b0d], + [0x8d984cfd, 0xcbc81a8d, 0x71d5b37a, 0x74115bba], + [0x7ec2a9e8, 0x291fc62a, 0x5fc62722, 0xf2072b87], + [0xa150585b, 0x9d608fe7, 0xb8d42676, 0x070103f7], + [0x8aadd96f, 0xa02e0627, 0xa89e104f, 0xf47d1227], + [0xa4416bb1, 0xc9ca7a61, 0xad43de90, 0x3e9ec5b7]])); + } #[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")*/); + fn test_rv10_obmc() { + let mut dmx_reg = RegisteredDemuxers::new(); + realmedia_register_all_demuxers(&mut dmx_reg); + let mut dec_reg = RegisteredDecoders::new(); + realmedia_register_all_decoders(&mut dec_reg); + + test_decoding("realmedia", "realvideo1", + "assets/RV/rv10_dnet_640x352_realvideo_encoder_4.0.rm", + Some(1000), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ + [0x23599d2e, 0xf7212b24, 0x6b34b848, 0xbca84641], + [0x23599d2e, 0xf7212b24, 0x6b34b848, 0xbca84641], + [0x23599d2e, 0xf7212b24, 0x6b34b848, 0xbca84641], + [0x23599d2e, 0xf7212b24, 0x6b34b848, 0xbca84641], + [0x23599d2e, 0xf7212b24, 0x6b34b848, 0xbca84641], + [0x23599d2e, 0xf7212b24, 0x6b34b848, 0xbca84641], + [0x23599d2e, 0xf7212b24, 0x6b34b848, 0xbca84641], + [0x23599d2e, 0xf7212b24, 0x6b34b848, 0xbca84641], + [0x5cb179dc, 0x56ce9d07, 0x2439dd68, 0x80fec0bf], + [0x00de945d, 0xf44b71d3, 0x1dd93df9, 0x468bdcd5], + [0x7deb3aae, 0x8856c5da, 0x53011115, 0xed91377b], + [0x73afc311, 0xa61d36dc, 0x4e6ba0a3, 0x6dc64514], + [0xee35a8ce, 0x8edf5f32, 0x601d238f, 0xe5fa7ea7], + [0xe9aeaaa9, 0x876a221b, 0xe2d70923, 0x611849fd], + [0x0ff535cf, 0xf9e6ee1c, 0xed3a822c, 0x915056c0]])); } } @@ -471,7 +528,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 } } } @@ -553,7 +610,7 @@ const RV10_LUMA_DC_BITS: &[u8] = &[ ]; const RV10_CHROMA_DC_CODES: &[u16] = &[ - 0x003f, 0x3f00, 0x3f01, 0x3f02, 0x3f03, 0x3f04, 0x3f05, 0x3f06, + 0x0000, 0x3f00, 0x3f01, 0x3f02, 0x3f03, 0x3f04, 0x3f05, 0x3f06, 0x3f07, 0x3f08, 0x3f09, 0x3f0a, 0x3f0b, 0x3f0c, 0x3f0d, 0x3f0e, 0x3f0f, 0x3f10, 0x3f11, 0x3f12, 0x3f13, 0x3f14, 0x3f15, 0x3f16, 0x3f17, 0x3f18, 0x3f19, 0x3f1a, 0x3f1b, 0x3f1c, 0x3f1d, 0x3f1e, @@ -588,7 +645,7 @@ const RV10_CHROMA_DC_CODES: &[u16] = &[ ]; const RV10_CHROMA_DC_BITS: &[u8] = &[ - 7, 14, 14, 14, 14, 14, 14, 14, + 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,