X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv20.rs;h=88b1a600a265cb348d8f0264317ece12703acb6a;hp=8e4965aa471fbc6698e2e1b137c32929af64f772;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=39a5835c4c48e28ad5115d71a62ecf9593ceb42b diff --git a/nihav-realmedia/src/codecs/rv20.rs b/nihav-realmedia/src/codecs/rv20.rs index 8e4965a..88b1a60 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 } } } @@ -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, @@ -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)) } } @@ -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) as u8; + 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,14 +693,14 @@ 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); + realmedia_register_all_decoders(&mut dec_reg); test_decoding("realmedia", "realvideo2", "assets/RV/rv20_svt_atrc_640x352_realproducer_plus_8.51.rm", @@ -701,12 +719,12 @@ mod test { [0x319d142d, 0x607a7c28, 0x526a2794, 0xa6e7864f], [0x319d142d, 0x607a7c28, 0x526a2794, 0xa6e7864f], [0xa2008d4c, 0xf4684b3a, 0xecd0526c, 0xf0742a77], - [0xafe0df5b, 0x29cd2418, 0x29a265c7, 0x9b4f2218], + [0x5eef6cfd, 0x4eb49f19, 0x4d760b7a, 0x741ccd0c], [0x0e0529df, 0xf1cc3f03, 0x03986b0d, 0xd2033c08], - [0x4662b5ab, 0xaca5ca35, 0x4d089fb2, 0xc6a3df1e], + [0xdb9aa091, 0xf2c6345c, 0xde9deae8, 0x71f51a67], [0x22c978cf, 0x6887a9ba, 0xe74c9316, 0x8cbdd29b], - [0x12d8b88f, 0x59ebe632, 0xbcfaa336, 0xadbdd9ad], - [0x0d99c67b, 0x3231302f, 0x3612b0d0, 0x38b5414d], - [0x2f65b75e, 0x1239d563, 0x832ce096, 0x568a9bc2]])); + [0x7c83c784, 0x15b20881, 0x74798f24, 0x2096573c], + [0x84a68aed, 0x4cfcefb1, 0x78d1b66b, 0x21b1860a], + [0x78ed094a, 0x8df72434, 0x58bcd64d, 0x8d725dfd]])); } }