X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvp6.rs;h=241a13a72ef947b3e76874de7bdb647f92026ad3;hb=86081fed61d59fb1ea35ac34628450c9b0c00702;hp=9d72d1f21572984816dbb5d8755365d6433e3cda;hpb=adb9c3d423a15f4fad625f294b664b89100cd4b0;p=nihav.git

diff --git a/nihav-duck/src/codecs/vp6.rs b/nihav-duck/src/codecs/vp6.rs
index 9d72d1f..241a13a 100644
--- a/nihav-duck/src/codecs/vp6.rs
+++ b/nihav-duck/src/codecs/vp6.rs
@@ -1,6 +1,7 @@
 use nihav_core::codecs::*;
 use nihav_core::io::bitreader::*;
-use nihav_core::codecs::blockdsp::edge_emu;
+use nihav_codec_support::codecs::{MV, ZIGZAG};
+use nihav_codec_support::codecs::blockdsp::edge_emu;
 use super::vpcommon::*;
 use super::vp56::*;
 
@@ -36,7 +37,7 @@ impl VP56Parser for VP6BR {
         let mut hdr = VP56Header::default();
 // horrible hack to match VP6 header parsing
         let src = bc.src;
-        let mut br = BitReader::new(src, src.len(), BitReaderMode::BE);
+        let mut br = BitReader::new(src, BitReaderMode::BE);
 
         hdr.is_intra                            = !br.read_bool()?;
         hdr.is_golden = hdr.is_intra;
@@ -556,7 +557,7 @@ fn get_block(dst: &mut [u8], dstride: usize, src: NAVideoBufferRef<u8>, comp: us
     if (sx - 2 < 0) || (sx + 8 + 2 > (w as isize)) ||
        (sy - 2 < 0) || (sy + 8 + 2 > (h as isize)) {
         edge_emu(&src, sx - 2, sy - 2, 8 + 2 + 2, 8 + 2 + 2,
-                 dst, dstride, comp);
+                 dst, dstride, comp, 0);
     } else {
         let sstride = src.get_stride(comp);
         let soff    = src.get_offset(comp);
@@ -688,13 +689,7 @@ impl NADecoder for VP6Decoder {
             let fmt = if !self.has_alpha {
                     YUV420_FORMAT
                 } else {
-                    NAPixelFormaton::new(ColorModel::YUV(YUVSubmodel::YUVJ),
-                                         Some(NAPixelChromaton::new(0, 0, false, 8, 0, 0, 1)),
-                                         Some(NAPixelChromaton::new(1, 1, false, 8, 0, 1, 1)),
-                                         Some(NAPixelChromaton::new(1, 1, false, 8, 0, 2, 1)),
-                                         Some(NAPixelChromaton::new(0, 0, false, 8, 0, 3, 1)),
-                                         None,
-                                         0, 4)
+                    VP_YUVA420_FORMAT
                 };
             let myvinfo = NAVideoInfo::new(vinfo.get_width(), vinfo.get_height(), false, fmt);
             let myinfo = NACodecTypeInfo::Video(myvinfo.clone());
@@ -732,9 +727,9 @@ pub fn get_decoder_vp6_alpha() -> 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_vp6() {
@@ -743,16 +738,26 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         duck_register_all_codecs(&mut dec_reg);
 
-        //let file = "assets/Duck/predator2_vp60.avi";
-        //let file = "assets/Duck/predator2_vp61.avi";
-        //let file = "assets/Duck/vp6_crash.avi";
-        let file = "assets/Duck/vp6_interlaced.avi";
-        //let file = "assets/Duck/vp6_vid.avi";
-        //let file = "assets/Duck/selection_720x576_300kBit_vp60i.avi";
-        //let file = "assets/Duck/selection_720x576_300kBit_flipped_vp60i.avi";
-        test_file_decoding("avi", file, Some(17), true, false, None/*Some("vp6")*/, &dmx_reg, &dec_reg);
-//panic!("end");
+        test_decoding("avi", "vp6", "assets/Duck/selection_720x576_300kBit_vp60i.avi", Some(16),
+                      &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5([0x042c3e96, 0x8a9b26a2, 0x4dcbaf66, 0x1b788d03]));
     }
+    #[test]
+    fn test_vp6_huff() {
+        let mut dmx_reg = RegisteredDemuxers::new();
+        generic_register_all_demuxers(&mut dmx_reg);
+        let mut dec_reg = RegisteredDecoders::new();
+        duck_register_all_codecs(&mut dec_reg);
+
+        test_decoding("avi", "vp6", "assets/Duck/vp6_crash.avi", Some(4),
+                      &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![
+                            [0xdcd70fa0, 0x0d075ce2, 0xc9e65077, 0xb003a92e],
+                            [0x334abf96, 0x3a004c7a, 0x5781cd5c, 0x25c3ae5c],
+                            [0x6164b851, 0x528cd8de, 0xecab7328, 0x4b49708a],
+                            [0x11b048ac, 0xedb3e471, 0xd04e9399, 0x64e623e3],
+                            [0x182871b1, 0x2146893a, 0x2912210e, 0x6dd592e8]]));
+    }
+    // todo find good sample for vp6a test
 }
 
 const VP6_AC_PROBS: [[[[u8; 11]; 6]; 2]; 3] = [