X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Findeo5.rs;h=eb0b40c577217baa2dc0a4a245c2bfe28a32ad36;hp=2ae529555339d932987a753ff317e203a72df890;hb=b7c882c1ce6f86c07c2340751200e3a060942826;hpb=ce742854b2912b880fb3d3e330042b049dac8504 diff --git a/nihav-indeo/src/codecs/indeo5.rs b/nihav-indeo/src/codecs/indeo5.rs index 2ae5295..eb0b40c 100644 --- a/nihav-indeo/src/codecs/indeo5.rs +++ b/nihav-indeo/src/codecs/indeo5.rs @@ -265,6 +265,7 @@ 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)) } + #[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; @@ -536,6 +537,12 @@ impl NADecoder for Indeo5Decoder { } } +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] = [ [640, 480], [320, 240], [160, 120], [704, 480], [352, 240], [352, 288], [176, 144], [240, 180], [640, 240], [704, 240], [80, 60], [88, 72], [0, 0], [0, 0], [0, 0] @@ -724,14 +731,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::indeo_register_all_codecs; + 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); + indeo_register_all_decoders(&mut dec_reg); test_decoding("avi", "indeo5", "assets/Indeo/IV5/sample.avi", Some(100), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![