diff --git a/test/c/mimiclib/gif.c b/test/c/mimiclib/gif.c index 2cb09e11..7511cf2b 100644 --- a/test/c/mimiclib/gif.c +++ b/test/c/mimiclib/gif.c @@ -35,6 +35,8 @@ mimic_gif_decode(uint64_t* n_bytes_out, wuffs_base__io_buffer* dst, uint32_t wuffs_initialize_flags, wuffs_base__pixel_format pixfmt, + uint32_t* quirks_ptr, + size_t quirks_len, wuffs_base__io_buffer* src) { const char* ret = NULL; diff --git a/test/c/mimiclib/png.c b/test/c/mimiclib/png.c index f96b6159..5797c7ca 100644 --- a/test/c/mimiclib/png.c +++ b/test/c/mimiclib/png.c @@ -19,6 +19,8 @@ mimic_png_decode(uint64_t* n_bytes_out, wuffs_base__io_buffer* dst, uint32_t wuffs_initialize_flags, wuffs_base__pixel_format pixfmt, + uint32_t* quirks_ptr, + size_t quirks_len, wuffs_base__io_buffer* src) { wuffs_base__io_buffer dst_fallback = wuffs_base__slice_u8__writer(g_mimiclib_scratch_slice_u8); diff --git a/test/c/std/bmp.c b/test/c/std/bmp.c index 3eeb6526..1a8cc74a 100644 --- a/test/c/std/bmp.c +++ b/test/c/std/bmp.c @@ -74,6 +74,8 @@ wuffs_bmp_decode(uint64_t* n_bytes_out, wuffs_base__io_buffer* dst, uint32_t wuffs_initialize_flags, wuffs_base__pixel_format pixfmt, + uint32_t* quirks_ptr, + size_t quirks_len, wuffs_base__io_buffer* src) { wuffs_bmp__decoder dec; CHECK_STATUS("initialize", @@ -81,7 +83,7 @@ wuffs_bmp_decode(uint64_t* n_bytes_out, wuffs_initialize_flags)); return do_run__wuffs_base__image_decoder( wuffs_bmp__decoder__upcast_as__wuffs_base__image_decoder(&dec), - n_bytes_out, dst, pixfmt, src); + n_bytes_out, dst, pixfmt, quirks_ptr, quirks_len, src); } // -------- @@ -193,7 +195,7 @@ bench_wuffs_bmp_decode_40k() { return do_bench_image_decode( &wuffs_bmp_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), - "test/data/hat.bmp", 0, SIZE_MAX, 1000); + NULL, 0, "test/data/hat.bmp", 0, SIZE_MAX, 1000); } // ---------------- Mimic Benches diff --git a/test/c/std/gif.c b/test/c/std/gif.c index 319d298a..6880eece 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -187,6 +187,8 @@ wuffs_gif_decode(uint64_t* n_bytes_out, wuffs_base__io_buffer* dst, uint32_t wuffs_initialize_flags, wuffs_base__pixel_format pixfmt, + uint32_t* quirks_ptr, + size_t quirks_len, wuffs_base__io_buffer* src) { wuffs_gif__decoder dec; CHECK_STATUS("initialize", @@ -194,7 +196,7 @@ wuffs_gif_decode(uint64_t* n_bytes_out, wuffs_initialize_flags)); return do_run__wuffs_base__image_decoder( wuffs_gif__decoder__upcast_as__wuffs_base__image_decoder(&dec), - n_bytes_out, dst, pixfmt, src); + n_bytes_out, dst, pixfmt, quirks_ptr, quirks_len, src); } const char* // @@ -2004,7 +2006,7 @@ do_test_mimic_gif_decode(const char* filename) { wuffs_gif_decode(NULL, &have, WUFFS_INITIALIZE__DEFAULT_OPTIONS, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - &src)); + NULL, 0, &src)); src.meta.ri = 0; wuffs_base__io_buffer want = ((wuffs_base__io_buffer){ @@ -2014,7 +2016,7 @@ do_test_mimic_gif_decode(const char* filename) { mimic_gif_decode(NULL, &want, WUFFS_INITIALIZE__DEFAULT_OPTIONS, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - &src)); + NULL, 0, &src)); CHECK_STRING(check_io_buffers_equal("", &have, &want)); @@ -2113,7 +2115,7 @@ bench_wuffs_gif_decode_1k_bw() { wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/pjw-thumbnail.gif", 0, SIZE_MAX, 2000); + NULL, 0, "test/data/pjw-thumbnail.gif", 0, SIZE_MAX, 2000); } const char* // @@ -2123,7 +2125,7 @@ bench_wuffs_gif_decode_1k_color_full_init() { wuffs_gif_decode, WUFFS_INITIALIZE__DEFAULT_OPTIONS, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/hippopotamus.regular.gif", 0, SIZE_MAX, 1000); + NULL, 0, "test/data/hippopotamus.regular.gif", 0, SIZE_MAX, 1000); } const char* // @@ -2133,7 +2135,7 @@ bench_wuffs_gif_decode_1k_color_part_init() { wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/hippopotamus.regular.gif", 0, SIZE_MAX, 1000); + NULL, 0, "test/data/hippopotamus.regular.gif", 0, SIZE_MAX, 1000); } const char* // @@ -2142,7 +2144,7 @@ bench_wuffs_gif_decode_10k_bgra() { return do_bench_image_decode( wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), - "test/data/hat.gif", 0, SIZE_MAX, 100); + NULL, 0, "test/data/hat.gif", 0, SIZE_MAX, 100); } const char* // @@ -2152,7 +2154,7 @@ bench_wuffs_gif_decode_10k_indexed() { wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/hat.gif", 0, SIZE_MAX, 100); + NULL, 0, "test/data/hat.gif", 0, SIZE_MAX, 100); } const char* // @@ -2162,7 +2164,7 @@ bench_wuffs_gif_decode_20k() { wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/bricks-gray.gif", 0, SIZE_MAX, 50); + NULL, 0, "test/data/bricks-gray.gif", 0, SIZE_MAX, 50); } const char* // @@ -2172,7 +2174,7 @@ bench_wuffs_gif_decode_100k_artificial() { wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/hibiscus.primitive.gif", 0, SIZE_MAX, 15); + NULL, 0, "test/data/hibiscus.primitive.gif", 0, SIZE_MAX, 15); } const char* // @@ -2182,7 +2184,7 @@ bench_wuffs_gif_decode_100k_realistic() { wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/hibiscus.regular.gif", 0, SIZE_MAX, 10); + NULL, 0, "test/data/hibiscus.regular.gif", 0, SIZE_MAX, 10); } const char* // @@ -2192,7 +2194,7 @@ bench_wuffs_gif_decode_1000k_full_init() { wuffs_gif_decode, WUFFS_INITIALIZE__DEFAULT_OPTIONS, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/harvesters.gif", 0, SIZE_MAX, 1); + NULL, 0, "test/data/harvesters.gif", 0, SIZE_MAX, 1); } const char* // @@ -2202,7 +2204,7 @@ bench_wuffs_gif_decode_1000k_part_init() { wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/harvesters.gif", 0, SIZE_MAX, 1); + NULL, 0, "test/data/harvesters.gif", 0, SIZE_MAX, 1); } const char* // @@ -2212,7 +2214,7 @@ bench_wuffs_gif_decode_anim_screencap() { wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/gifplayer-muybridge.gif", 0, SIZE_MAX, 1); + NULL, 0, "test/data/gifplayer-muybridge.gif", 0, SIZE_MAX, 1); } // ---------------- Mimic Benches @@ -2226,7 +2228,7 @@ bench_mimic_gif_decode_1k_bw() { mimic_gif_decode, 0, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/pjw-thumbnail.gif", 0, SIZE_MAX, 2000); + NULL, 0, "test/data/pjw-thumbnail.gif", 0, SIZE_MAX, 2000); } const char* // @@ -2236,7 +2238,7 @@ bench_mimic_gif_decode_1k_color() { mimic_gif_decode, 0, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/hippopotamus.regular.gif", 0, SIZE_MAX, 1000); + NULL, 0, "test/data/hippopotamus.regular.gif", 0, SIZE_MAX, 1000); } const char* // @@ -2246,7 +2248,7 @@ bench_mimic_gif_decode_10k_indexed() { mimic_gif_decode, 0, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/hat.gif", 0, SIZE_MAX, 100); + NULL, 0, "test/data/hat.gif", 0, SIZE_MAX, 100); } const char* // @@ -2256,7 +2258,7 @@ bench_mimic_gif_decode_20k() { mimic_gif_decode, 0, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/bricks-gray.gif", 0, SIZE_MAX, 50); + NULL, 0, "test/data/bricks-gray.gif", 0, SIZE_MAX, 50); } const char* // @@ -2266,7 +2268,7 @@ bench_mimic_gif_decode_100k_artificial() { mimic_gif_decode, 0, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/hibiscus.primitive.gif", 0, SIZE_MAX, 15); + NULL, 0, "test/data/hibiscus.primitive.gif", 0, SIZE_MAX, 15); } const char* // @@ -2276,7 +2278,7 @@ bench_mimic_gif_decode_100k_realistic() { mimic_gif_decode, 0, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/hibiscus.regular.gif", 0, SIZE_MAX, 10); + NULL, 0, "test/data/hibiscus.regular.gif", 0, SIZE_MAX, 10); } const char* // @@ -2286,7 +2288,7 @@ bench_mimic_gif_decode_1000k() { mimic_gif_decode, 0, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/harvesters.gif", 0, SIZE_MAX, 1); + NULL, 0, "test/data/harvesters.gif", 0, SIZE_MAX, 1); } const char* // @@ -2296,7 +2298,7 @@ bench_mimic_gif_decode_anim_screencap() { mimic_gif_decode, 0, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY), - "test/data/gifplayer-muybridge.gif", 0, SIZE_MAX, 1); + NULL, 0, "test/data/gifplayer-muybridge.gif", 0, SIZE_MAX, 1); } #endif // WUFFS_MIMIC diff --git a/test/c/std/png.c b/test/c/std/png.c index 863a84b8..e81cf114 100644 --- a/test/c/std/png.c +++ b/test/c/std/png.c @@ -78,6 +78,8 @@ wuffs_png_decode(uint64_t* n_bytes_out, wuffs_base__io_buffer* dst, uint32_t wuffs_initialize_flags, wuffs_base__pixel_format pixfmt, + uint32_t* quirks_ptr, + size_t quirks_len, wuffs_base__io_buffer* src) { wuffs_png__decoder dec; CHECK_STATUS("initialize", @@ -85,7 +87,7 @@ wuffs_png_decode(uint64_t* n_bytes_out, wuffs_initialize_flags)); return do_run__wuffs_base__image_decoder( wuffs_png__decoder__upcast_as__wuffs_base__image_decoder(&dec), - n_bytes_out, dst, pixfmt, src); + n_bytes_out, dst, pixfmt, quirks_ptr, quirks_len, src); } const char* // @@ -94,6 +96,8 @@ do_test_xxxxx_png_decode_bad_crc32_checksum_critical( wuffs_base__io_buffer* dst, uint32_t wuffs_initialize_flags, wuffs_base__pixel_format pixfmt, + uint32_t* quirks_ptr, + size_t quirks_len, wuffs_base__io_buffer* src)) { const char* test_cases[] = { // Change a byte in the IHDR CRC-32 checksum. @@ -121,7 +125,7 @@ do_test_xxxxx_png_decode_bad_crc32_checksum_critical( if (NULL == (*decode_func)(NULL, &have, WUFFS_INITIALIZE__DEFAULT_OPTIONS, wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), - &src)) { + NULL, 0, &src)) { RETURN_FAIL("tc=%d (filename=\"%s\"): bad checksum not rejected", tc, test_cases[tc]); } @@ -480,7 +484,7 @@ do_test_mimic_png_decode(const char* filename) { CHECK_STRING(wuffs_png_decode( NULL, &have, WUFFS_INITIALIZE__DEFAULT_OPTIONS, wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), - &src)); + NULL, 0, &src)); src.meta.ri = 0; wuffs_base__io_buffer want = ((wuffs_base__io_buffer){ @@ -489,7 +493,7 @@ do_test_mimic_png_decode(const char* filename) { CHECK_STRING(mimic_png_decode( NULL, &want, WUFFS_INITIALIZE__DEFAULT_OPTIONS, wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), - &src)); + NULL, 0, &src)); return check_io_buffers_equal("", &have, &want); } @@ -560,7 +564,7 @@ bench_wuffs_png_decode_19k_8bpp() { // replacing the "gAMA" with the nonsense "hAMA". ASCII 'g' is 0x67. return do_bench_image_decode( &wuffs_png_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, - wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__Y), + wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__Y), NULL, 0, "test/data/bricks-gray.no-ancillary.png", 0, SIZE_MAX, 50); } @@ -570,7 +574,7 @@ bench_wuffs_png_decode_40k_24bpp() { return do_bench_image_decode( &wuffs_png_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), - "test/data/hat.png", 0, SIZE_MAX, 30); + NULL, 0, "test/data/hat.png", 0, SIZE_MAX, 30); } const char* // @@ -579,7 +583,7 @@ bench_wuffs_png_decode_77k_8bpp() { return do_bench_image_decode( &wuffs_png_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), - "test/data/bricks-dither.png", 0, SIZE_MAX, 50); + NULL, 0, "test/data/bricks-dither.png", 0, SIZE_MAX, 50); } const char* // @@ -588,7 +592,7 @@ bench_wuffs_png_decode_552k_32bpp() { return do_bench_image_decode( &wuffs_png_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), - "test/data/hibiscus.primitive.png", 0, SIZE_MAX, 4); + NULL, 0, "test/data/hibiscus.primitive.png", 0, SIZE_MAX, 4); } const char* // @@ -597,7 +601,7 @@ bench_wuffs_png_decode_4002k_24bpp() { return do_bench_image_decode( &wuffs_png_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), - "test/data/harvesters.png", 0, SIZE_MAX, 1); + NULL, 0, "test/data/harvesters.png", 0, SIZE_MAX, 1); } const char* // @@ -730,7 +734,7 @@ bench_mimic_png_decode_19k_8bpp() { // replacing the "gAMA" with the nonsense "hAMA". ASCII 'g' is 0x67. return do_bench_image_decode( &mimic_png_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, - wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__Y), + wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__Y), NULL, 0, "test/data/bricks-gray.no-ancillary.png", 0, SIZE_MAX, 50); } @@ -740,7 +744,7 @@ bench_mimic_png_decode_40k_24bpp() { return do_bench_image_decode( &mimic_png_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), - "test/data/hat.png", 0, SIZE_MAX, 30); + NULL, 0, "test/data/hat.png", 0, SIZE_MAX, 30); } const char* // @@ -749,7 +753,7 @@ bench_mimic_png_decode_77k_8bpp() { return do_bench_image_decode( &mimic_png_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), - "test/data/bricks-dither.png", 0, SIZE_MAX, 50); + NULL, 0, "test/data/bricks-dither.png", 0, SIZE_MAX, 50); } const char* // @@ -758,7 +762,7 @@ bench_mimic_png_decode_552k_32bpp() { return do_bench_image_decode( &mimic_png_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), - "test/data/hibiscus.primitive.png", 0, SIZE_MAX, 4); + NULL, 0, "test/data/hibiscus.primitive.png", 0, SIZE_MAX, 4); } const char* // @@ -767,7 +771,7 @@ bench_mimic_png_decode_4002k_24bpp() { return do_bench_image_decode( &mimic_png_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), - "test/data/harvesters.png", 0, SIZE_MAX, 1); + NULL, 0, "test/data/harvesters.png", 0, SIZE_MAX, 1); } #endif // WUFFS_MIMIC diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index 21f4c403..ac0325d8 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -1050,11 +1050,18 @@ do_run__wuffs_base__image_decoder(wuffs_base__image_decoder* b, uint64_t* n_bytes_out, wuffs_base__io_buffer* dst, wuffs_base__pixel_format pixfmt, + uint32_t* quirks_ptr, + size_t quirks_len, wuffs_base__io_buffer* src) { wuffs_base__image_config ic = ((wuffs_base__image_config){}); wuffs_base__frame_config fc = ((wuffs_base__frame_config){}); wuffs_base__pixel_buffer pb = ((wuffs_base__pixel_buffer){}); + size_t i; + for (i = 0; i < quirks_len; i++) { + wuffs_base__image_decoder__set_quirk_enabled(b, quirks_ptr[i], true); + } + uint32_t bits_per_pixel = wuffs_base__pixel_format__bits_per_pixel(&pixfmt); if (bits_per_pixel == 0) { return "do_run__wuffs_base__image_decoder: invalid bits_per_pixel"; @@ -1110,9 +1117,13 @@ do_bench_image_decode( wuffs_base__io_buffer* dst, uint32_t wuffs_initialize_flags, wuffs_base__pixel_format pixfmt, + uint32_t* quirks_ptr, + size_t quirks_len, wuffs_base__io_buffer* src), uint32_t wuffs_initialize_flags, wuffs_base__pixel_format pixfmt, + uint32_t* quirks_ptr, + size_t quirks_len, const char* src_filename, size_t src_ri, size_t src_wi, @@ -1128,8 +1139,8 @@ do_bench_image_decode( uint64_t iters = iters_unscaled * g_flags.iterscale; for (i = 0; i < iters; i++) { src.meta.ri = src_ri; - CHECK_STRING( - (*decode_func)(&n_bytes, NULL, wuffs_initialize_flags, pixfmt, &src)); + CHECK_STRING((*decode_func)(&n_bytes, NULL, wuffs_initialize_flags, pixfmt, + quirks_ptr, quirks_len, &src)); } bench_finish(iters, n_bytes); return NULL;