X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvp5.rs;h=eb394687fcb5978589426b4a2670372b87b46512;hb=586ea1879dd193fa71d16302e1c54deb269bc732;hp=7ba6d2ac70d5322a0bd8ae95e48483e55bb8400f;hpb=6d3946fe53fe059226e923b8a01fa31cb13f9ad5;p=nihav.git

diff --git a/nihav-duck/src/codecs/vp5.rs b/nihav-duck/src/codecs/vp5.rs
index 7ba6d2a..eb39468 100644
--- a/nihav-duck/src/codecs/vp5.rs
+++ b/nihav-duck/src/codecs/vp5.rs
@@ -1,5 +1,6 @@
 use nihav_core::codecs::*;
 use nihav_core::io::bitreader::*;
+use nihav_codec_support::codecs::{MV, ZIGZAG};
 use super::vpcommon::*;
 use super::vp56::*;
 
@@ -32,7 +33,7 @@ impl VP56Parser for VP5BR {
             validate!((hdr.disp_w <= hdr.mb_w) && (hdr.disp_h <= hdr.mb_h));
             hdr.scale                           = bc.read_bits(2) as u8;
         }
-        
+
         Ok(hdr)
     }
     fn decode_mv(&self, bc: &mut BoolCoder, model: &VP56MVModel) -> i16 {
@@ -192,7 +193,7 @@ impl VP56Parser for VP5BR {
             if idx > 0 {
                 coeffs[ZIGZAG[idx]] *= fstate.ac_quant;
             }
-            
+
             idx += 1;
             if idx >= 64 {
                 break;
@@ -285,9 +286,9 @@ pub fn get_decoder() -> Box<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_vp5() {
@@ -298,8 +299,8 @@ mod test {
 
         let file = "assets/Duck/Cell-140.vp5";
         //let file = "assets/Duck/Chocolat-500.vp5";
-        test_file_decoding("avi", file, Some(13), true, false, None/*Some("vp5")*/, &dmx_reg, &dec_reg);
-//panic!("end");
+        test_decoding("avi", "vp5", file, Some(96), &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5([0x9ad78b0f, 0xed988ead, 0x88ed2ea9, 0xcdb75cdf]));
     }
 }