X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv30.rs;h=f5a894b2a2d4fb84a4f956e712416f1a4e0b0727;hp=7ec3cb23e03bd158d8313a23424f1de0f8ee9a1c;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=171860fcc4a4ba3ec28bc4b720b9f582377be4cf diff --git a/nihav-realmedia/src/codecs/rv30.rs b/nihav-realmedia/src/codecs/rv30.rs index 7ec3cb2..f5a894b 100644 --- a/nihav-realmedia/src/codecs/rv30.rs +++ b/nihav-realmedia/src/codecs/rv30.rs @@ -3,6 +3,7 @@ use nihav_core::io::bitreader::*; use nihav_core::io::intcode::*; use nihav_core::frame::*; use nihav_core::codecs::*; +use nihav_codec_support::codecs::{MV, ZERO_MV}; use super::rv3040::*; use super::rv30dsp::*; @@ -49,7 +50,7 @@ impl RV34BitstreamDecoder for RealVideo30BR { let start = br.read(get_slice_start_offset_bits(w, h))? as usize; br.skip(1)?; - Ok(RV34SliceHeader{ ftype: ftype, quant: q, deblock: deblock, pts: pts, width: w, height: h, start: start, end: 0, set_idx: 0 }) + Ok(RV34SliceHeader{ ftype, quant: q, deblock, pts, width: w, height: h, start, end: 0, set_idx: 0 }) } fn decode_intra_pred(&mut self, br: &mut BitReader, types: &mut [i8], mut pos: usize, tstride: usize, _has_top: bool) -> DecoderResult<()> { for _ in 0..4 { @@ -79,7 +80,7 @@ impl RV34BitstreamDecoder for RealVideo30BR { let idx = if ftype == FrameType::P { 0 } else { 1 }; Ok(MBInfo { mbtype: RV30_MB_TYPES[idx][code], skip_run: 0, dquant: dq }) } - fn predict_b_mv(&self, sstate: &SState, mvi: &MVInfo, mbtype: MBType, mvs: &[MV], _mbinfo: &Vec) -> (MV, MV) { + fn predict_b_mv(&self, sstate: &SState, mvi: &MVInfo, mbtype: MBType, mvs: &[MV], _mbinfo: &[RV34MBInfo]) -> (MV, MV) { let mb_x = sstate.mb_x; let mb_y = sstate.mb_y; let mv_f; @@ -117,7 +118,7 @@ impl RealVideo30Decoder { } impl NADecoder for RealVideo30Decoder { - fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> { + fn init(&mut self, supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> { if let NACodecTypeInfo::Video(vinfo) = info.get_properties() { let fmt = formats::YUV420_FORMAT; let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(0, 0, false, fmt)); @@ -131,23 +132,27 @@ impl NADecoder for RealVideo30Decoder { if src.len() < num_rpr * 2 + 8 { return Err(DecoderError::ShortData); } self.bd.rpr_bits = ((num_rpr >> 1) + 1) as u8; if self.bd.rpr_bits > 3 { self.bd.rpr_bits = 3; } - for i in 0..num_rpr+1 { + for i in 0..=num_rpr { self.bd.widths.push ((src[6 + i * 2] as usize) << 2); self.bd.heights.push((src[7 + i * 2] as usize) << 2); } self.bd.width = vinfo.get_width(); self.bd.height = vinfo.get_height(); + + supp.pool_u8.set_dec_bufs(3); + supp.pool_u8.prealloc_video(NAVideoInfo::new(self.bd.width, self.bd.height, false, fmt), 4)?; + 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(); - let (bufinfo, ftype, pts) = self.dec.parse_frame(src.as_slice(), &mut self.bd)?; + let (bufinfo, ftype, pts) = self.dec.parse_frame(supp, src.as_slice(), &mut self.bd)?; let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo); frm.set_keyframe(ftype == FrameType::I); @@ -155,9 +160,18 @@ println!("???"); frm.set_frame_type(ftype);//if ftype == FrameType::B { FrameType::Skip } else { ftype } ); Ok(frm.into_ref()) } + fn flush(&mut self) { + self.dec.flush(); + } +} + +impl NAOptionHandler for RealVideo30Decoder { + 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(RealVideo30Decoder::new()) } @@ -165,20 +179,36 @@ pub fn get_decoder() -> Box { mod test { 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; + use nihav_codec_support::test::dec_video::*; + use crate::realmedia_register_all_decoders; + use crate::realmedia_register_all_demuxers; #[test] fn test_rv30() { 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); + realmedia_register_all_decoders(&mut dec_reg); -// test_file_decoding("realmedia", "assets/RV/rv30_chroma_drift.rm", Some(1000), true, false, /*None*/Some("rv30")); - test_file_decoding("realmedia", "assets/RV/rv30_weighted_mc.rm", Some(400), true, false, None/*Some("rv30")*/, &dmx_reg, &dec_reg); -// test_file_decoding("realmedia", "assets/RV/simpsons-clip.rm", Some(1337)/*Some(6666)*/, true, false, /*None*/Some("rv30")); -//panic!("end"); + test_decoding("realmedia", "realvideo3", "assets/RV/rv30_weighted_mc.rm", Some(700), + &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ + [0x2a4d13bf, 0x2f21f3c9, 0xcbd601be, 0x61a6405c], + [0x17ea48c7, 0x68334ff5, 0x6fb9729b, 0x9a93ed12], + [0xce42a48c, 0x0b5b7f0d, 0x3f66c4a1, 0x261f08e2], + [0x91ca8f5b, 0x1f578a93, 0x44e533f2, 0x83beec8a], + [0x8cb256a7, 0xb3889afd, 0x28806114, 0x9bbd5287], + [0x694570e2, 0x4b2df948, 0xc7d2e36d, 0xa5eb66b2], + [0xb9b68059, 0x0d420917, 0x4e0f33d4, 0x8d3a6b0b], + [0xb9d6bfa6, 0x04442a8e, 0x6fafc34e, 0xb418a23e], + [0xb94e226d, 0xbf8a5fc5, 0x6d9a03c6, 0x4a0d1a50], + [0xa2e76d33, 0x1b6996e4, 0xb6a26052, 0x3f5f6145], + [0x3b509515, 0x4aa2f4f9, 0x12a0c73b, 0x5b9b20d1], + [0x976e0e06, 0xf6194e6f, 0xe0fefc31, 0xf7587bd3], + [0x7b38660e, 0xa46f4080, 0xa493f422, 0x36eaaa3b], + [0x6375934a, 0xf2a23087, 0x367f9738, 0xf2251e09], + [0x54bcefe7, 0xbbc91dc7, 0x0acec7d7, 0x95cf6d02]])); + test_decoding("realmedia", "realvideo3", "assets/RV/simpsons-clip.rm", Some(1337), + &dmx_reg, &dec_reg, + ExpectedTestResult::MD5([0x36604117, 0x415f95cc, 0xec38e776, 0x9818d3be])); } }