X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv20.rs;h=333e91a08df53e81885425bd091eb12bf8b39173;hb=e6aaad5c5273cd814b5748b7faf3751835a37217;hp=0d24b28cc3dcaa1e588837c951d843f1a9ae94ea;hpb=401b2b60a38e3eb19ae19aee9e652f7c8c0cf6f8;p=nihav.git diff --git a/nihav-realmedia/src/codecs/rv20.rs b/nihav-realmedia/src/codecs/rv20.rs index 0d24b28..333e91a 100644 --- a/nihav-realmedia/src/codecs/rv20.rs +++ b/nihav-realmedia/src/codecs/rv20.rs @@ -70,14 +70,15 @@ struct RV20SliceInfo { mb_pos: usize, w: usize, h: usize, + loop_filter: bool, } #[derive(Default)] struct RV20BlockDSP {} impl RV20SliceInfo { - fn new(ftype: Type, seq: u32, qscale: u8, mb_x: usize, mb_y: usize, mb_pos: usize, w: usize, h: usize) -> Self { - RV20SliceInfo { ftype, seq, qscale, mb_x, mb_y, mb_pos, w, h } + fn new(ftype: Type, seq: u32, qscale: u8, mb_x: usize, mb_y: usize, mb_pos: usize, w: usize, h: usize, loop_filter: bool) -> Self { + RV20SliceInfo { ftype, seq, qscale, mb_x, mb_y, mb_pos, w, h, loop_filter } } } @@ -139,7 +140,7 @@ impl BlockDSP for RV20BlockDSP { blockdsp::copy_block(&mut dst, src.clone(), 0, xpos, ypos, mv.x >> 1, mv.y >> 1, 16, 16, 0, 1, mode, H263_INTERP_FUNCS); blockdsp::copy_block(&mut dst, src.clone(), 1, xpos >> 1, ypos >> 1, mv.x >> 2, mv.y >> 2, 8, 8, 0, 1, cmode, H263_INTERP_FUNCS); - blockdsp::copy_block(&mut dst, src.clone(), 2, xpos >> 1, ypos >> 1, mv.x >> 2, mv.y >> 2, 8, 8, 0, 1, cmode, H263_INTERP_FUNCS); + blockdsp::copy_block(&mut dst, src, 2, xpos >> 1, ypos >> 1, mv.x >> 2, mv.y >> 2, 8, 8, 0, 1, cmode, H263_INTERP_FUNCS); } fn copy_blocks8x8(&self, dst: &mut NAVideoBuffer, src: NAVideoBufferRef, xpos: usize, ypos: usize, mvs: &[MV; 4]) { let mut dst = NASimpleVideoFrame::from_video_buf(dst).unwrap(); @@ -168,7 +169,7 @@ impl BlockDSP for RV20BlockDSP { blockdsp::copy_block(&mut dst, src.clone(), 0, xpos, ypos, mv.x >> 1, mv.y >> 1, 16, 16, 0, 1, mode, H263_INTERP_AVG_FUNCS); blockdsp::copy_block(&mut dst, src.clone(), 1, xpos >> 1, ypos >> 1, mv.x >> 2, mv.y >> 2, 8, 8, 0, 1, cmode, H263_INTERP_AVG_FUNCS); - blockdsp::copy_block(&mut dst, src.clone(), 2, xpos >> 1, ypos >> 1, mv.x >> 2, mv.y >> 2, 8, 8, 0, 1, cmode, H263_INTERP_AVG_FUNCS); + blockdsp::copy_block(&mut dst, src, 2, xpos >> 1, ypos >> 1, mv.x >> 2, mv.y >> 2, 8, 8, 0, 1, cmode, H263_INTERP_AVG_FUNCS); } fn avg_blocks8x8(&self, dst: &mut NAVideoBuffer, src: NAVideoBufferRef, xpos: usize, ypos: usize, mvs: &[MV; 4]) { let mut dst = NASimpleVideoFrame::from_video_buf(dst).unwrap(); @@ -194,6 +195,16 @@ impl BlockDSP for RV20BlockDSP { } } +fn get_mb_pos_bits(mb_w: usize, mb_h: usize) -> u8 { + let max_pos = mb_w * mb_h - 1; + for i in 0..H263_MBB.len() { + if max_pos <= H263_MBB[i].blocks { + return H263_MBB[i].bits; + } + } + 0 +} + impl<'a> RealVideo20BR<'a> { fn new(src: &'a [u8], tables: &'a Tables, width: usize, height: usize, minor_ver: u8, rpr: RPRInfo) -> Self { let nslices = (src[0] as usize) + 1; @@ -210,14 +221,6 @@ impl<'a> RealVideo20BR<'a> { let soff = nslices * 8 + 1; let mb_w = (width + 15) >> 4; let mb_h = (height + 15) >> 4; - let max_pos = mb_w * mb_h - 1; - let mut mbpb = 0; - for i in 0..H263_MBB.len() { - if max_pos <= H263_MBB[i].blocks { - mbpb = H263_MBB[i].bits; - break; - } - } RealVideo20BR { br: BitReader::new(&src[soff..], BitReaderMode::BE), tables, @@ -228,7 +231,7 @@ impl<'a> RealVideo20BR<'a> { h: height, mb_w, mb_h, - mb_pos_bits: mbpb, + mb_pos_bits: get_mb_pos_bits(mb_w, mb_h), minor_ver, rpr, pts: 0, @@ -254,7 +257,7 @@ impl<'a> RealVideo20BR<'a> { let rl_cb = if sstate.is_iframe { &self.tables.aic_rl_cb } else { &self.tables.rl_cb }; let q = if plane_no == 0 { (quant * 2) as i16 } else { (H263_CHROMA_QUANT[quant as usize] * 2) as i16 }; - let q_add = if q == 0 || sstate.is_iframe { 0i16 } else { (((q >> 1) - 1) | 1) as i16 }; + let q_add = if q == 0 || sstate.is_iframe { 0i16 } else { ((q >> 1) - 1) | 1 }; while idx < 64 { let code = br.read_cb(rl_cb)?; let run; @@ -340,7 +343,7 @@ impl<'a> BlockDecoder for RealVideo20BR<'a> { mb_count = self.mb_w * self.mb_h; }*/ - let plusinfo = Some(PlusInfo::new(shdr.ftype == Type::I, false, false, false)); + let plusinfo = Some(PlusInfo::new(shdr.ftype == Type::I, shdr.loop_filter, false, false)); let picinfo = PicInfo::new(shdr.w, shdr.h, shdr.ftype, MVMode::Long, false, false, shdr.qscale, shdr.seq as u16, None, plusinfo); Ok(picinfo) } @@ -353,6 +356,8 @@ impl<'a> BlockDecoder for RealVideo20BR<'a> { if self.slice_no < self.num_slices { let pos = self.br.tell(); let shdr2 = self.read_slice_header()?; + validate!(shdr2.mb_pos > shdr.mb_pos); + validate!(shdr2.w == shdr.w && shdr2.h == shdr.h); mb_count = shdr2.mb_pos - shdr.mb_pos; self.br.seek(pos as u32)?; } else { @@ -504,8 +509,11 @@ impl<'a> RealVideo20BR<'a> { validate!(marker == 0); let qscale = br.read(5)? as u8; validate!(qscale > 0); + let loop_filter; if self.minor_ver >= 2 { - br.skip(1)?; // loop filter + loop_filter = br.read_bool()?; + } else { + loop_filter = false; } let seq = if self.minor_ver <= 1 { br.read(8)? << 8 @@ -525,6 +533,9 @@ impl<'a> RealVideo20BR<'a> { h = self.rpr.heights[rpr - 1]; validate!((w != 0) && (h != 0)); } + self.mb_w = (w + 15) >> 4; + self.mb_h = (h + 15) >> 4; + self.mb_pos_bits = get_mb_pos_bits(self.mb_w, self.mb_h); } else { w = self.w; h = self.h; @@ -540,7 +551,7 @@ impl<'a> RealVideo20BR<'a> { br.skip(5)?; } - Ok(RV20SliceInfo::new(ftype, seq, qscale, mb_x, mb_y, mb_pos, w, h)) + Ok(RV20SliceInfo::new(ftype, seq, qscale, mb_x, mb_y, mb_pos, w, h, loop_filter)) } } @@ -582,7 +593,7 @@ impl RealVideo20Decoder { h: 0, minor_ver: 0, rpr: RPRInfo { present: false, bits: 0, widths: [0; 8], heights: [0; 8] }, - bdsp: Box::new(RV20BlockDSP::default()), + bdsp: Box::::default(), base_ts: 0, last_ts: 0, next_ts: 0, @@ -615,10 +626,11 @@ impl NADecoder for RealVideo20Decoder { self.rpr.present = false; } else { self.rpr.present = true; - self.rpr.bits = ((rprb >> 1) + 1) as u8; - for i in 4..(src.len()/2) { - self.rpr.widths [i - 4] = (src[i * 2] as usize) * 4; - self.rpr.heights[i - 4] = (src[i * 2 + 1] as usize) * 4; + self.rpr.bits = ((rprb >> 1) + 1).min(3); + let num_dim = ((src.len() - 8) / 2).min(self.rpr.widths.len() - 1); + for i in 0..num_dim { + self.rpr.widths [i] = (src[i * 2 + 8] as usize) * 4; + self.rpr.heights[i] = (src[i * 2 + 9] as usize) * 4; } } Ok(()) @@ -655,6 +667,12 @@ impl NADecoder for RealVideo20Decoder { } } +impl NAOptionHandler for RealVideo20Decoder { + fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } + fn set_options(&mut self, _options: &[NAOption]) { } + fn query_option_value(&self, _name: &str) -> Option { None } +} + struct MBB { blocks: usize, bits: u8 } const H263_MBB: &[MBB; 7] = &[ MBB{ blocks: 47, bits: 6 }, @@ -675,16 +693,39 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::realmedia_register_all_codecs; + use crate::realmedia_register_all_decoders; use crate::realmedia_register_all_demuxers; #[test] fn test_rv20() { 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/rv20_svt_atrc_640x352_realproducer_plus_8.51.rm", /*None*/Some(3000), true, false, None/*Some("rv20")*/, &dmx_reg, &dec_reg); -// test_file_decoding("realmedia", "assets/RV/rv20_cook_640x352_realproducer_plus_8.51.rm", /*None*/Some(1000), true, false, Some("rv20")); + realmedia_register_all_decoders(&mut dec_reg); + + // sample from a private collection + test_decoding("realmedia", "realvideo2", + "assets/RV/rv20_svt_atrc_640x352_realproducer_plus_8.51.rm", + Some(1000), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ + [0x319d142d, 0x607a7c28, 0x526a2794, 0xa6e7864f], + [0x319d142d, 0x607a7c28, 0x526a2794, 0xa6e7864f], + [0x319d142d, 0x607a7c28, 0x526a2794, 0xa6e7864f], + [0x319d142d, 0x607a7c28, 0x526a2794, 0xa6e7864f], + [0x319d142d, 0x607a7c28, 0x526a2794, 0xa6e7864f], + [0x319d142d, 0x607a7c28, 0x526a2794, 0xa6e7864f], + [0x319d142d, 0x607a7c28, 0x526a2794, 0xa6e7864f], + [0x319d142d, 0x607a7c28, 0x526a2794, 0xa6e7864f], + [0x319d142d, 0x607a7c28, 0x526a2794, 0xa6e7864f], + [0x8ce88686, 0x03ca3bb9, 0x0d18347b, 0xccdb0bc5], + [0x319d142d, 0x607a7c28, 0x526a2794, 0xa6e7864f], + [0x319d142d, 0x607a7c28, 0x526a2794, 0xa6e7864f], + [0x319d142d, 0x607a7c28, 0x526a2794, 0xa6e7864f], + [0xa2008d4c, 0xf4684b3a, 0xecd0526c, 0xf0742a77], + [0x5eef6cfd, 0x4eb49f19, 0x4d760b7a, 0x741ccd0c], + [0x0e0529df, 0xf1cc3f03, 0x03986b0d, 0xd2033c08], + [0xdb9aa091, 0xf2c6345c, 0xde9deae8, 0x71f51a67], + [0x22c978cf, 0x6887a9ba, 0xe74c9316, 0x8cbdd29b], + [0x7c83c784, 0x15b20881, 0x74798f24, 0x2096573c], + [0x84a68aed, 0x4cfcefb1, 0x78d1b66b, 0x21b1860a], + [0x78ed094a, 0x8df72434, 0x58bcd64d, 0x8d725dfd]])); } }