X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Ftruemotion2.rs;h=8be4561b952cc4ebb782fd490101e29e29a3b1c1;hb=586ea1879dd193fa71d16302e1c54deb269bc732;hp=469147fcc46b981c31b8172b7afbf854662165b4;hpb=9d8612819aacd6947bd0ea64e3a00172d02182b9;p=nihav.git

diff --git a/nihav-duck/src/codecs/truemotion2.rs b/nihav-duck/src/codecs/truemotion2.rs
index 469147f..8be4561 100644
--- a/nihav-duck/src/codecs/truemotion2.rs
+++ b/nihav-duck/src/codecs/truemotion2.rs
@@ -145,11 +145,11 @@ impl TM2Stream {
         validate!(pos <= endpos);
         let toskip = endpos - pos;
                                                   br.read_skip(toskip as usize)?;
-        
+
         Ok(())
     }
     fn read_deltas(&mut self, src: &[u8]) -> DecoderResult<usize> {
-        let mut br = BitReader::new(src, src.len(), BitReaderMode::LE32MSB);
+        let mut br = BitReader::new(src, BitReaderMode::LE32MSB);
         let coded_deltas                        = br.read(9)? as usize;
         let bits                                = br.read(5)? as u8;
         validate!((coded_deltas <= TM2_MAX_DELTAS) && (bits > 0));
@@ -164,11 +164,11 @@ 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<usize> {
-        let mut br = BitReader::new(src, src.len(), BitReaderMode::LE32MSB);
+        let mut br = BitReader::new(src, BitReaderMode::LE32MSB);
 
         let val_bits                            = br.read(5)? as u8;
         let max_bits                            = br.read(5)? as u8;
@@ -186,11 +186,11 @@ 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<usize> {
-        let mut br = BitReader::new(src, src.len(), BitReaderMode::LE32MSB);
+        let mut br = BitReader::new(src, BitReaderMode::LE32MSB);
 
         if let Some(ref cb) = htree.cb {
             for _ in 0..ntoks {
@@ -198,7 +198,7 @@ impl TM2Stream {
                 self.tokens.push(tok);
             }
         }
-        
+
         Ok(((br.tell() + 31) >> 5) << 2)
     }
 
@@ -589,9 +589,9 @@ pub fn get_decoder() -> Box<dyn NADecoder + Send> {
 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 nihav_codec_support::test::dec_video::*;
+    use crate::duck_register_all_codecs;
+    use nihav_commonfmt::generic_register_all_demuxers;
     #[test]
     fn test_tm2() {
         let mut dmx_reg = RegisteredDemuxers::new();