diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 1d9bfe33..58b989aa 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -84261,7 +84261,7 @@ wuffs_vp8__decoder__swizzle_one_row_of_macroblocks( 1u, 1u, 0u, - 0u, + ((uint8_t)(1u)), false, 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 44f782d1..06cf996f 100644 --- a/std/vp8/decode_macroblocks.wuffs +++ b/std/vp8/decode_macroblocks.wuffs @@ -424,7 +424,7 @@ pri func decoder.swizzle_one_row_of_macroblocks!( v1: 1, v2: 1, v3: 0, - ycc_model: 0, // TODO. + ycc_model: base.YCC_MODEL__BT_601_STUDIO_RANGE as base.u8, triangle_filter_for_2to1: false, 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 421d66c0..9e6bc9f0 100644 --- a/test/3pdata/nia-checksums-of-blinksuite.txt +++ b/test/3pdata/nia-checksums-of-blinksuite.txt @@ -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. 623e1a0c test/3pdata/blinksuite/large.webp +OK. 8f798e8b 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. 091ebefc test/3pdata/blinksuite/test.webp +OK. 631f6a02 test/3pdata/blinksuite/test.webp OK. 19d3a207 test/3pdata/blinksuite/test3.webp BAD 1dfa35c6 test/3pdata/blinksuite/truncated2.webp -OK. bc30d1ff test/3pdata/blinksuite/webp-color-no-profile-lossy.webp +OK. a66e5687 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 18946a51..7f04d3ed 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. d35dede2 test/3pdata/webpsuite/bryce.webp -OK. e707dda8 test/3pdata/webpsuite/bug3.webp +OK. 695fb9c9 test/3pdata/webpsuite/bryce.webp +OK. a07d001c 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 @@ 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. 0f4f52f9 test/3pdata/webpsuite/lossy_extreme_probabilities.webp -OK. 19f4f01c test/3pdata/webpsuite/lossy_q0_f100.webp +OK. 3a23e407 test/3pdata/webpsuite/lossy_extreme_probabilities.webp +OK. ac8caef7 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. 3962d4f8 test/3pdata/webpsuite/segment01.webp -OK. 57f4200f test/3pdata/webpsuite/segment02.webp -OK. a0b740dd test/3pdata/webpsuite/segment03.webp -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. 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. 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. 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 -OK. 94c57a08 test/3pdata/webpsuite/vp80-01-intra-1411.webp -OK. be24b089 test/3pdata/webpsuite/vp80-01-intra-1416.webp -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. 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 -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. 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. 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. 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. 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. 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. 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 +OK. e58f2013 test/3pdata/webpsuite/segment01.webp +OK. 931e5bb2 test/3pdata/webpsuite/segment02.webp +OK. c42afa6d 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. 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. 85cbf113 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. 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. 6883fbc5 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. 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 diff --git a/test/c/std/webp.c b/test/c/std/webp.c index 5e78b7e2..ed7e4fc7 100644 --- a/test/c/std/webp.c +++ b/test/c/std/webp.c @@ -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, 0xFF123168); + "test/data/bricks-color.lossy.webp", 0, SIZE_MAX, 160, 120, 0xFF032665); } 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 != 0xFF2D1827) { - RETURN_FAIL("last_pixel: have 0x%" PRIX32 ", want 0xFF2D1827", last_pixel); + if (last_pixel != 0xFF210A1B) { + RETURN_FAIL("last_pixel: have 0x%" PRIX32 ", want 0xFF210A1B", last_pixel); } return NULL; @@ -270,6 +270,36 @@ test_mimic_webp_lossless_decode_image_4002k_24bpp() { return do_test_mimic_webp_decode("test/data/harvesters.lossless.webp"); } +const char* // +test_mimic_webp_lossy_decode_image_19k_8bpp() { + CHECK_FOCUS(__func__); + return do_test_mimic_webp_decode("test/data/bricks-gray.lossy.webp"); +} + +const char* // +test_mimic_webp_lossy_decode_image_40k_24bpp() { + CHECK_FOCUS(__func__); + return do_test_mimic_webp_decode("test/data/hat.lossy.webp"); +} + +const char* // +test_mimic_webp_lossy_decode_image_77k_24bpp() { + CHECK_FOCUS(__func__); + return do_test_mimic_webp_decode("test/data/bricks-color.lossy.webp"); +} + +const char* // +test_mimic_webp_lossy_decode_image_552k_32bpp() { + CHECK_FOCUS(__func__); + return do_test_mimic_webp_decode("test/data/hibiscus.primitive.lossy.webp"); +} + +const char* // +test_mimic_webp_lossy_decode_image_4002k_24bpp() { + CHECK_FOCUS(__func__); + return do_test_mimic_webp_decode("test/data/harvesters.lossy.webp"); +} + #endif // WUFFS_MIMIC // ---------------- WebP Benches @@ -325,6 +355,57 @@ bench_wuffs_webp_lossless_decode_image_4002k_24bpp() { NULL, 0, "test/data/harvesters.lossless.webp", 0, SIZE_MAX, 1); } +const char* // +bench_wuffs_webp_lossy_decode_image_19k_8bpp() { + CHECK_FOCUS(__func__); + return do_bench_image_decode( + &wuffs_webp_decode, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, + wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__Y), NULL, 0, + "test/data/bricks-gray.lossy.webp", 0, SIZE_MAX, 50); +} + +const char* // +bench_wuffs_webp_lossy_decode_image_40k_24bpp() { + CHECK_FOCUS(__func__); + return do_bench_image_decode( + &wuffs_webp_decode, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, + wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), + NULL, 0, "test/data/hat.lossy.webp", 0, SIZE_MAX, 30); +} + +const char* // +bench_wuffs_webp_lossy_decode_image_77k_24bpp() { + CHECK_FOCUS(__func__); + return do_bench_image_decode( + &wuffs_webp_decode, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, + wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), + NULL, 0, "test/data/bricks-color.lossy.webp", 0, SIZE_MAX, 50); +} + +const char* // +bench_wuffs_webp_lossy_decode_image_552k_32bpp() { + uint32_t q = WUFFS_BASE__QUIRK_IGNORE_CHECKSUM; + CHECK_FOCUS(__func__); + return do_bench_image_decode( + &wuffs_webp_decode, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, + wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), + &q, 1, "test/data/hibiscus.primitive.lossy.webp", 0, SIZE_MAX, 4); +} + +const char* // +bench_wuffs_webp_lossy_decode_image_4002k_24bpp() { + CHECK_FOCUS(__func__); + return do_bench_image_decode( + &wuffs_webp_decode, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, + wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), + NULL, 0, "test/data/harvesters.lossy.webp", 0, SIZE_MAX, 1); +} + // ---------------- Mimic Benches #ifdef WUFFS_MIMIC @@ -380,6 +461,57 @@ bench_mimic_webp_lossless_decode_image_4002k_24bpp() { NULL, 0, "test/data/harvesters.lossless.webp", 0, SIZE_MAX, 1); } +const char* // +bench_mimic_webp_lossy_decode_image_19k_8bpp() { + CHECK_FOCUS(__func__); + return do_bench_image_decode( + &mimic_webp_decode, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, + wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__Y), NULL, 0, + "test/data/bricks-gray.lossy.webp", 0, SIZE_MAX, 50); +} + +const char* // +bench_mimic_webp_lossy_decode_image_40k_24bpp() { + CHECK_FOCUS(__func__); + return do_bench_image_decode( + &mimic_webp_decode, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, + wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), + NULL, 0, "test/data/hat.lossy.webp", 0, SIZE_MAX, 30); +} + +const char* // +bench_mimic_webp_lossy_decode_image_77k_24bpp() { + CHECK_FOCUS(__func__); + return do_bench_image_decode( + &mimic_webp_decode, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, + wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), + NULL, 0, "test/data/bricks-color.lossy.webp", 0, SIZE_MAX, 50); +} + +const char* // +bench_mimic_webp_lossy_decode_image_552k_32bpp() { + uint32_t q = WUFFS_BASE__QUIRK_IGNORE_CHECKSUM; + CHECK_FOCUS(__func__); + return do_bench_image_decode( + &mimic_webp_decode, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, + wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), + &q, 1, "test/data/hibiscus.primitive.lossy.webp", 0, SIZE_MAX, 4); +} + +const char* // +bench_mimic_webp_lossy_decode_image_4002k_24bpp() { + CHECK_FOCUS(__func__); + return do_bench_image_decode( + &mimic_webp_decode, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, + wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), + NULL, 0, "test/data/harvesters.lossy.webp", 0, SIZE_MAX, 1); +} + #endif // WUFFS_MIMIC // ---------------- Manifest @@ -397,6 +529,11 @@ proc g_tests[] = { test_mimic_webp_lossless_decode_image_77k_8bpp, test_mimic_webp_lossless_decode_image_552k_32bpp, test_mimic_webp_lossless_decode_image_4002k_24bpp, + test_mimic_webp_lossy_decode_image_19k_8bpp, +// test_mimic_webp_lossy_decode_image_40k_24bpp, +// test_mimic_webp_lossy_decode_image_77k_24bpp, +// test_mimic_webp_lossy_decode_image_552k_32bpp, +// test_mimic_webp_lossy_decode_image_4002k_24bpp, #endif // WUFFS_MIMIC @@ -410,6 +547,11 @@ proc g_benches[] = { bench_wuffs_webp_lossless_decode_image_77k_8bpp, bench_wuffs_webp_lossless_decode_image_552k_32bpp, bench_wuffs_webp_lossless_decode_image_4002k_24bpp, + bench_wuffs_webp_lossy_decode_image_19k_8bpp, + bench_wuffs_webp_lossy_decode_image_40k_24bpp, + bench_wuffs_webp_lossy_decode_image_77k_24bpp, + bench_wuffs_webp_lossy_decode_image_552k_32bpp, + bench_wuffs_webp_lossy_decode_image_4002k_24bpp, #ifdef WUFFS_MIMIC @@ -418,6 +560,11 @@ proc g_benches[] = { bench_mimic_webp_lossless_decode_image_77k_8bpp, bench_mimic_webp_lossless_decode_image_552k_32bpp, bench_mimic_webp_lossless_decode_image_4002k_24bpp, + bench_mimic_webp_lossy_decode_image_19k_8bpp, + bench_mimic_webp_lossy_decode_image_40k_24bpp, + bench_mimic_webp_lossy_decode_image_77k_24bpp, + bench_mimic_webp_lossy_decode_image_552k_32bpp, + bench_mimic_webp_lossy_decode_image_4002k_24bpp, #endif // WUFFS_MIMIC diff --git a/test/nia-checksums-of-data.txt b/test/nia-checksums-of-data.txt index 47e18ddf..27cba696 100644 --- a/test/nia-checksums-of-data.txt +++ b/test/nia-checksums-of-data.txt @@ -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. e6fa7dde test/data/bricks-color.lossy.webp +OK. 3466b80b 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. 21bfc968 test/data/bricks-gray.lossy.webp +OK. cdba0ec1 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,26 +102,26 @@ 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. 5a00fc85 test/data/harvesters.lossy.webp +OK. 60bc9e08 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. c1de0598 test/data/hat.lossy.webp +OK. be7f0169 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. 5398c9d7 test/data/hibiscus.primitive.lossy.webp +OK. 9f1315c7 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. cc05ca96 test/data/hibiscus.regular.lossy.webp +OK. 2b5fe795 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 c3c4bd65 test/data/hippopotamus.interlaced.truncated.gif BAD 3feec847 test/data/hippopotamus.interlaced.truncated.png OK. 96bdbbb3 test/data/hippopotamus.jpeg OK. dcbb225a test/data/hippopotamus.lossless.webp -OK. 464cd736 test/data/hippopotamus.lossy.webp +OK. 66ccbffa 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,12 +146,12 @@ 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. f0a78a8b test/data/mona-lisa.21x32.q0.lossy.webp -OK. 1b56acf3 test/data/mona-lisa.21x32.q25.lossy.webp +OK. 457ca659 test/data/mona-lisa.21x32.q0.lossy.webp +OK. 4503912c 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 +OK. 8ae1312b test/data/mona-lisa.21x32.q50.lossy.webp OK. 059ecb80 test/data/mona-lisa.21x32.q90.jpeg -OK. c75e9677 test/data/mona-lisa.21x32.q90.lossy.webp +OK. 567c8999 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 @@ -191,7 +191,7 @@ OK. bf7e8c96 test/data/pjw-thumbnail.bmp OK. bf7e8c96 test/data/pjw-thumbnail.gif OK. 7c67a37f test/data/pjw-thumbnail.jpeg OK. bf7e8c96 test/data/pjw-thumbnail.lossless.webp -OK. cca25579 test/data/pjw-thumbnail.lossy.webp +OK. cf6f520e test/data/pjw-thumbnail.lossy.webp OK. bf7e8c96 test/data/pjw-thumbnail.png OK. 38cb4cbf test/data/red-blue-gradient.dcip3d65-no-chrm-no-gama.png OK. 38cb4cbf test/data/red-blue-gradient.gamma1dot0.png