fix import crate for codec tests

[nihav.git] / nihav-commonfmt / src / codecs / clearvideo.rs

diff --git a/nihav-commonfmt/src/codecs/clearvideo.rs b/nihav-commonfmt/src/codecs/clearvideo.rs
index 9b5ee77635072a668338dec6295b040e99e4b60b..3802de89151bede39db881d9bd4e997a4d06cfa6 100644 (file)
--- a/nihav-commonfmt/src/codecs/clearvideo.rs
+++ b/nihav-commonfmt/src/codecs/clearvideo.rs
@@ -3,6 +3,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, MV, ZERO_MV, ZIGZAG};
 
 struct CLVDCCodeReader { }
 struct CLVACCodeReader { }
@@ -671,7 +672,7 @@ impl NADecoder for ClearVideoDecoder {
         }
 
         let is_intra = (src[off] & 2) == 2;
-        let mut br = BitReader::new(&src[(off + 1)..], src.len() - (off + 1), BitReaderMode::BE);
+        let mut br = BitReader::new(&src[(off + 1)..], BitReaderMode::BE);
 
         let vinfo = self.info.get_properties().get_video_info().unwrap();
         let bufinfo = alloc_video_buffer(vinfo, self.tsize)?;
@@ -717,9 +718,9 @@ pub fn get_decoder_rm() -> 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::generic_register_all_codecs;
-    use crate::demuxers::generic_register_all_demuxers;
+    use nihav_codec_support::test::dec_video::*;
+    use crate::generic_register_all_codecs;
+    use crate::generic_register_all_demuxers;
     #[test]
     fn test_clv() {
         let mut dmx_reg = RegisteredDemuxers::new();