X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvp5.rs;h=c520b96b61c0e333bcfd6b0b2cfa52fc1f653dca;hb=d5e94eafdc4c4d4d78eae39610f00d0cc03f2854;hp=0c901be35764ba173a9f022645e0560c6289d678;hpb=08a1fab72215ea7716f51adf7008f85372e80c71;p=nihav.git

diff --git a/nihav-duck/src/codecs/vp5.rs b/nihav-duck/src/codecs/vp5.rs
index 0c901be..c520b96 100644
--- a/nihav-duck/src/codecs/vp5.rs
+++ b/nihav-duck/src/codecs/vp5.rs
@@ -219,11 +219,16 @@ impl VP56Parser for VP5BR {
     }
     fn mc_block(&self, dst: &mut NASimpleVideoFrame<u8>, mc_buf: NAVideoBufferRef<u8>, src: NAVideoBufferRef<u8>, plane: usize, x: usize, y: usize, mv: MV, loop_str: i16) {
         let (sx, sy, mx, my) = if (plane != 1) && (plane != 2) {
-                (mv.x / 2, mv.y / 2, mv.x & 1, mv.y & 1)
+                (mv.x >> 1, mv.y >> 1, mv.x & 1, mv.y & 1)
             } else {
-                (mv.x / 4, mv.y / 4, (mv.x >> 1) & 1, (mv.y >> 1) & 1)
+                (mv.x >> 2, mv.y >> 2, if (mv.x & 3) != 0 { 1 } else { 0 }, if (mv.y & 3) != 0 { 1 } else { 0 })
+            };
+        let mode1 = (mx as usize) + (my as usize) * 2;
+        let mode = if (mode1 == 3) && (mv.x ^ mv.y < 0) {
+                4
+            } else {
+                mode1
             };
-        let mode = (mx as usize) + (my as usize) * 2;
         vp_copy_block(dst, src, plane, x, y, sx, sy, 0, 1, loop_str,
                       mode, VP3_INTERP_FUNCS, mc_buf);
     }
@@ -293,8 +298,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]));
     }
 }