X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fcodecs%2Fclearvideo.rs;h=47357311668dcfb1d7a59efe4ebaffddd626be36;hp=953e3c097004030ec5cfeab6943c6bdc48c6a029;hb=e64739f87a35f29be0bbbce366876180ba3eb57e;hpb=6e24ec0bcf9d521c66551eebd198400c5342b0be

diff --git a/nihav-commonfmt/src/codecs/clearvideo.rs b/nihav-commonfmt/src/codecs/clearvideo.rs
index 953e3c0..4735731 100644
--- a/nihav-commonfmt/src/codecs/clearvideo.rs
+++ b/nihav-commonfmt/src/codecs/clearvideo.rs
@@ -671,7 +671,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)?;
@@ -705,11 +705,11 @@ impl NADecoder for ClearVideoDecoder {
     }
 }
 
-pub fn get_decoder() -> Box<dyn NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder + Send> {
     Box::new(ClearVideoDecoder::new(false))
 }
 
-pub fn get_decoder_rm() -> Box<dyn NADecoder> {
+pub fn get_decoder_rm() -> Box<dyn NADecoder + Send> {
     Box::new(ClearVideoDecoder::new(true))
 }
 
@@ -717,18 +717,28 @@ pub fn get_decoder_rm() -> Box<dyn NADecoder> {
 mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
-    use nihav_core::test::dec_video::test_file_decoding;
-    use crate::codecs::generic_register_all_codecs;
-    use crate::demuxers::generic_register_all_demuxers;
+    use nihav_core::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();
         generic_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
         generic_register_all_codecs(&mut dec_reg);
-        test_file_decoding("avi", "assets/Misc/TalkingHead_352x288.avi", Some(10), true, false, None/*Some("clv")*/, &dmx_reg, &dec_reg);
-//         test_file_decoding("avi", "assets/Misc/basketball.avi", None/*Some(10)*/, true, false, Some("clv1"));
-//panic!("debug");
+        test_decoding("avi", "clearvideo", "assets/Misc/TalkingHead_352x288.avi", Some(10), &dmx_reg,
+                     &dec_reg, ExpectedTestResult::MD5Frames(vec![
+                            [0xb432376c, 0xf1dce57b, 0x8e79c7ee, 0xdd51850d],
+                            [0x76eb9726, 0x7ca1aabd, 0xf3f0740c, 0xf804dd0e],
+                            [0xc639b32c, 0x1f53f1f4, 0x50c34651, 0xc49cd2ac],
+                            [0x55408f2a, 0x37b01de0, 0xcc6aeadd, 0x09768735],
+                            [0xea219c51, 0xed72710c, 0x6c4b2bb0, 0xbfab0cb7],
+                            [0xfbf56708, 0x7f6597c7, 0x08ce894d, 0x9c4c7f60],
+                            [0x3dbf8b57, 0x9e1513ef, 0x209309a6, 0x56f0aca7],
+                            [0xc5fb6cb7, 0x1b9b092f, 0xe11127be, 0xe4fe8f45],
+                            [0x81a4a122, 0xb2b84bcf, 0xa478bd80, 0x12c78fb6],
+                            [0xb5b43c22, 0xd9c457fa, 0xcc5390d8, 0x1201ef22],
+                            [0x27a206e9, 0x88085556, 0x1114fb62, 0x77f1ebed]]));
     }
 }