X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Ftruemotion2.rs;h=2ee8b24f593bde977ddcfefea708b32cc6943074;hb=e64739f87a35f29be0bbbce366876180ba3eb57e;hp=0d937e0ee83ef5c65b64377d749936405962b63d;hpb=fa90ccfb8676a917a02fbb56381f86aa1962d313;p=nihav.git diff --git a/nihav-duck/src/codecs/truemotion2.rs b/nihav-duck/src/codecs/truemotion2.rs index 0d937e0..2ee8b24 100644 --- a/nihav-duck/src/codecs/truemotion2.rs +++ b/nihav-duck/src/codecs/truemotion2.rs @@ -145,7 +145,7 @@ impl TM2Stream { validate!(pos <= endpos); let toskip = endpos - pos; br.read_skip(toskip as usize)?; - + Ok(()) } fn read_deltas(&mut self, src: &[u8]) -> DecoderResult { @@ -164,7 +164,7 @@ impl TM2Stream { self.deltas[i] = val as i32; } } - + Ok(((br.tell() + 31) >> 5) << 2) } fn read_huff_tree(&mut self, src: &[u8], htree: &mut HuffTree) -> DecoderResult { @@ -186,7 +186,7 @@ impl TM2Stream { let mut cr = FullCodebookDescReader::new(codes); htree.cb = Some(Codebook::new(&mut cr, CodebookMode::MSB)?); } - + Ok(((br.tell() + 31) >> 5) << 2) } fn read_tokens(&mut self, src: &[u8], htree: &HuffTree, ntoks: usize) -> DecoderResult { @@ -198,7 +198,7 @@ impl TM2Stream { self.tokens.push(tok); } } - + Ok(((br.tell() + 31) >> 5) << 2) } @@ -590,8 +590,8 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_core::test::dec_video::*; - use crate::codecs::duck_register_all_codecs; - use nihav_commonfmt::demuxers::generic_register_all_demuxers; + use crate::duck_register_all_codecs; + use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_tm2() { let mut dmx_reg = RegisteredDemuxers::new();