X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Findeo2.rs;h=14d3c0ae8a45329e299f6a32c7294bc80446b73a;hb=e781ccc3c7149249c03885e41da02c50faf745bd;hp=7556e6aefe0bc3f2b957e33b40a6c3047d889b00;hpb=23099ca919c137a0a8c7c405b718ac5c070fb796;p=nihav.git diff --git a/nihav-indeo/src/codecs/indeo2.rs b/nihav-indeo/src/codecs/indeo2.rs index 7556e6a..14d3c0a 100644 --- a/nihav-indeo/src/codecs/indeo2.rs +++ b/nihav-indeo/src/codecs/indeo2.rs @@ -2,6 +2,7 @@ use nihav_core::io::bitreader::*; use nihav_core::io::codebook::*; use nihav_core::formats; use nihav_core::codecs::*; +use nihav_codec_support::codecs::HAMShuffler; static INDEO2_DELTA_TABLE: [[u8; 256]; 4] = [ [ @@ -326,7 +327,7 @@ impl NADecoder for Indeo2Decoder { if src.len() <= IR2_START { return Err(DecoderError::ShortData); } let interframe = src[18]; let tabs = src[34]; - let mut br = BitReader::new(&src[IR2_START..], src.len() - IR2_START, BitReaderMode::LE); + let mut br = BitReader::new(&src[IR2_START..], BitReaderMode::LE); let luma_tab = tabs & 3; let chroma_tab = (tabs >> 2) & 3; if interframe != 0 { @@ -372,9 +373,9 @@ 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_codecs; + use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_indeo2() { let mut dmx_reg = RegisteredDemuxers::new();