From dcb5b0e1c71a1b828110f5d9afee3a284a7830f7 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Mon, 5 Jun 2023 22:25:22 +1000 Subject: [PATCH] test: add 4:4:4 (not just 4:2:0) JPEG test+bench --- script/bench-go-jpeg/main.go | 6 +++++- test/c/std/jpeg.c | 41 ++++++++++++++++++++++++++++++------ 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/script/bench-go-jpeg/main.go b/script/bench-go-jpeg/main.go index 2e0ba0ff..398ac7db 100644 --- a/script/bench-go-jpeg/main.go +++ b/script/bench-go-jpeg/main.go @@ -64,9 +64,13 @@ var testCases = []testCase{{ src: mustLoad("test/data/bricks-color.jpeg"), itersUnscaled: 30, }, { - benchname: "go_jpeg_decode_552k_24bpp", + benchname: "go_jpeg_decode_552k_24bpp_420", src: mustLoad("test/data/hibiscus.regular.jpeg"), itersUnscaled: 5, +}, { + benchname: "go_jpeg_decode_552k_24bpp_444", + src: mustLoad("test/data/hibiscus.primitive.jpeg"), + itersUnscaled: 5, }, { benchname: "go_jpeg_decode_4002k_24bpp", src: mustLoad("test/data/harvesters.jpeg"), diff --git a/test/c/std/jpeg.c b/test/c/std/jpeg.c index 5d9df8d9..e061ba08 100644 --- a/test/c/std/jpeg.c +++ b/test/c/std/jpeg.c @@ -792,7 +792,13 @@ test_mimic_jpeg_decode_30k_24bpp_sequential() { } const char* // -test_mimic_jpeg_decode_552k_24bpp() { +test_mimic_jpeg_decode_552k_24bpp_420() { + CHECK_FOCUS(__func__); + return do_test_mimic_jpeg_decode("test/data/hibiscus.regular.jpeg"); +} + +const char* // +test_mimic_jpeg_decode_552k_24bpp_444() { CHECK_FOCUS(__func__); return do_test_mimic_jpeg_decode("test/data/hibiscus.primitive.jpeg"); } @@ -842,7 +848,7 @@ bench_wuffs_jpeg_decode_77k_24bpp() { } const char* // -bench_wuffs_jpeg_decode_552k_24bpp() { +bench_wuffs_jpeg_decode_552k_24bpp_420() { CHECK_FOCUS(__func__); return do_bench_image_decode( &wuffs_jpeg_decode, @@ -851,6 +857,16 @@ bench_wuffs_jpeg_decode_552k_24bpp() { NULL, 0, "test/data/hibiscus.regular.jpeg", 0, SIZE_MAX, 5); } +const char* // +bench_wuffs_jpeg_decode_552k_24bpp_444() { + CHECK_FOCUS(__func__); + return do_bench_image_decode( + &wuffs_jpeg_decode, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, + wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), + NULL, 0, "test/data/hibiscus.primitive.jpeg", 0, SIZE_MAX, 5); +} + const char* // bench_wuffs_jpeg_decode_4002k_24bpp() { CHECK_FOCUS(__func__); @@ -906,7 +922,7 @@ bench_mimic_jpeg_decode_77k_24bpp() { } const char* // -bench_mimic_jpeg_decode_552k_24bpp() { +bench_mimic_jpeg_decode_552k_24bpp_420() { CHECK_FOCUS(__func__); return do_bench_image_decode( &mimic_jpeg_decode, @@ -915,6 +931,16 @@ bench_mimic_jpeg_decode_552k_24bpp() { NULL, 0, "test/data/hibiscus.regular.jpeg", 0, SIZE_MAX, 5); } +const char* // +bench_mimic_jpeg_decode_552k_24bpp_444() { + CHECK_FOCUS(__func__); + return do_bench_image_decode( + &mimic_jpeg_decode, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, + wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), + NULL, 0, "test/data/hibiscus.primitive.jpeg", 0, SIZE_MAX, 5); +} + const char* // bench_mimic_jpeg_decode_4002k_24bpp() { CHECK_FOCUS(__func__); @@ -943,7 +969,8 @@ proc g_tests[] = { test_mimic_jpeg_decode_19k_8bpp, test_mimic_jpeg_decode_30k_24bpp_progressive, test_mimic_jpeg_decode_30k_24bpp_sequential, - test_mimic_jpeg_decode_552k_24bpp, + test_mimic_jpeg_decode_552k_24bpp_420, + test_mimic_jpeg_decode_552k_24bpp_444, #endif // WUFFS_MIMIC @@ -956,7 +983,8 @@ proc g_benches[] = { bench_wuffs_jpeg_decode_30k_24bpp_progressive, bench_wuffs_jpeg_decode_30k_24bpp_sequential, bench_wuffs_jpeg_decode_77k_24bpp, - bench_wuffs_jpeg_decode_552k_24bpp, + bench_wuffs_jpeg_decode_552k_24bpp_420, + bench_wuffs_jpeg_decode_552k_24bpp_444, bench_wuffs_jpeg_decode_4002k_24bpp, #ifdef WUFFS_MIMIC @@ -965,7 +993,8 @@ proc g_benches[] = { bench_mimic_jpeg_decode_30k_24bpp_progressive, bench_mimic_jpeg_decode_30k_24bpp_sequential, bench_mimic_jpeg_decode_77k_24bpp, - bench_mimic_jpeg_decode_552k_24bpp, + bench_mimic_jpeg_decode_552k_24bpp_420, + bench_mimic_jpeg_decode_552k_24bpp_444, bench_mimic_jpeg_decode_4002k_24bpp, #endif // WUFFS_MIMIC