std/vp8: fix luma_mode == 4 HZNC tracking

This commit, part of a series, is inspired by pull request PR #168 by
Damian Kaczmarek (with AI assistance), with some modifications.

Updates PR #168
This commit is contained in:
Nigel Tao committed 2026-06-19 19:05:15 +10:00
1 parent cae59b4ce8
commit ecca245226
4 files changed
+25 -15

No files matched your search

+7 -2
View File
@@ -83950,6 +83950,7 @@ wuffs_vp8__decoder__decode_one_macroblock(
uint32_t v_v1 = 0;
uint32_t v_seg = 0;
uint32_t v_skip = 0;
uint32_t v_mask = 0;
uint32_t v_luma_mode = 0;
uint32_t v_chroma_mode = 0;
@@ -83972,8 +83973,12 @@ wuffs_vp8__decoder__decode_one_macroblock(
wuffs_vp8__decoder__decode_subblock_modes(self, a_workbuf, a_mbx, v_luma_mode);
v_chroma_mode = wuffs_vp8__decoder__decode_chroma_mode(self, a_workbuf);
if (v_skip != 0u) {
self->private_data.f_mb_states_left &= 65535u;
self->private_data.f_mb_states_top[a_mbx] &= 65535u;
v_mask = 65535u;
if (v_luma_mode >= 4u) {
v_mask = 8454143u;
}
self->private_data.f_mb_states_left &= v_mask;
self->private_data.f_mb_states_top[a_mbx] &= v_mask;
self->private_impl.f_mb_dc_nz = 0u;
self->private_impl.f_mb_ac_nz = 0u;
} else {
+7 -2
View File
@@ -81,6 +81,7 @@ pri func decoder.decode_one_macroblock!(workbuf: slice base.u8, mbx: base.u32[..
var seg : base.u32[..= 3]
var skip : base.u32[..= 1]
var mask : base.u32
var luma_mode : base.u32[..= 4]
var chroma_mode : base.u32[..= 3]
@@ -108,8 +109,12 @@ pri func decoder.decode_one_macroblock!(workbuf: slice base.u8, mbx: base.u32[..
if skip <> 0 {
// Clear the HNZC bits.
this.mb_states_left &= 0x0000_FFFF
this.mb_states_top[args.mbx] &= 0x0000_FFFF
mask = 0x0000_FFFF
if luma_mode >= 4 {
mask = 0x0080_FFFF
}
this.mb_states_left &= mask
this.mb_states_top[args.mbx] &= mask
this.mb_dc_nz = 0
this.mb_ac_nz = 0
+1 -1
View File
@@ -91,7 +91,7 @@ OK. f37cea44 test/3pdata/blinksuite/icc-v2-gbr-422-whole-mcus.jpg
OK. 1de5a906 test/3pdata/blinksuite/icc-v2-gbr.jpg
OK. 0da5f37e test/3pdata/blinksuite/jpeg-height-exif-orientation.jpg
OK. 4409dca6 test/3pdata/blinksuite/large-gif-checkerboard.gif
OK. ebfc58f1 test/3pdata/blinksuite/large.webp
OK. 623e1a0c test/3pdata/blinksuite/large.webp
BAD 2f310e57 test/3pdata/blinksuite/missing-eoi.jpg
OK. 72bbe2b6 test/3pdata/blinksuite/motion-jpeg-single-frame.jpg
OK. 0268284a test/3pdata/blinksuite/mu.png
+10 -10
View File
@@ -73,15 +73,15 @@ OK. cdf5da96 test/3pdata/webpsuite/vp80-00-comprehensive-003.webp
OK. c6f14959 test/3pdata/webpsuite/vp80-00-comprehensive-004.webp
OK. 30ad8e94 test/3pdata/webpsuite/vp80-00-comprehensive-005.webp
OK. 7e0c68c5 test/3pdata/webpsuite/vp80-00-comprehensive-006.webp
OK. a26c8f57 test/3pdata/webpsuite/vp80-00-comprehensive-007.webp
OK. 73a0bd15 test/3pdata/webpsuite/vp80-00-comprehensive-008.webp
OK. 49888ceb test/3pdata/webpsuite/vp80-00-comprehensive-007.webp
OK. b4092b4a test/3pdata/webpsuite/vp80-00-comprehensive-008.webp
OK. bbc097ad test/3pdata/webpsuite/vp80-00-comprehensive-009.webp
OK. 53fe88d6 test/3pdata/webpsuite/vp80-00-comprehensive-010.webp
OK. c6f14959 test/3pdata/webpsuite/vp80-00-comprehensive-011.webp
OK. acf70d71 test/3pdata/webpsuite/vp80-00-comprehensive-012.webp
OK. 68affe3b test/3pdata/webpsuite/vp80-00-comprehensive-013.webp
OK. 7bbbe148 test/3pdata/webpsuite/vp80-00-comprehensive-014.webp
OK. e2331cae test/3pdata/webpsuite/vp80-00-comprehensive-015.webp
OK. affe9ca2 test/3pdata/webpsuite/vp80-00-comprehensive-015.webp
OK. ec323212 test/3pdata/webpsuite/vp80-00-comprehensive-016.webp
OK. ec323212 test/3pdata/webpsuite/vp80-00-comprehensive-017.webp
OK. 013e93bd test/3pdata/webpsuite/vp80-01-intra-1400.webp
@@ -99,27 +99,27 @@ OK. 58e9b437 test/3pdata/webpsuite/vp80-03-segmentation-1408.webp
OK. 58e9b437 test/3pdata/webpsuite/vp80-03-segmentation-1409.webp
OK. 58e9b437 test/3pdata/webpsuite/vp80-03-segmentation-1410.webp
OK. 94c57a08 test/3pdata/webpsuite/vp80-03-segmentation-1413.webp
OK. 3ccaa391 test/3pdata/webpsuite/vp80-03-segmentation-1414.webp
OK. c2cb3cc3 test/3pdata/webpsuite/vp80-03-segmentation-1415.webp
OK. c3f6db86 test/3pdata/webpsuite/vp80-03-segmentation-1414.webp
OK. c3f6db86 test/3pdata/webpsuite/vp80-03-segmentation-1415.webp
OK. 13c387bb test/3pdata/webpsuite/vp80-03-segmentation-1425.webp
OK. 54b13627 test/3pdata/webpsuite/vp80-03-segmentation-1426.webp
OK. c285b6fd test/3pdata/webpsuite/vp80-03-segmentation-1426.webp
OK. d05f9538 test/3pdata/webpsuite/vp80-03-segmentation-1427.webp
OK. 2ccbe87c test/3pdata/webpsuite/vp80-03-segmentation-1432.webp
OK. d953dfcc test/3pdata/webpsuite/vp80-03-segmentation-1435.webp
OK. 1cc57ece test/3pdata/webpsuite/vp80-03-segmentation-1436.webp
OK. 2c898efc test/3pdata/webpsuite/vp80-03-segmentation-1437.webp
OK. cbd5671f test/3pdata/webpsuite/vp80-03-segmentation-1441.webp
OK. e38555fb test/3pdata/webpsuite/vp80-03-segmentation-1441.webp
OK. 1cccc88c test/3pdata/webpsuite/vp80-03-segmentation-1442.webp
OK. 013e93bd test/3pdata/webpsuite/vp80-04-partitions-1404.webp
OK. 013e93bd test/3pdata/webpsuite/vp80-04-partitions-1405.webp
OK. 013e93bd test/3pdata/webpsuite/vp80-04-partitions-1406.webp
OK. 497e1b6a test/3pdata/webpsuite/vp80-05-sharpness-1428.webp
OK. 3379e8a2 test/3pdata/webpsuite/vp80-05-sharpness-1428.webp
OK. 8c73498c test/3pdata/webpsuite/vp80-05-sharpness-1429.webp
OK. be3d8a75 test/3pdata/webpsuite/vp80-05-sharpness-1430.webp
OK. f4d860a3 test/3pdata/webpsuite/vp80-05-sharpness-1431.webp
OK. ce684a4e test/3pdata/webpsuite/vp80-05-sharpness-1431.webp
OK. 1cc57ece test/3pdata/webpsuite/vp80-05-sharpness-1433.webp
OK. 5b8d7dad test/3pdata/webpsuite/vp80-05-sharpness-1434.webp
OK. a2561430 test/3pdata/webpsuite/vp80-05-sharpness-1438.webp
OK. 24f312e2 test/3pdata/webpsuite/vp80-05-sharpness-1438.webp
OK. 852c77f4 test/3pdata/webpsuite/vp80-05-sharpness-1439.webp
OK. 1cc57ece test/3pdata/webpsuite/vp80-05-sharpness-1440.webp
OK. 32649270 test/3pdata/webpsuite/vp80-05-sharpness-1443.webp