X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Findeo5.rs;h=e4863d37d853f72cc3bdd12bbc503983b23b023c;hb=e6aaad5c5273cd814b5748b7faf3751835a37217;hp=aece25dc6d637e2bfeadfba279d346b07ed6d69d;hpb=6011e20199143f519881660144a4ca95ba77fd2d;p=nihav.git diff --git a/nihav-indeo/src/codecs/indeo5.rs b/nihav-indeo/src/codecs/indeo5.rs index aece25d..e4863d3 100644 --- a/nihav-indeo/src/codecs/indeo5.rs +++ b/nihav-indeo/src/codecs/indeo5.rs @@ -2,11 +2,12 @@ use nihav_core::io::bitreader::*; use nihav_core::formats; use nihav_core::frame::*; use nihav_core::codecs::*; +use nihav_codec_support::codecs::ZIGZAG; use super::ivi::*; use super::ivibr::*; fn calc_quant(glob_q: u32, qd: i16) -> usize { - let qq = (glob_q as i16) + (qd as i16); + let qq = (glob_q as i16) + qd; if qq < 0 { 0 } else if qq > 23 { @@ -179,10 +180,11 @@ impl IndeoXParser for Indeo5Parser { let data_size: usize; if (band_flags & 0x80) != 0 { data_size = br.read(24)? as usize; + validate!(data_size >= 4); } else { data_size = 0; } - validate!(data_size <= ((br.left() / 8) as usize)); + validate!(data_size <= ((br.left() / 8) as usize) + 4); let num_corr: usize; let mut corr_map: [u8; CORR_MAP_SIZE] = [0; CORR_MAP_SIZE]; @@ -264,7 +266,8 @@ impl IndeoXParser for Indeo5Parser { Ok(BandHeader::new(plane_no, band_no, self.mb_size[band_id], self.blk_size[band_id], self.is_hpel[band_id], inherit_mv, has_qdelta, inherit_qd, band_q, rvmap_idx, num_corr, corr_map, blk_cb, tr, txtype)) } - fn decode_mb_info(&mut self, br: &mut BitReader, pic_hdr: &PictureHeader, band: &BandHeader, tile: &mut IVITile, ref_tile: Option>, mv_scale: u8) -> DecoderResult<()> { + #[allow(clippy::cognitive_complexity)] + fn decode_mb_info(&mut self, br: &mut BitReader, pic_hdr: &PictureHeader, band: &BandHeader, tile: &mut IVITile, ref_tile: Option<&IVITile>, mv_scale: u8) -> DecoderResult<()> { let mut mv_x = 0; let mut mv_y = 0; let band_id = if pic_hdr.luma_bands == 4 { band.band_no + 1 } else { 0 }; @@ -276,7 +279,7 @@ impl IndeoXParser for Indeo5Parser { if pic_hdr.ftype.is_intra() { mb.mtype = MBType::Intra; } else if band.inherit_mv { - if let Some(ref tileref) = ref_tile { + if let Some(tileref) = ref_tile { mb.mtype = tileref.mb[mb_idx].mtype; } else { return Err(DecoderError::MissingReference); @@ -292,7 +295,7 @@ impl IndeoXParser for Indeo5Parser { let q; if band.has_qdelta { if band.inherit_qd { - if let Some(ref tileref) = ref_tile { + if let Some(tileref) = ref_tile { mb.qd = tileref.mb[mb_idx].qd; q = calc_quant(band.quant, mb.qd); } else { @@ -324,7 +327,7 @@ impl IndeoXParser for Indeo5Parser { if mb.mtype != MBType::Intra { if band.inherit_mv { - if let Some(ref tileref) = ref_tile { + if let Some(tileref) = ref_tile { let mx = tileref.mb[mb_idx].mv_x; let my = tileref.mb[mb_idx].mv_y; if mv_scale == 0 { @@ -365,7 +368,7 @@ impl IndeoXParser for Indeo5Parser { } } if band.inherit_mv { - if let Some(ref tileref) = ref_tile { + if let Some(tileref) = ref_tile { let mx = tileref.mb[mb_idx].mv_x; let my = tileref.mb[mb_idx].mv_y; if mv_scale == 0 { @@ -398,7 +401,7 @@ impl IndeoXParser for Indeo5Parser { let filt_lo = |a: i16, b: i16| a + b; let filt_hi = |a: i16, b: i16, c: i16| a - b * 6 + c; - for _ in 0..(h/2) { + for _ in 0..(h/2)-1 { let mut b0_1 = src[idx0]; let mut b0_2 = src[idx0 + sstride]; let mut b1_1 = src[bidx1]; @@ -420,7 +423,7 @@ impl IndeoXParser for Indeo5Parser { let mut b3_9 = b3_8; let mut b3_7; - for x in 0..(w/2) { + for x in 0..(w/2)-1 { b2_1 = b2_2; b2_2 = b2_3; b2_4 = b2_5; @@ -497,10 +500,10 @@ struct Indeo5Decoder { } impl Indeo5Decoder { - fn new() -> Self { + fn new(scalable: bool) -> Self { Indeo5Decoder { info: NACodecInfo::new_dummy(), - dec: IVIDecoder::new(), + dec: IVIDecoder::new(scalable), ip: Indeo5Parser::new(), } } @@ -522,7 +525,7 @@ impl NADecoder for Indeo5Decoder { } fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { let src = pkt.get_buffer(); - let mut br = BitReader::new(src.as_slice(), src.len(), BitReaderMode::LE); + let mut br = BitReader::new(src.as_slice(), BitReaderMode::LE); let bufinfo = self.dec.decode_frame(&mut self.ip, &mut br)?; let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo); @@ -530,6 +533,15 @@ impl NADecoder for Indeo5Decoder { frm.set_frame_type(self.dec.get_frame_type()); Ok(frm.into_ref()) } + fn flush(&mut self) { + self.dec.flush(); + } +} + +impl NAOptionHandler for Indeo5Decoder { + fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } + fn set_options(&mut self, _options: &[NAOption]) { } + fn query_option_value(&self, _name: &str) -> Option { None } } const INDEO5_PICTURE_SIZE_TAB: [[usize; 2]; 15] = [ @@ -662,7 +674,7 @@ const INDEO5_Q4_INTRA: &[u16; 16] = &INDEO5_QUANT4X4_INTRA; const INDEO5_Q4_INTER: &[u16; 16] = &INDEO5_QUANT4X4_INTER; const INDEO5_SCAN8X8: [&[usize; 64]; 4] = [ - &IVI_ZIGZAG, &IVI_SCAN_8X8_VER, &IVI_SCAN_8X8_HOR, &IVI_SCAN_8X8_HOR + &ZIGZAG, &IVI_SCAN_8X8_VER, &IVI_SCAN_8X8_HOR, &IVI_SCAN_8X8_HOR ]; const INDEO5_SCAN4X4: &[usize; 16] = &IVI_SCAN_4X4; @@ -711,26 +723,174 @@ const INDEO5_QSCALE4_INTER: [u8; 24] = [ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23 ]; -pub fn get_decoder() -> Box { - Box::new(Indeo5Decoder::new()) +pub fn get_decoder() -> Box { + Box::new(Indeo5Decoder::new(false)) +} + +pub fn get_decoder_scalable() -> Box { + Box::new(Indeo5Decoder::new(true)) } #[cfg(test)] mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; - use nihav_core::test::dec_video::*; - use crate::codecs::indeo_register_all_codecs; - use nihav_commonfmt::demuxers::generic_register_all_demuxers; + use nihav_codec_support::test::dec_video::*; + use crate::indeo_register_all_decoders; + use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_indeo5() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - indeo_register_all_codecs(&mut dec_reg); - - test_file_decoding("avi", "assets/Indeo/IV5/sample.avi", /*None*/Some(2), true, false, None, &dmx_reg, &dec_reg); -// test_file_decoding("avi", "assets/Indeo/IV5/W32mdl_1.avi", None/*Some(2)*/, true, false, Some("iv5")); -//panic!("the end"); + indeo_register_all_decoders(&mut dec_reg); + + // sample: https://samples.mplayerhq.hu/V-codecs/IV50/sample.avi + test_decoding("avi", "indeo5", "assets/Indeo/IV5/sample.avi", Some(100), + &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ + [0xcb451428, 0x5c8b1519, 0x96a81eda, 0x0c9cccf0], + [0x7554e11f, 0x3b60d661, 0x3bcd14b5, 0x036dcc16], + [0x92a20e68, 0x83418e5c, 0x640b6786, 0x9c867622], + [0x0b2cde46, 0x67b68ac5, 0xc152edc6, 0xda591ac3], + [0x9034354b, 0x81c66b57, 0xcb671505, 0x0062a75f], + [0x38606276, 0x547b83df, 0x4a22f079, 0x2afb8362], + [0x0d3fe5df, 0xadc8b042, 0x4ee9cb0d, 0xf9b79b11], + [0x2b0b1ddb, 0x612a163a, 0x47b5afc8, 0xeb4c79a5], + [0x8eadd17e, 0xc4c8c932, 0x57508232, 0x643e1498], + [0x0dcc7da2, 0x7b059de2, 0x0ff46dd9, 0x04c11f77], + [0xe358728a, 0xe42fc515, 0x8f5cc35f, 0x02973436], + [0x66847a32, 0x884b41f0, 0x0c3062bc, 0xb58d923b], + [0x555b2711, 0xbcb54b64, 0x5a6141e5, 0xa7b5cc44], + [0x0f326348, 0x5d36cb21, 0xe7f8210d, 0x8a43c2c5], + [0x4e7b18a3, 0x42146bbb, 0x04c4cf2b, 0x78fe3c0d], + [0x220f0721, 0xe681444a, 0x974bf97b, 0x9b658cfe], + [0x2d5a5f22, 0x23bd1ed8, 0xed383633, 0x5905422d], + [0x982ae872, 0x17b8f765, 0x3d1735af, 0xa2872d9f], + [0x743a2819, 0x392d856e, 0xf2ee64ca, 0x63101b79], + [0x0c9e0aa7, 0x79414f6b, 0x162c19a6, 0x86d69b96], + [0x3eae05ad, 0xbff350bb, 0x97e8a205, 0xfa8e42b2], + [0x0ccae893, 0xdfcf9885, 0xef39d053, 0x0a655a73], + [0x75e98d11, 0x83fab601, 0xe836a6d2, 0xb2a7c7cb], + [0x1565b1ce, 0x8ab813c5, 0xb1658413, 0xeebaf068], + [0xe2bb47dd, 0xc3c277a7, 0x8c6bd4be, 0xbbca989d], + [0xea97912e, 0xcd224d66, 0x76fd31c2, 0x7a854abf], + [0x8eebb842, 0x0534b043, 0xf55a3b65, 0x3868b974], + [0x82c55a0b, 0x5d18c3c8, 0xbdc40fd1, 0x5d11f2e2], + [0xda46bff0, 0xedc1e115, 0x77cb8b8a, 0xf5fd6ddf], + [0x7c9c19e9, 0x4188e742, 0xd8c2cbaf, 0x0ecd1aaa], + [0x33145d5b, 0x0c8e2f61, 0x2ab4b213, 0xf1cf9ebe], + [0x64f561e1, 0xae2aa75b, 0xe4d56a57, 0xdcc54d10], + [0x25545f02, 0x8c271a6a, 0x6b676110, 0xa348628b], + [0x8c33d2d7, 0x7dfc25a0, 0xbdb68979, 0xac7ce8f1], + [0x8adc7126, 0x71c4d390, 0x4b47aeed, 0x444dbd2b], + [0xaab41fbc, 0x2c6de4d8, 0x83b61f31, 0xc68879b1], + [0x90961b3a, 0x9a1d4b51, 0xbf34d9d1, 0xe90137a7], + [0x2e988439, 0x2d7e67ec, 0x9bfd6405, 0xd851ee32], + [0x3b2b45e8, 0x76225018, 0xa2632614, 0x06234ca9], + [0xd52dc6af, 0x36c0d185, 0x90f4a9d2, 0x0b024990], + [0x5ed3ebb2, 0xb19b49a2, 0xd691c27a, 0x7d52941c], + [0xcb22479a, 0x3713b23d, 0x24abe31b, 0x45877b4e], + [0x143aa9f1, 0xe7709011, 0xa6ef993b, 0x8e4f33e2], + [0xc8b1ad16, 0x820b4f85, 0xe9d1482a, 0x806af90c], + [0x4f1eda2b, 0xa73eac8c, 0x8004e66b, 0xa0804e11], + [0x668ceb7b, 0xad020ed3, 0x90687534, 0x96eded7e], + [0x8bbd77d0, 0x29fc1ae4, 0xc41fb7cf, 0x31b08f08], + [0x02d07857, 0x4ed79f55, 0x89cfe082, 0x97167616], + [0xd99dbf57, 0x87ef7406, 0x59c9abdf, 0xf664be32], + [0x6d2bd834, 0x6b61d6e5, 0x3fd282ce, 0xbc877248], + [0xb4dbab3f, 0x7006dded, 0x39608927, 0x9773b83e], + [0x6e1f21e8, 0xff1a76c0, 0x197dd40b, 0x3cedee3d], + [0x551f64b8, 0x98161c0f, 0xb93103a7, 0xac12366e], + [0x6854311c, 0x6bc09f24, 0x226ec3e9, 0x91507815], + [0xb106d988, 0x6c9cda70, 0xebf972ce, 0x97b1efa8], + [0x91b8c27b, 0x257ff731, 0x1589d60d, 0xcb2b3de9], + [0x819d3677, 0xa6afca81, 0x3d2b4ba9, 0xba8cc70f], + [0xfb2c67fa, 0x75af7785, 0xde6133b0, 0x1bb59f2c], + [0xceb72cd4, 0x8c581ccb, 0x803233f2, 0xb88a174b], + [0xe2811f64, 0xa488d42c, 0x3a62a574, 0x918df881], + [0x95a66cf8, 0x0529a646, 0x3bc15b00, 0xfb0eedc9], + [0x1e90f3ce, 0xa8f81b7f, 0x13d5445c, 0xc969a914], + [0x25287783, 0x19869a3d, 0x93672c2a, 0x07a57f5e], + [0x44dfacc0, 0x528ae192, 0x141721a9, 0x85b2a3d9], + [0x45f13c20, 0x90b07bb5, 0x9a155a2f, 0x3933fb77], + [0x40531c62, 0x437c14b6, 0xc03c8d39, 0x35f5ae87], + [0x32e58909, 0xdb068147, 0xa967c6cf, 0x33d9416a], + [0xa8c44523, 0x12a89332, 0xddd09ccf, 0x7b04c0d2], + [0xae00b8b4, 0x589efb18, 0xf8c1dec1, 0xfd9d867f], + [0xe2fc1828, 0x5f7a3b28, 0x72de1c32, 0xc01e6ea6], + [0x8be4c525, 0xcde70d98, 0xd7f5f5a1, 0xf39faadf], + [0x9c744944, 0x00a491f4, 0x665707a9, 0xa93fad9d], + [0x036f2525, 0x827ddd36, 0x989c99db, 0x6b9455fc], + [0x52c6b5d2, 0xfd4e23f9, 0xb620b0da, 0x462d7566], + [0x00ba54e6, 0xfe9021ae, 0xa8c65c37, 0xda979c78], + [0x6e11dca0, 0x41887539, 0x2b9781af, 0x94e6b930], + [0x086be7db, 0xcce50438, 0x2d94bc75, 0x00f4ebfe], + [0xd2216f7c, 0x33321d48, 0x8ce0f144, 0x34c1fd4f], + [0x9083c0fc, 0x6cb46451, 0xd8202b2f, 0xae5db326], + [0xe894be71, 0x0e1b6c67, 0x70d5e81f, 0x2075d5ff], + [0x7f9f10f7, 0x0a8df81d, 0x406cb9cc, 0x524879b5], + [0x4c329904, 0x6f939b2c, 0xd49f8bba, 0xad54aee5], + [0x92d68b43, 0x2c631f71, 0x98329455, 0x91971f7f], + [0x1b06289e, 0x4879af78, 0xc66d7c82, 0xda19e863], + [0x399741da, 0xd362b007, 0x8f94e50c, 0xcdd23209], + [0xa2063194, 0xc67f368a, 0x83462433, 0xe719c2db], + [0x9da0bfd1, 0x8977f90e, 0x7f2f4172, 0xab5213ff], + [0x82823c8f, 0xd7cdd62e, 0xac3a59ba, 0x17ef0fb9], + [0xb3e51375, 0xfebb3ad3, 0x54ffdda4, 0xfbf44cf9], + [0x261f8183, 0x8328012b, 0x47d7e527, 0xc19cca15], + [0xef25bfc7, 0x79460e21, 0xeb65f2ef, 0x63731f9f], + [0xd14fc8f5, 0x209123ea, 0xf5f1cf21, 0x93f84381], + [0xf5375f67, 0x0846d9a1, 0x07aaf802, 0xe753fa08], + [0x65a56edd, 0x4ea28e39, 0x10d17a7b, 0xa9445d87], + [0xbeb8eb53, 0xd01b9c94, 0xd1d15e41, 0x639307cc], + [0xc2272546, 0xd1701452, 0x2fe76cbd, 0xe1dd7697], + [0xff6c09f6, 0x1d7804c2, 0x1ca3a2f8, 0x3fffb67b], + [0xfe48f3fd, 0x0046ec25, 0x1ed4401a, 0xd67f4ed6], + [0x46c3c72f, 0x8398b8c1, 0xe26aff08, 0x0dd1ecbb], + [0xc7f49f94, 0xca32d87c, 0x2e063788, 0x0229c6c0], + [0xa9ec4820, 0x576c7877, 0xc21211c3, 0x502af3d3]])); + } + #[test] + fn test_indeo5_scalable() { + let mut dmx_reg = RegisteredDemuxers::new(); + crate::indeo_register_all_demuxers(&mut dmx_reg); + let mut dec_reg = RegisteredDecoders::new(); + indeo_register_all_decoders(&mut dec_reg); + + // sample is a trailer for Heart of Darkness game + test_decoding("ivf", "indeo5s", "assets/Indeo/TRAILERIIE.IVF", Some(31), + &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ + [0xd6c5b653, 0x082e25e6, 0x90c0c112, 0xfa7f46c8], + [0x75e96cdb, 0x198cdb95, 0xde228898, 0x3cf68cfc], + [0xb1bed823, 0xad632d3e, 0x2e509143, 0x5e59e911], + [0xe3e7e2f0, 0xb8c7d968, 0xcb0b9273, 0xb7e48207], + [0xc6ef6975, 0xe0cc0b05, 0x983f7888, 0x64c9b89f], + [0xda936fad, 0xa170c0f2, 0x889a3e0c, 0xfef1a626], + [0xa85ccb32, 0x2c6847c4, 0x3259f48d, 0xe7e1b47b], + [0xedbb8256, 0x1e889428, 0xbc268e66, 0xf41d15f1], + [0xd6869899, 0x5121410d, 0xb12dfc96, 0x7dc67a24], + [0x9a594172, 0x3d9269c7, 0x1a7277fd, 0xe597dd01], + [0x3af07da6, 0x1968872d, 0xf7fc190e, 0x5c61c184], + [0xd8eec91e, 0x1aa55dfe, 0x9703a2ce, 0x1ce30990], + [0xea4821ae, 0x44ab9f2f, 0xa882bccb, 0xcae50f58], + [0x6ddfb989, 0x1affb8ad, 0x7bb2d74a, 0xc28e1a1d], + [0x4c9aa98d, 0xb6b2ddd2, 0xfb533baf, 0xc2d90242], + [0x332c8e68, 0x47a942ea, 0x6ced7891, 0x7667ad97], + [0x940ad339, 0x448ea27c, 0x3b7d0328, 0x4a4cf19f], + [0x08a60746, 0x399949ef, 0xce81ef06, 0xbc1d7d6b], + [0x4b5e51d0, 0xe26d32f1, 0xb1872663, 0xa70c6e65], + [0x428fb122, 0xf3a55f40, 0xdc4316d7, 0xe2765f76], + [0xcce4fa35, 0xb47d9848, 0xcbe7fef4, 0x5285022b], + [0xde30af92, 0x28a04fe2, 0x317f6be8, 0xde5c161c], + [0xe1f00bf7, 0xab2d4e91, 0x9eb674e6, 0x3b863314], + [0xac944130, 0xa5d1171a, 0xe8a0b591, 0x09d7652d], + [0x17c17612, 0x7cd40f67, 0x7aec3009, 0x2405b862], + [0x1d88eb87, 0x44496fb8, 0x58665011, 0xc545f745], + [0x04c32cce, 0x38eca98f, 0xd6227880, 0xc7d0f2bf], + [0x76d9dcb8, 0x92a35e1a, 0x2b968e96, 0x2c362e4a], + [0xda4904e7, 0x2d9d0a74, 0x63932049, 0x7bf9f0de], + [0x4f18931c, 0x61b9046f, 0xf5eac763, 0x0c1826d5], + [0x823d8746, 0x17debe43, 0xe256fda4, 0xdd1a6832], + [0x0bb4b91d, 0xf66f1c19, 0x166ee91a, 0x69379e27]])); } }