std/vp8: fix luma subblock prediction modes

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:04:31 +10:00
1 parent 24fae427c1
commit cae59b4ce8
6 files changed
+59 -57

No files matched your search

+2 -2
View File
@@ -84053,8 +84053,8 @@ wuffs_vp8__decoder__decode_subblock_modes(
uint8_t v_mode = 0;
if (a_luma_mode < 4u) {
self->private_data.f_mb_states_top[a_mbx] = (((uint32_t)(v_mode)) * 4369u);
self->private_data.f_mb_states_left = (((uint32_t)(v_mode)) * 4369u);
self->private_data.f_mb_states_top[a_mbx] = ((self->private_data.f_mb_states_top[a_mbx] & 4294901760u) | (((uint32_t)(a_luma_mode)) * 4369u));
self->private_data.f_mb_states_left = ((self->private_data.f_mb_states_left & 4294901760u) | (((uint32_t)(a_luma_mode)) * 4369u));
return wuffs_base__make_empty_struct();
}
v_i = 0u;
+4 -2
View File
@@ -201,8 +201,10 @@ pri func decoder.decode_subblock_modes!(
var mode : base.u8[..= 9]
if args.luma_mode < 4 {
this.mb_states_top[args.mbx] = (mode as base.u32) * 0x1111
this.mb_states_left = (mode as base.u32) * 0x1111
this.mb_states_top[args.mbx] = (this.mb_states_top[args.mbx] & 0xFFFF_0000) |
((args.luma_mode as base.u32) * 0x1111)
this.mb_states_left = (this.mb_states_left & 0xFFFF_0000) |
((args.luma_mode as base.u32) * 0x1111)
return nothing
}
+3 -3
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. 4a86fc02 test/3pdata/blinksuite/large.webp
OK. ebfc58f1 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
@@ -170,10 +170,10 @@ OK. 9a7e5ec7 test/3pdata/blinksuite/sprite_alternate_fragments_same.png
OK. 1b1f5f96 test/3pdata/blinksuite/stripes-large.png
OK. 6b85cdb9 test/3pdata/blinksuite/stripes-small.png
OK. 16c2c0fe test/3pdata/blinksuite/test-load.jpg
OK. 2f7e9a6e test/3pdata/blinksuite/test.webp
OK. 091ebefc test/3pdata/blinksuite/test.webp
OK. 19d3a207 test/3pdata/blinksuite/test3.webp
BAD 1dfa35c6 test/3pdata/blinksuite/truncated2.webp
OK. 1ecb21c0 test/3pdata/blinksuite/webp-color-no-profile-lossy.webp
OK. bc30d1ff test/3pdata/blinksuite/webp-color-no-profile-lossy.webp
BAD ed67a9a5 test/3pdata/blinksuite/wrong-block-length.gif
OK. 577c5c4c test/3pdata/blinksuite/ycbcr-420-fast-int-progressive.jpg
OK. bf4cd8e2 test/3pdata/blinksuite/ycbcr-420-float-progressive.jpg
+41 -41
View File
@@ -1,7 +1,7 @@
# Generated by script/print-nia-checksums.sh
OK. ca4c0038 test/3pdata/webpsuite/bad_palette_index.webp
OK. 90104612 test/3pdata/webpsuite/bryce.webp
OK. e3e6c4f2 test/3pdata/webpsuite/bug3.webp
OK. d35dede2 test/3pdata/webpsuite/bryce.webp
OK. e707dda8 test/3pdata/webpsuite/bug3.webp
OK. 6fbda804 test/3pdata/webpsuite/color_cache_bits_11.webp
BAD d338aed8 test/3pdata/webpsuite/dual_transform.webp
OK. f79224e7 test/3pdata/webpsuite/grid.bmp
@@ -49,8 +49,8 @@ OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_6.webp
BAD 79781cfb test/3pdata/webpsuite/lossless_vec_2_7.webp
OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_8.webp
BAD 79781cfb test/3pdata/webpsuite/lossless_vec_2_9.webp
OK. fb75ebb9 test/3pdata/webpsuite/lossy_extreme_probabilities.webp
OK. bdf17bed test/3pdata/webpsuite/lossy_q0_f100.webp
OK. 0f4f52f9 test/3pdata/webpsuite/lossy_extreme_probabilities.webp
OK. 19f4f01c test/3pdata/webpsuite/lossy_q0_f100.webp
OK. 6957defa test/3pdata/webpsuite/near_lossless_75.webp
OK. 7c80a001 test/3pdata/webpsuite/one_color_no_palette.webp
OK. 6706e719 test/3pdata/webpsuite/peak.bmp
@@ -64,26 +64,26 @@ OK. cd4ae382 test/3pdata/webpsuite/small_13x1.webp
OK. 1dfeaa2c test/3pdata/webpsuite/small_1x1.webp
OK. fcb05cbe test/3pdata/webpsuite/small_1x13.webp
OK. 5a7d89b4 test/3pdata/webpsuite/small_31x13.webp
OK. d8aedf23 test/3pdata/webpsuite/test-nostrong.webp
OK. 2f7e9a6e test/3pdata/webpsuite/test.webp
OK. d0923a79 test/3pdata/webpsuite/very_short.webp
OK. aaea96fd test/3pdata/webpsuite/vp80-00-comprehensive-001.webp
OK. be18d791 test/3pdata/webpsuite/vp80-00-comprehensive-002.webp
OK. 99223d59 test/3pdata/webpsuite/vp80-00-comprehensive-003.webp
OK. aaea96fd test/3pdata/webpsuite/vp80-00-comprehensive-004.webp
OK. c88edfd9 test/3pdata/webpsuite/vp80-00-comprehensive-005.webp
OK. 5e946f93 test/3pdata/webpsuite/vp80-00-comprehensive-006.webp
OK. 3d16bda7 test/3pdata/webpsuite/vp80-00-comprehensive-007.webp
OK. d8ac59a7 test/3pdata/webpsuite/vp80-00-comprehensive-008.webp
OK. fd279461 test/3pdata/webpsuite/test-nostrong.webp
OK. 091ebefc test/3pdata/webpsuite/test.webp
OK. 8dd65284 test/3pdata/webpsuite/very_short.webp
OK. c6f14959 test/3pdata/webpsuite/vp80-00-comprehensive-001.webp
OK. c3d5d0a9 test/3pdata/webpsuite/vp80-00-comprehensive-002.webp
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. bbc097ad test/3pdata/webpsuite/vp80-00-comprehensive-009.webp
OK. 53fe88d6 test/3pdata/webpsuite/vp80-00-comprehensive-010.webp
OK. f70833d8 test/3pdata/webpsuite/vp80-00-comprehensive-011.webp
OK. 1d82b0b2 test/3pdata/webpsuite/vp80-00-comprehensive-012.webp
OK. 16ae163a test/3pdata/webpsuite/vp80-00-comprehensive-013.webp
OK. 037ea78a test/3pdata/webpsuite/vp80-00-comprehensive-014.webp
OK. 19667752 test/3pdata/webpsuite/vp80-00-comprehensive-015.webp
OK. 89c9c73d test/3pdata/webpsuite/vp80-00-comprehensive-016.webp
OK. a9f0017f test/3pdata/webpsuite/vp80-00-comprehensive-017.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. 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
OK. 94c57a08 test/3pdata/webpsuite/vp80-01-intra-1411.webp
OK. be24b089 test/3pdata/webpsuite/vp80-01-intra-1416.webp
@@ -91,7 +91,7 @@ OK. 7dc6062e test/3pdata/webpsuite/vp80-01-intra-1417.webp
OK. 013e93bd test/3pdata/webpsuite/vp80-02-inter-1402.webp
OK. 94c57a08 test/3pdata/webpsuite/vp80-02-inter-1412.webp
OK. 67711d5e test/3pdata/webpsuite/vp80-02-inter-1418.webp
OK. dbfca331 test/3pdata/webpsuite/vp80-02-inter-1424.webp
OK. 88caa42d test/3pdata/webpsuite/vp80-02-inter-1424.webp
OK. 013e93bd test/3pdata/webpsuite/vp80-03-segmentation-1401.webp
OK. 013e93bd test/3pdata/webpsuite/vp80-03-segmentation-1403.webp
OK. 58e9b437 test/3pdata/webpsuite/vp80-03-segmentation-1407.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. 25937bf3 test/3pdata/webpsuite/vp80-03-segmentation-1414.webp
OK. 432dec58 test/3pdata/webpsuite/vp80-03-segmentation-1415.webp
OK. 7f46998c test/3pdata/webpsuite/vp80-03-segmentation-1425.webp
OK. 58de6882 test/3pdata/webpsuite/vp80-03-segmentation-1426.webp
OK. 3ccaa391 test/3pdata/webpsuite/vp80-03-segmentation-1414.webp
OK. c2cb3cc3 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. d05f9538 test/3pdata/webpsuite/vp80-03-segmentation-1427.webp
OK. d81e0de6 test/3pdata/webpsuite/vp80-03-segmentation-1432.webp
OK. 1c1a3c97 test/3pdata/webpsuite/vp80-03-segmentation-1435.webp
OK. 0ec9a0e9 test/3pdata/webpsuite/vp80-03-segmentation-1436.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. d8bb20a2 test/3pdata/webpsuite/vp80-03-segmentation-1441.webp
OK. 51272070 test/3pdata/webpsuite/vp80-03-segmentation-1442.webp
OK. cbd5671f 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. 712a8a5c test/3pdata/webpsuite/vp80-05-sharpness-1428.webp
OK. 393b458f test/3pdata/webpsuite/vp80-05-sharpness-1429.webp
OK. 497e1b6a 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. 30ecc9b1 test/3pdata/webpsuite/vp80-05-sharpness-1431.webp
OK. 9b64969a test/3pdata/webpsuite/vp80-05-sharpness-1433.webp
OK. 92da617c test/3pdata/webpsuite/vp80-05-sharpness-1434.webp
OK. 5c0e9903 test/3pdata/webpsuite/vp80-05-sharpness-1438.webp
OK. 299049d0 test/3pdata/webpsuite/vp80-05-sharpness-1439.webp
OK. 9b64969a test/3pdata/webpsuite/vp80-05-sharpness-1440.webp
OK. 5d040f18 test/3pdata/webpsuite/vp80-05-sharpness-1443.webp
OK. f4d860a3 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. 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
+3 -3
View File
@@ -111,7 +111,7 @@ test_wuffs_webp_decode_interface_lossy() {
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
return do_test__wuffs_base__image_decoder(
wuffs_webp__decoder__upcast_as__wuffs_base__image_decoder(dec),
"test/data/bricks-color.lossy.webp", 0, SIZE_MAX, 160, 120, 0xFF493D65);
"test/data/bricks-color.lossy.webp", 0, SIZE_MAX, 160, 120, 0xFF123168);
}
const char* //
@@ -200,8 +200,8 @@ test_wuffs_webp_decode_many_small_reads() {
wuffs_base__color_u32_argb_premul last_pixel =
wuffs_base__pixel_buffer__color_u32_at(&pb, w - 1, h - 1);
if (last_pixel != 0xFF2D1922) {
RETURN_FAIL("last_pixel: have 0x%" PRIX32 ", want 0xFF2D1922", last_pixel);
if (last_pixel != 0xFF2D1827) {
RETURN_FAIL("last_pixel: have 0x%" PRIX32 ", want 0xFF2D1827", last_pixel);
}
return NULL;
+6 -6
View File
@@ -65,7 +65,7 @@ OK. 41e6110e test/data/bricks-color.etc1s.pkm
OK. 5670f263 test/data/bricks-color.etc2.pkm
OK. 72a1f9cc test/data/bricks-color.jpeg
OK. 076cb375 test/data/bricks-color.lossless.webp
OK. 4af3fcf2 test/data/bricks-color.lossy.webp
OK. e6fa7dde test/data/bricks-color.lossy.webp
OK. 076cb375 test/data/bricks-color.png
OK. 076cb375 test/data/bricks-color.qoi
OK. 076cb375 test/data/bricks-color.tga
@@ -83,7 +83,7 @@ OK. 6065d955 test/data/bricks-gray.c3q4.handsum
OK. c2bce675 test/data/bricks-gray.gif
OK. 3a2478ad test/data/bricks-gray.jpeg
OK. c2bce675 test/data/bricks-gray.lossless.webp
OK. fc0d7a27 test/data/bricks-gray.lossy.webp
OK. 21bfc968 test/data/bricks-gray.lossy.webp
OK. c2bce675 test/data/bricks-gray.no-ancillary.png
OK. c2bce675 test/data/bricks-gray.png
OK. c2bce675 test/data/bricks-gray.tga
@@ -102,7 +102,7 @@ OK. 030f5a48 test/data/harvesters.bmp
OK. c18b3d5a test/data/harvesters.gif
OK. f217df74 test/data/harvesters.jpeg
OK. 030f5a48 test/data/harvesters.lossless.webp
OK. f94319e2 test/data/harvesters.lossy.webp
OK. 5a00fc85 test/data/harvesters.lossy.webp
OK. 030f5a48 test/data/harvesters.png
OK. e776c90f test/data/hat.bmp
OK. 6dcba6a4 test/data/hat.gif
@@ -115,13 +115,13 @@ OK. 33a44f22 test/data/hibiscus.primitive.bmp
OK. 25e212b3 test/data/hibiscus.primitive.gif
OK. 9624fa44 test/data/hibiscus.primitive.jpeg
OK. 33a44f22 test/data/hibiscus.primitive.lossless.webp
OK. 8fa195d4 test/data/hibiscus.primitive.lossy.webp
OK. 5398c9d7 test/data/hibiscus.primitive.lossy.webp
OK. 33a44f22 test/data/hibiscus.primitive.png
OK. 60040742 test/data/hibiscus.regular.bmp
OK. b727da8b test/data/hibiscus.regular.gif
OK. 41e39405 test/data/hibiscus.regular.jpeg
OK. 60040742 test/data/hibiscus.regular.lossless.webp
OK. a88f76df test/data/hibiscus.regular.lossy.webp
OK. cc05ca96 test/data/hibiscus.regular.lossy.webp
OK. 60040742 test/data/hibiscus.regular.png
OK. dcbb225a test/data/hippopotamus.bmp
OK. ed4b78fc test/data/hippopotamus.interlaced.gif
@@ -146,7 +146,7 @@ OK. 39d18fce test/data/mona-lisa.21x32.c3q4.handsum
OK. f6bb81e2 test/data/mona-lisa.21x32.etc2.pkm
OK. 012ce4cf test/data/mona-lisa.21x32.lossless.webp
OK. 012ce4cf test/data/mona-lisa.21x32.png
OK. 6e682e48 test/data/mona-lisa.21x32.q0.lossy.webp
OK. f0a78a8b test/data/mona-lisa.21x32.q0.lossy.webp
OK. 1b56acf3 test/data/mona-lisa.21x32.q25.lossy.webp
OK. 0a22e689 test/data/mona-lisa.21x32.q50.jpeg
OK. a6a79d62 test/data/mona-lisa.21x32.q50.lossy.webp