Have do_bench_image_decode pass a non-NULL dst

This commit is contained in:
Nigel Tao committed 2020-12-28 15:54:15 +11:00
1 parent 88616cc969
commit 0c7a8cc029
3 files changed
+12 -24

No files matched your search

+8 -12
View File
@@ -73,19 +73,15 @@ mimic_gif_decode(uint64_t* n_bytes_out,
// further complicates supporting both versions 4 and 5 of giflib. That
// commit was therefore rolled back.
struct SavedImage* si = &f->SavedImages[i];
size_t num_src =
(size_t)(si->ImageDesc.Width) * (size_t)(si->ImageDesc.Height);
if (n_bytes_out) {
*n_bytes_out += num_src;
size_t n = (size_t)(si->ImageDesc.Width) * (size_t)(si->ImageDesc.Height);
if (n > wuffs_base__io_buffer__writer_length(dst)) {
ret = "GIF image's pixel data won't fit in the dst buffer";
goto cleanup1;
}
if (dst) {
size_t num_dst = dst->data.len - dst->meta.wi;
if (num_dst < num_src) {
ret = "GIF image's pixel data won't fit in the dst buffer";
goto cleanup1;
}
memmove(dst->data.ptr + dst->meta.wi, si->RasterBits, num_src);
dst->meta.wi += num_src;
memmove(wuffs_base__io_buffer__writer_pointer(dst), si->RasterBits, n);
dst->meta.wi += n;
if (n_bytes_out) {
*n_bytes_out += n;
}
}
-11
View File
@@ -20,17 +20,6 @@ mimic_png_decode(uint64_t* n_bytes_out,
uint32_t wuffs_initialize_flags,
wuffs_base__pixel_format pixfmt,
wuffs_base__io_buffer* src) {
static uint8_t dst_fallback_array_u8[64 * 1024 * 1024];
wuffs_base__io_buffer dst_fallback = ((wuffs_base__io_buffer){
.data = ((wuffs_base__slice_u8){
.ptr = dst_fallback_array_u8,
.len = 64 * 1024 * 1024,
}),
});
if (!dst) {
dst = &dst_fallback;
}
const char* ret = NULL;
png_image pi;
+4 -1
View File
@@ -1120,9 +1120,12 @@ do_bench_image_decode(
uint64_t i;
uint64_t iters = iters_unscaled * g_flags.iterscale;
for (i = 0; i < iters; i++) {
wuffs_base__io_buffer dst = ((wuffs_base__io_buffer){
.data = g_pixel_slice_u8,
});
src.meta.ri = src_ri;
CHECK_STRING(
(*decode_func)(&n_bytes, NULL, wuffs_initialize_flags, pixfmt, &src));
(*decode_func)(&n_bytes, &dst, wuffs_initialize_flags, pixfmt, &src));
}
bench_finish(iters, n_bytes);
return NULL;