From: Kostya Shishkov Date: Sat, 21 Nov 2026 10:24:50 +0000 (+0100) Subject: vp6: use loop filter in MC only when it is enabled X-Git-Url: https://git.nihav.org/?a=commitdiff_plain;h=5d4a71f2c5e4c95d4f75165885dd1971355844c5;p=nihav.git vp6: use loop filter in MC only when it is enabled Reported by GitHub user Hailey-Ross --- diff --git a/nihav-duck/src/codecs/vp6.rs b/nihav-duck/src/codecs/vp6.rs index 6647c78..ceb3269 100644 --- a/nihav-duck/src/codecs/vp6.rs +++ b/nihav-duck/src/codecs/vp6.rs @@ -310,15 +310,17 @@ impl VP56Parser for VP6BR { }; let tmp_blk = mc_buf.get_data_mut().unwrap(); get_block(tmp_blk, 16, src, plane, x, y, sx, sy); - if (msx & 7) != 0 { - let foff = (8 - (sx & 7)) as usize; - let off = 2 + foff; - vp31_loop_filter(tmp_blk, off, 1, 16, 12, loop_str); - } - if (msy & 7) != 0 { - let foff = (8 - (sy & 7)) as usize; - let off = (2 + foff) * 16; - vp31_loop_filter(tmp_blk, off, 16, 1, 12, loop_str); + if self.loop_mode != 0 { + if (msx & 7) != 0 { + let foff = (8 - (sx & 7)) as usize; + let off = 2 + foff; + vp31_loop_filter(tmp_blk, off, 1, 16, 12, loop_str); + } + if (msy & 7) != 0 { + let foff = (8 - (sy & 7)) as usize; + let off = (2 + foff) * 16; + vp31_loop_filter(tmp_blk, off, 16, 1, 12, loop_str); + } } let copy_mode = (mx == 0) && (my == 0); let mut bicubic = !copy_mode && is_luma && self.bicubic; @@ -568,7 +570,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([0x89ff9876, 0x95cd891d, 0x3f1b1903, 0xb15a290d])); + ExpectedTestResult::MD5([0x496ac09a, 0x6738d8a8, 0xf325fba1, 0x4406d8c2])); } #[test] fn test_vp6_huff() { @@ -581,10 +583,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], - [0xa5d04589, 0x7bdbb3b6, 0xe730ea4f, 0x4619ef26], - [0x296d37c4, 0x181eae8c, 0x79a10fed, 0x5368f155], - [0x2c38c630, 0x98a5ee09, 0x8ca0bcb3, 0x0f381ac7], - [0x8b2ed900, 0xc6c40779, 0xf06b4f19, 0x54b284ae]])); + [0xcaf1e2e3, 0x3abacdef, 0x0b2519f4, 0xe5562181], + [0x53eebae4, 0xfe97c7ab, 0x6e86d11d, 0x27b8be22], + [0xde9dfa0f, 0xae257949, 0x62bf1436, 0xeda23216], + [0x7edb5e44, 0x2bb6f527, 0x2f6de117, 0xe591744f]])); } #[test] fn test_vp6_alpha() {