X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Findeo4.rs;h=474a8d5c7b159a21f620d7df5520d9b4cdc097da;hp=d6bb283ca9e04773c6343a27c0371abc4d8b0190;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=fa90ccfb8676a917a02fbb56381f86aa1962d313 diff --git a/nihav-indeo/src/codecs/indeo4.rs b/nihav-indeo/src/codecs/indeo4.rs index d6bb283..474a8d5 100644 --- a/nihav-indeo/src/codecs/indeo4.rs +++ b/nihav-indeo/src/codecs/indeo4.rs @@ -2,6 +2,7 @@ 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::*; @@ -460,6 +461,12 @@ impl NADecoder for Indeo4Decoder { } } +impl NAOptionHandler for Indeo4Decoder { + fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } + fn set_options(&mut self, _options: &[NAOption]) { } + fn query_option_value(&self, _name: &str) -> Option { None } +} + const INDEO4_PICTURE_SIZE_TAB: [[usize; 2]; 7] = [ [640, 480], [320, 240], [160, 120], [704, 480], [352, 240], [352, 288], [176, 144] ]; @@ -769,15 +776,15 @@ 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::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_indeo4() { 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", "indeo4", "assets/Indeo/IV4/volcano.avi", Some(16), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![