]> git.nihav.org Git - nihav.git/commitdiff
vp5/6: fix 4MV chroma motion vector calculation
authorKostya Shishkov <kostya.shishkov@gmail.com>
Sat, 21 Nov 2026 09:53:47 +0000 (10:53 +0100)
committerKostya Shishkov <kostya.shishkov@gmail.com>
Sat, 21 Nov 2026 09:53:47 +0000 (10:53 +0100)
Reported by GitHub user Hailey-Ross

nihav-duck/src/codecs/vp5.rs
nihav-duck/src/codecs/vp56.rs
nihav-duck/src/codecs/vp6.rs
nihav-duck/src/codecs/vp6enc/mb.rs
nihav-duck/src/codecs/vp6enc/mod.rs

index cbb55e82f6eb960df52c2d42ff026debad0283d0..f760a777f5ee11bc21549cd430649676ef0e7f4b 100644 (file)
@@ -308,7 +308,7 @@ mod test {
         //let file = "assets/Duck/Chocolat-500.vp5";
         // sample: https://samples.mplayerhq.hu/V-codecs/VP5/Cell-140.vp5
         test_decoding("avi", "vp5", file, Some(96), &dmx_reg, &dec_reg,
-                      ExpectedTestResult::MD5([0x9ad78b0f, 0xed988ead, 0x88ed2ea9, 0xcdb75cdf]));
+                      ExpectedTestResult::MD5([0x71505d34, 0xec2ca79f, 0x6d2799fd, 0x89f3184d]));
     }
 }
 
index 17b403fcc41a2737a2a1172adf367ae1b1376a3c..82847217038bbddabeba06c91bb40a1f783ffb04 100644 (file)
@@ -998,7 +998,9 @@ impl VP56Decoder {
             let x = self.fstate.mb_x * 8;
             let y = self.fstate.mb_y * 8;
             let sum = mvs[0] + mvs[1] + mvs[2] + mvs[3];
-            let mv = MV { x: sum.x / 4, y: sum.y / 4 };
+            let xbias = if sum.x >= 0 { 2 } else { 1 };
+            let ybias = if sum.y >= 0 { 2 } else { 1 };
+            let mv = MV { x: (sum.x + xbias) >> 2, y: (sum.y + ybias) >> 2 };
             br.mc_block(frm, self.mc_buf.clone(), src.clone(), 1, x, y, mv, self.loop_thr);
             br.mc_block(frm, self.mc_buf.clone(), src,         2, x, y, mv, self.loop_thr);
         }
index babaae16706f05bd680597571a5873325c0c91ec..6647c789058cdb758e5247cd73cac56bf002280d 100644 (file)
@@ -568,7 +568,7 @@ mod test {
         // sample from a private collection
         test_decoding("avi", "vp6", "assets/Duck/selection_720x576_300kBit_vp60i.avi", Some(16),
                       &dmx_reg, &dec_reg,
-                      ExpectedTestResult::MD5([0x042c3e96, 0x8a9b26a2, 0x4dcbaf66, 0x1b788d03]));
+                      ExpectedTestResult::MD5([0x89ff9876, 0x95cd891d, 0x3f1b1903, 0xb15a290d]));
     }
     #[test]
     fn test_vp6_huff() {
@@ -581,10 +581,10 @@ mod test {
         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]]));
+                            [0xa5d04589, 0x7bdbb3b6, 0xe730ea4f, 0x4619ef26],
+                            [0x296d37c4, 0x181eae8c, 0x79a10fed, 0x5368f155],
+                            [0x2c38c630, 0x98a5ee09, 0x8ca0bcb3, 0x0f381ac7],
+                            [0x8b2ed900, 0xc6c40779, 0xf06b4f19, 0x54b284ae]]));
     }
     #[test]
     fn test_vp6_alpha() {
@@ -621,7 +621,7 @@ mod test {
                             [0xd3801a96, 0x1b5384ff, 0x422b228c, 0x9c4582c4],
                             [0x8ddb0dfe, 0x302eb1ed, 0x10e64e22, 0x5a5a62b9],
                             [0x79338328, 0x06113781, 0x8b116d18, 0xde56707e],
-                            [0xdb58433b, 0x1de4ce67, 0x15fcbcee, 0x1df9de61]]));
+                            [0xce2bca81, 0x07b9b018, 0xf7ff33f9, 0x36a1cbe0]]));
     }
     #[test]
     fn test_vp6_alpha_huff() {
index 4dd7d489fa8e91870f312f1175f611ecb53c1fa4..0f6d0168f3867b184ce5a97aaf66686d5ad9ca46 100644 (file)
@@ -412,7 +412,9 @@ impl FrameEncoder {
             mb.mv[i] = best_mv;
         }
         let mvsum = mb.mv[0] + mb.mv[1] + mb.mv[2] + mb.mv[3];
-        let chroma_mv = MV{ x: mvsum.x / 4, y: mvsum.y / 4};
+        let xbias = if mvsum.x >= 0 { 2 } else { 1 };
+        let ybias = if mvsum.y >= 0 { 2 } else { 1 };
+        let chroma_mv = MV{ x: (mvsum.x + xbias) >> 2, y: (mvsum.y + ybias) >> 2 };
 
         for (i, blk) in mb.residue.coeffs[..4].iter_mut().enumerate() {
             let xpos = mb_x * 16 + (i &  1) * 8;
index 6c5cfdcdea4c7924e1a44cf6b3c7b0701618027c..b0e860f180e8d250afac12a2d1372382e89bc310 100644 (file)
@@ -974,7 +974,7 @@ mod test {
     fn test_vp6_encoder_rc() {
         let enc_options = &[
             ];
-        encode_test("vp6-rc.avi", enc_options, &[0x790baca9, 0x663eafcf, 0x36d1bed8, 0xddf882de]);
+        encode_test("vp6-rc.avi", enc_options, &[0x2164fb25, 0xe91984ac, 0x22316452, 0x45b65730]);
     }
     #[test]
     fn test_vp6_encoder_huff() {