test: add std/jpeg mimic tests and benches

This commit is contained in:
Nigel Tao committed 2023-06-04 12:44:17 +10:00
1 parent 0904751e2d
commit 4751ef4de5
2 files changed
+259 -7

No files matched your search

+81
View File
@@ -0,0 +1,81 @@
// Copyright 2023 The Wuffs Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "jpeglib.h"
const char* //
mimic_jpeg_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);
if (!dst) {
dst = &dst_fallback;
}
const char* ret = NULL;
struct jpeg_decompress_struct cinfo;
struct jpeg_error_mgr jerr;
cinfo.err = jpeg_std_error(&jerr);
jpeg_create_decompress(&cinfo);
jpeg_mem_src(&cinfo, wuffs_base__io_buffer__reader_pointer(src),
wuffs_base__io_buffer__reader_length(src));
if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK) {
ret = "mimic_jpeg_decode: jpeg_read_header failed";
goto cleanup0;
}
switch (pixfmt.repr) {
case WUFFS_BASE__PIXEL_FORMAT__Y:
cinfo.out_color_space = JCS_GRAYSCALE;
break;
case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
cinfo.out_color_space = JCS_EXT_BGRA;
break;
default:
ret = "mimic_jpeg_decode: unsupported pixfmt";
goto cleanup0;
}
jpeg_start_decompress(&cinfo);
size_t stride =
cinfo.output_width *
((size_t)(wuffs_base__pixel_format__bits_per_pixel(&pixfmt) / 8u));
while (cinfo.output_scanline < cinfo.output_height) {
if (wuffs_base__io_buffer__writer_length(dst) < stride) {
ret = "mimic_jpeg_decode: image is too large";
goto cleanup0;
}
JSAMPLE* scanlines[1] = {(void*)wuffs_base__io_buffer__writer_pointer(dst)};
if (jpeg_read_scanlines(&cinfo, scanlines, 1)) {
dst->meta.wi += stride;
if (n_bytes_out) {
*n_bytes_out += stride;
}
}
}
jpeg_finish_decompress(&cinfo);
cleanup0:;
jpeg_destroy_decompress(&cinfo);
return ret;
}
+178 -7
View File
@@ -37,7 +37,7 @@ the first "./a.out" with "./a.out -bench". Combine these changes with the
"wuffs mimic cflags" to run the mimic benchmarks.
*/
// ¿ wuffs mimic cflags: -DWUFFS_MIMIC
// ¿ wuffs mimic cflags: -DWUFFS_MIMIC -ljpeg
// Wuffs ships as a "single file C library" or "header file library" as per
// https://github.com/nothings/stb/blob/master/docs/stb_howto.txt
@@ -64,7 +64,7 @@ the first "./a.out" with "./a.out -bench". Combine these changes with the
#include "../../../release/c/wuffs-unsupported-snapshot.c"
#include "../testlib/testlib.c"
#ifdef WUFFS_MIMIC
// No mimic library.
#include "../mimiclib/jpeg.c"
#endif
// ---------------- JPEG Tests
@@ -745,12 +745,92 @@ test_wuffs_jpeg_decode_mcu() {
#ifdef WUFFS_MIMIC
// No mimic tests.
const char* //
do_test_mimic_jpeg_decode(const char* filename) {
wuffs_base__io_buffer src = ((wuffs_base__io_buffer){
.data = g_src_slice_u8,
});
CHECK_STRING(read_file(&src, filename));
src.meta.ri = 0;
wuffs_base__io_buffer have = ((wuffs_base__io_buffer){
.data = g_have_slice_u8,
});
CHECK_STRING(wuffs_jpeg_decode(
NULL, &have, WUFFS_INITIALIZE__DEFAULT_OPTIONS,
wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL),
NULL, 0, &src));
src.meta.ri = 0;
wuffs_base__io_buffer want = ((wuffs_base__io_buffer){
.data = g_want_slice_u8,
});
CHECK_STRING(mimic_jpeg_decode(
NULL, &want, WUFFS_INITIALIZE__DEFAULT_OPTIONS,
wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL),
NULL, 0, &src));
return check_io_buffers_equal("", &have, &want);
}
const char* //
test_mimic_jpeg_decode_19k_8bpp() {
CHECK_FOCUS(__func__);
return do_test_mimic_jpeg_decode("test/data/bricks-gray.jpeg");
}
const char* //
test_mimic_jpeg_decode_30k_24bpp_progressive() {
CHECK_FOCUS(__func__);
return do_test_mimic_jpeg_decode("test/data/peacock.progressive.jpeg");
}
const char* //
test_mimic_jpeg_decode_30k_24bpp_sequential() {
CHECK_FOCUS(__func__);
return do_test_mimic_jpeg_decode("test/data/peacock.default.jpeg");
}
const char* //
test_mimic_jpeg_decode_552k_24bpp() {
CHECK_FOCUS(__func__);
return do_test_mimic_jpeg_decode("test/data/hibiscus.primitive.jpeg");
}
#endif // WUFFS_MIMIC
// ---------------- JPEG Benches
const char* //
bench_wuffs_jpeg_decode_19k_8bpp() {
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__Y), NULL, 0,
"test/data/bricks-gray.jpeg", 0, SIZE_MAX, 100);
}
const char* //
bench_wuffs_jpeg_decode_30k_24bpp_progressive() {
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/peacock.progressive.jpeg", 0, SIZE_MAX, 50);
}
const char* //
bench_wuffs_jpeg_decode_30k_24bpp_sequential() {
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/peacock.default.jpeg", 0, SIZE_MAX, 50);
}
const char* //
bench_wuffs_jpeg_decode_77k_24bpp() {
CHECK_FOCUS(__func__);
@@ -758,14 +838,92 @@ bench_wuffs_jpeg_decode_77k_24bpp() {
&wuffs_jpeg_decode,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL),
NULL, 0, "test/data/bricks-color.jpeg", 0, SIZE_MAX, 1000);
NULL, 0, "test/data/bricks-color.jpeg", 0, SIZE_MAX, 30);
}
const char* //
bench_wuffs_jpeg_decode_552k_24bpp() {
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.regular.jpeg", 0, SIZE_MAX, 5);
}
const char* //
bench_wuffs_jpeg_decode_4002k_24bpp() {
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/harvesters.jpeg", 0, SIZE_MAX, 1);
}
// ---------------- Mimic Benches
#ifdef WUFFS_MIMIC
// No mimic benches.
const char* //
bench_mimic_jpeg_decode_19k_8bpp() {
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__Y), NULL, 0,
"test/data/bricks-gray.jpeg", 0, SIZE_MAX, 100);
}
const char* //
bench_mimic_jpeg_decode_30k_24bpp_progressive() {
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/peacock.progressive.jpeg", 0, SIZE_MAX, 50);
}
const char* //
bench_mimic_jpeg_decode_30k_24bpp_sequential() {
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/peacock.default.jpeg", 0, SIZE_MAX, 50);
}
const char* //
bench_mimic_jpeg_decode_77k_24bpp() {
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/bricks-color.jpeg", 0, SIZE_MAX, 30);
}
const char* //
bench_mimic_jpeg_decode_552k_24bpp() {
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.regular.jpeg", 0, SIZE_MAX, 5);
}
const char* //
bench_mimic_jpeg_decode_4002k_24bpp() {
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/harvesters.jpeg", 0, SIZE_MAX, 1);
}
#endif // WUFFS_MIMIC
@@ -782,7 +940,10 @@ proc g_tests[] = {
#ifdef WUFFS_MIMIC
// No mimic 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,
#endif // WUFFS_MIMIC
@@ -791,11 +952,21 @@ proc g_tests[] = {
proc g_benches[] = {
bench_wuffs_jpeg_decode_19k_8bpp,
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_4002k_24bpp,
#ifdef WUFFS_MIMIC
// No mimic benches.
bench_mimic_jpeg_decode_19k_8bpp,
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_4002k_24bpp,
#endif // WUFFS_MIMIC