std/vp8: use YCC_UPSAMPLING__FANCY_LIKE_LIBWEBP Updates PR #168
diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index ec6e188..c99c264 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c
@@ -84333,7 +84333,7 @@ 1u, 0u, ((uint8_t)(1u)), - ((uint8_t)(0u)), + ((uint8_t)(2u)), wuffs_base__make_slice_u8(self->private_data.f_swizzle_ycck_scratch_buffer_2k, 2048)); return wuffs_private_impl__status__ensure_not_a_suspension(v_status); }
diff --git a/std/vp8/decode_macroblocks.wuffs b/std/vp8/decode_macroblocks.wuffs index 59982b0..5c608fd 100644 --- a/std/vp8/decode_macroblocks.wuffs +++ b/std/vp8/decode_macroblocks.wuffs
@@ -429,7 +429,7 @@ v3: 0, ycc_model: base.YCC_MODEL__BT_601_STUDIO_RANGE as base.u8, // TODO(§): let fancy upsampling work with y_min_incl > 0. - ycc_upsampling: base.YCC_UPSAMPLING__BASIC as base.u8, + ycc_upsampling: base.YCC_UPSAMPLING__FANCY_LIKE_LIBWEBP as base.u8, scratch_buffer_2k: this.swizzle_ycck_scratch_buffer_2k[..]) return status }
diff --git a/test/3pdata/nia-checksums-of-blinksuite.txt b/test/3pdata/nia-checksums-of-blinksuite.txt index 628424a..eb72b89 100644 --- a/test/3pdata/nia-checksums-of-blinksuite.txt +++ b/test/3pdata/nia-checksums-of-blinksuite.txt
@@ -91,7 +91,7 @@ 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. 8f798e8b test/3pdata/blinksuite/large.webp +OK. d67648b6 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. 1b1f5f96 test/3pdata/blinksuite/stripes-large.png OK. 6b85cdb9 test/3pdata/blinksuite/stripes-small.png OK. 16c2c0fe test/3pdata/blinksuite/test-load.jpg -OK. 631f6a02 test/3pdata/blinksuite/test.webp +OK. 6fbda804 test/3pdata/blinksuite/test.webp OK. 19d3a207 test/3pdata/blinksuite/test3.webp BAD 1dfa35c6 test/3pdata/blinksuite/truncated2.webp -OK. 603ddc49 test/3pdata/blinksuite/webp-color-no-profile-lossy.webp +OK. eb191e45 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
diff --git a/test/3pdata/nia-checksums-of-webpsuite.txt b/test/3pdata/nia-checksums-of-webpsuite.txt index 67ce611..88607e9 100644 --- a/test/3pdata/nia-checksums-of-webpsuite.txt +++ b/test/3pdata/nia-checksums-of-webpsuite.txt
@@ -1,7 +1,7 @@ # Generated by script/print-nia-checksums.sh OK. ca4c0038 test/3pdata/webpsuite/bad_palette_index.webp -OK. 3557c3f5 test/3pdata/webpsuite/bryce.webp -OK. a07d001c test/3pdata/webpsuite/bug3.webp +OK. 3dd065ab test/3pdata/webpsuite/bryce.webp +OK. 7794c8b2 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,77 +49,77 @@ 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. 3a23e407 test/3pdata/webpsuite/lossy_extreme_probabilities.webp -OK. f6f31bd1 test/3pdata/webpsuite/lossy_q0_f100.webp +OK. ac62b1e6 test/3pdata/webpsuite/lossy_extreme_probabilities.webp +OK. 84ff1fbf 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 OK. 315bbd77 test/3pdata/webpsuite/peak.pgm OK. 6706e719 test/3pdata/webpsuite/peak.png OK. 6706e719 test/3pdata/webpsuite/peak.ppm -OK. e58f2013 test/3pdata/webpsuite/segment01.webp -OK. 931e5bb2 test/3pdata/webpsuite/segment02.webp -OK. c42afa6d test/3pdata/webpsuite/segment03.webp +OK. 6d2a2c1f test/3pdata/webpsuite/segment01.webp +OK. b7705924 test/3pdata/webpsuite/segment02.webp +OK. 98115d46 test/3pdata/webpsuite/segment03.webp OK. 9fba8052 test/3pdata/webpsuite/small_13x1.webp OK. f08db259 test/3pdata/webpsuite/small_1x1.webp OK. ae403f6e test/3pdata/webpsuite/small_1x13.webp -OK. 70c37cb6 test/3pdata/webpsuite/small_31x13.webp -OK. 80c1ff42 test/3pdata/webpsuite/test-nostrong.webp -OK. 631f6a02 test/3pdata/webpsuite/test.webp +OK. fc06d690 test/3pdata/webpsuite/small_31x13.webp +OK. 706a6c13 test/3pdata/webpsuite/test-nostrong.webp +OK. 6fbda804 test/3pdata/webpsuite/test.webp OK. b1e2e316 test/3pdata/webpsuite/very_short.webp -OK. ff7d9585 test/3pdata/webpsuite/vp80-00-comprehensive-001.webp -OK. 684b846a test/3pdata/webpsuite/vp80-00-comprehensive-002.webp -OK. d3127a10 test/3pdata/webpsuite/vp80-00-comprehensive-003.webp -OK. ff7d9585 test/3pdata/webpsuite/vp80-00-comprehensive-004.webp -OK. c5600ecc test/3pdata/webpsuite/vp80-00-comprehensive-005.webp -OK. 3836d469 test/3pdata/webpsuite/vp80-00-comprehensive-006.webp -OK. 04f7f4c9 test/3pdata/webpsuite/vp80-00-comprehensive-007.webp -OK. e06af858 test/3pdata/webpsuite/vp80-00-comprehensive-008.webp -OK. 9458b100 test/3pdata/webpsuite/vp80-00-comprehensive-009.webp -OK. 954647a5 test/3pdata/webpsuite/vp80-00-comprehensive-010.webp -OK. ff7d9585 test/3pdata/webpsuite/vp80-00-comprehensive-011.webp -OK. 6732c101 test/3pdata/webpsuite/vp80-00-comprehensive-012.webp -OK. df21b5c8 test/3pdata/webpsuite/vp80-00-comprehensive-013.webp -OK. de3154f1 test/3pdata/webpsuite/vp80-00-comprehensive-014.webp -OK. 6291f264 test/3pdata/webpsuite/vp80-00-comprehensive-015.webp +OK. 37bf6310 test/3pdata/webpsuite/vp80-00-comprehensive-001.webp +OK. d87c0135 test/3pdata/webpsuite/vp80-00-comprehensive-002.webp +OK. 53f2a4c8 test/3pdata/webpsuite/vp80-00-comprehensive-003.webp +OK. 37bf6310 test/3pdata/webpsuite/vp80-00-comprehensive-004.webp +OK. cc470087 test/3pdata/webpsuite/vp80-00-comprehensive-005.webp +OK. 22f2bc85 test/3pdata/webpsuite/vp80-00-comprehensive-006.webp +OK. 861d5c90 test/3pdata/webpsuite/vp80-00-comprehensive-007.webp +OK. ec6e76ae test/3pdata/webpsuite/vp80-00-comprehensive-008.webp +OK. 24899b34 test/3pdata/webpsuite/vp80-00-comprehensive-009.webp +OK. b265598f test/3pdata/webpsuite/vp80-00-comprehensive-010.webp +OK. 37bf6310 test/3pdata/webpsuite/vp80-00-comprehensive-011.webp +OK. dafaf33d test/3pdata/webpsuite/vp80-00-comprehensive-012.webp +OK. ca91f611 test/3pdata/webpsuite/vp80-00-comprehensive-013.webp +OK. 11382a93 test/3pdata/webpsuite/vp80-00-comprehensive-014.webp +OK. 85b7887a test/3pdata/webpsuite/vp80-00-comprehensive-015.webp OK. 3346ef2b test/3pdata/webpsuite/vp80-00-comprehensive-016.webp OK. 3346ef2b test/3pdata/webpsuite/vp80-00-comprehensive-017.webp -OK. 34a0adbb test/3pdata/webpsuite/vp80-01-intra-1400.webp -OK. 2cda6f62 test/3pdata/webpsuite/vp80-01-intra-1411.webp -OK. a321721b test/3pdata/webpsuite/vp80-01-intra-1416.webp -OK. 754a4ff8 test/3pdata/webpsuite/vp80-01-intra-1417.webp -OK. 34a0adbb test/3pdata/webpsuite/vp80-02-inter-1402.webp -OK. 2cda6f62 test/3pdata/webpsuite/vp80-02-inter-1412.webp -OK. 0bb72bca test/3pdata/webpsuite/vp80-02-inter-1418.webp -OK. 93739a20 test/3pdata/webpsuite/vp80-02-inter-1424.webp -OK. 34a0adbb test/3pdata/webpsuite/vp80-03-segmentation-1401.webp -OK. 34a0adbb test/3pdata/webpsuite/vp80-03-segmentation-1403.webp -OK. aaea276b test/3pdata/webpsuite/vp80-03-segmentation-1407.webp -OK. aaea276b test/3pdata/webpsuite/vp80-03-segmentation-1408.webp -OK. aaea276b test/3pdata/webpsuite/vp80-03-segmentation-1409.webp -OK. aaea276b test/3pdata/webpsuite/vp80-03-segmentation-1410.webp -OK. 2cda6f62 test/3pdata/webpsuite/vp80-03-segmentation-1413.webp -OK. 65fb3f68 test/3pdata/webpsuite/vp80-03-segmentation-1414.webp -OK. 65fb3f68 test/3pdata/webpsuite/vp80-03-segmentation-1415.webp -OK. 3819b4d7 test/3pdata/webpsuite/vp80-03-segmentation-1425.webp -OK. 981e1d2e test/3pdata/webpsuite/vp80-03-segmentation-1426.webp -OK. 57780055 test/3pdata/webpsuite/vp80-03-segmentation-1427.webp -OK. caf44365 test/3pdata/webpsuite/vp80-03-segmentation-1432.webp -OK. 17d6af96 test/3pdata/webpsuite/vp80-03-segmentation-1435.webp -OK. 792cc4dc test/3pdata/webpsuite/vp80-03-segmentation-1436.webp -OK. a0c109d5 test/3pdata/webpsuite/vp80-03-segmentation-1437.webp -OK. 88f3ed22 test/3pdata/webpsuite/vp80-03-segmentation-1441.webp -OK. ad7b1ced test/3pdata/webpsuite/vp80-03-segmentation-1442.webp -OK. 34a0adbb test/3pdata/webpsuite/vp80-04-partitions-1404.webp -OK. 34a0adbb test/3pdata/webpsuite/vp80-04-partitions-1405.webp -OK. 34a0adbb test/3pdata/webpsuite/vp80-04-partitions-1406.webp -OK. deb943fc test/3pdata/webpsuite/vp80-05-sharpness-1428.webp -OK. eaffae2b test/3pdata/webpsuite/vp80-05-sharpness-1429.webp +OK. 4442b90a test/3pdata/webpsuite/vp80-01-intra-1400.webp +OK. 20ba1cc0 test/3pdata/webpsuite/vp80-01-intra-1411.webp +OK. 6dafc49a test/3pdata/webpsuite/vp80-01-intra-1416.webp +OK. bfd3e3e3 test/3pdata/webpsuite/vp80-01-intra-1417.webp +OK. 4442b90a test/3pdata/webpsuite/vp80-02-inter-1402.webp +OK. 20ba1cc0 test/3pdata/webpsuite/vp80-02-inter-1412.webp +OK. 18734e4a test/3pdata/webpsuite/vp80-02-inter-1418.webp +OK. de941f26 test/3pdata/webpsuite/vp80-02-inter-1424.webp +OK. 4442b90a test/3pdata/webpsuite/vp80-03-segmentation-1401.webp +OK. 4442b90a test/3pdata/webpsuite/vp80-03-segmentation-1403.webp +OK. 29b4a1ef test/3pdata/webpsuite/vp80-03-segmentation-1407.webp +OK. 29b4a1ef test/3pdata/webpsuite/vp80-03-segmentation-1408.webp +OK. 29b4a1ef test/3pdata/webpsuite/vp80-03-segmentation-1409.webp +OK. 29b4a1ef test/3pdata/webpsuite/vp80-03-segmentation-1410.webp +OK. 20ba1cc0 test/3pdata/webpsuite/vp80-03-segmentation-1413.webp +OK. 8463f4cd test/3pdata/webpsuite/vp80-03-segmentation-1414.webp +OK. 8463f4cd test/3pdata/webpsuite/vp80-03-segmentation-1415.webp +OK. 002fde0c test/3pdata/webpsuite/vp80-03-segmentation-1425.webp +OK. 57573719 test/3pdata/webpsuite/vp80-03-segmentation-1426.webp +OK. 13241231 test/3pdata/webpsuite/vp80-03-segmentation-1427.webp +OK. dab26697 test/3pdata/webpsuite/vp80-03-segmentation-1432.webp +OK. c3ef4215 test/3pdata/webpsuite/vp80-03-segmentation-1435.webp +OK. c5120084 test/3pdata/webpsuite/vp80-03-segmentation-1436.webp +OK. bcc51ad6 test/3pdata/webpsuite/vp80-03-segmentation-1437.webp +OK. f1372752 test/3pdata/webpsuite/vp80-03-segmentation-1441.webp +OK. cf14a320 test/3pdata/webpsuite/vp80-03-segmentation-1442.webp +OK. 4442b90a test/3pdata/webpsuite/vp80-04-partitions-1404.webp +OK. 4442b90a test/3pdata/webpsuite/vp80-04-partitions-1405.webp +OK. 4442b90a test/3pdata/webpsuite/vp80-04-partitions-1406.webp +OK. d6068a35 test/3pdata/webpsuite/vp80-05-sharpness-1428.webp +OK. 84c592b7 test/3pdata/webpsuite/vp80-05-sharpness-1429.webp OK. 88ca32c7 test/3pdata/webpsuite/vp80-05-sharpness-1430.webp -OK. 386ff4b2 test/3pdata/webpsuite/vp80-05-sharpness-1431.webp -OK. 792cc4dc test/3pdata/webpsuite/vp80-05-sharpness-1433.webp -OK. 8220ff9f test/3pdata/webpsuite/vp80-05-sharpness-1434.webp -OK. 2b2a6b87 test/3pdata/webpsuite/vp80-05-sharpness-1438.webp -OK. 7342903f test/3pdata/webpsuite/vp80-05-sharpness-1439.webp -OK. 792cc4dc test/3pdata/webpsuite/vp80-05-sharpness-1440.webp -OK. a5c713d9 test/3pdata/webpsuite/vp80-05-sharpness-1443.webp +OK. bfa52a04 test/3pdata/webpsuite/vp80-05-sharpness-1431.webp +OK. c5120084 test/3pdata/webpsuite/vp80-05-sharpness-1433.webp +OK. 5941d626 test/3pdata/webpsuite/vp80-05-sharpness-1434.webp +OK. 2e9ca716 test/3pdata/webpsuite/vp80-05-sharpness-1438.webp +OK. 85784028 test/3pdata/webpsuite/vp80-05-sharpness-1439.webp +OK. c5120084 test/3pdata/webpsuite/vp80-05-sharpness-1440.webp +OK. 5e488473 test/3pdata/webpsuite/vp80-05-sharpness-1443.webp
diff --git a/test/c/mimiclib/webp.c b/test/c/mimiclib/webp.c index 17389ae..2899bd3 100644 --- a/test/c/mimiclib/webp.c +++ b/test/c/mimiclib/webp.c
@@ -74,7 +74,6 @@ return "mimic_webp_decode: unsupported pixfmt"; } - config.options.no_fancy_upsampling = 1; // TODO: remove for best mimicry. config.output.colorspace = MODE_BGRA; config.output.width = w; config.output.height = h;
diff --git a/test/nia-checksums-of-data.txt b/test/nia-checksums-of-data.txt index aa33d33..6ddb13d 100644 --- a/test/nia-checksums-of-data.txt +++ b/test/nia-checksums-of-data.txt
@@ -65,7 +65,7 @@ OK. 5670f263 test/data/bricks-color.etc2.pkm OK. 72a1f9cc test/data/bricks-color.jpeg OK. 076cb375 test/data/bricks-color.lossless.webp -OK. 3466b80b test/data/bricks-color.lossy.webp +OK. 25a84d5d 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 @@ -102,26 +102,26 @@ OK. c18b3d5a test/data/harvesters.gif OK. f217df74 test/data/harvesters.jpeg OK. 030f5a48 test/data/harvesters.lossless.webp -OK. 60bc9e08 test/data/harvesters.lossy.webp +OK. 9fcd525c test/data/harvesters.lossy.webp OK. 030f5a48 test/data/harvesters.png OK. e776c90f test/data/hat.bmp OK. 6dcba6a4 test/data/hat.gif OK. 2298f3ca test/data/hat.jpeg OK. e776c90f test/data/hat.lossless.webp -OK. be7f0169 test/data/hat.lossy.webp +OK. 291ba102 test/data/hat.lossy.webp OK. e776c90f test/data/hat.png OK. d30bfe5d test/data/hat.wbmp 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. 09bbaab0 test/data/hibiscus.primitive.lossy.webp +OK. 05ebd4c2 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. 6bbe1ed2 test/data/hibiscus.regular.lossy.webp +OK. 6f151b3e 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 @@ -130,7 +130,7 @@ BAD 3feec847 test/data/hippopotamus.interlaced.truncated.png OK. 96bdbbb3 test/data/hippopotamus.jpeg OK. dcbb225a test/data/hippopotamus.lossless.webp -OK. 66ccbffa test/data/hippopotamus.lossy.webp +OK. 56cf6ae1 test/data/hippopotamus.lossy.webp OK. 2535637e test/data/hippopotamus.masked-with-muybridge.etc2.bgra-binary.pkm OK. 720180ee test/data/hippopotamus.masked-with-muybridge.etc2.bgra-nonpremul.pkm OK. d3bbed27 test/data/hippopotamus.masked-with-muybridge.gif @@ -146,18 +146,18 @@ 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. 457ca659 test/data/mona-lisa.21x32.q0.lossy.webp -OK. 4503912c test/data/mona-lisa.21x32.q25.lossy.webp +OK. c2c97129 test/data/mona-lisa.21x32.q0.lossy.webp +OK. c9d3bcd2 test/data/mona-lisa.21x32.q25.lossy.webp OK. 0a22e689 test/data/mona-lisa.21x32.q50.jpeg -OK. 8ae1312b test/data/mona-lisa.21x32.q50.lossy.webp +OK. 49f54fd4 test/data/mona-lisa.21x32.q50.lossy.webp OK. 059ecb80 test/data/mona-lisa.21x32.q90.jpeg -OK. 567c8999 test/data/mona-lisa.21x32.q90.lossy.webp +OK. 8396e4f6 test/data/mona-lisa.21x32.q90.lossy.webp OK. 012ce4cf test/data/mona-lisa.21x32.qoi OK. 12fc69a5 test/data/mona-lisa.21x32.th OK. 2dccfe56 test/data/muybridge-frame-000.wbmp OK. db2733f5 test/data/muybridge.apng OK. db2733f5 test/data/muybridge.gif -OK. 6e0d715b test/data/peacock.24x19.lossy.webp +OK. 773c8dda test/data/peacock.24x19.lossy.webp OK. ad130b74 test/data/peacock.24x19.png OK. d42a13cd test/data/peacock.default.jpeg OK. c8a50351 test/data/peacock.default.truncated.decoded-by-djpeg.png