mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 16:32:11 +01:00
std/*image_decoder*: add "#truncated input"
name old speed new speed delta wuffs_bmp_decode_40k/clang11 4.36GB/s ± 0% 4.48GB/s ± 0% +2.74% (p=0.008 n=5+5) wuffs_bmp_decode_40k/gcc10 4.49GB/s ± 0% 4.50GB/s ± 0% +0.15% (p=0.008 n=5+5) wuffs_gif_decode_1k_bw/clang11 723MB/s ± 0% 742MB/s ± 0% +2.64% (p=0.008 n=5+5) wuffs_gif_decode_1k_color_full_init/clang11 177MB/s ± 0% 177MB/s ± 0% ~ (p=0.841 n=5+5) wuffs_gif_decode_1k_color_part_init/clang11 216MB/s ± 0% 217MB/s ± 0% +0.66% (p=0.008 n=5+5) wuffs_gif_decode_10k_bgra/clang11 793MB/s ± 0% 785MB/s ± 0% -1.04% (p=0.016 n=4+5) wuffs_gif_decode_10k_indexed/clang11 210MB/s ± 0% 209MB/s ± 0% -0.38% (p=0.008 n=5+5) wuffs_gif_decode_20k/clang11 254MB/s ± 0% 255MB/s ± 0% +0.37% (p=0.008 n=5+5) wuffs_gif_decode_100k_artificial/clang11 568MB/s ± 0% 569MB/s ± 0% +0.14% (p=0.008 n=5+5) wuffs_gif_decode_100k_realistic/clang11 221MB/s ± 0% 221MB/s ± 0% ~ (p=0.222 n=5+5) wuffs_gif_decode_1000k_full_init/clang11 224MB/s ± 0% 224MB/s ± 0% ~ (p=0.690 n=5+5) wuffs_gif_decode_1000k_part_init/clang11 224MB/s ± 0% 224MB/s ± 0% ~ (p=0.841 n=5+5) wuffs_gif_decode_anim_screencap/clang11 1.30GB/s ± 0% 1.30GB/s ± 0% ~ (p=0.111 n=5+5) wuffs_gif_decode_1k_bw/gcc10 638MB/s ± 0% 672MB/s ± 0% +5.23% (p=0.008 n=5+5) wuffs_gif_decode_1k_color_full_init/gcc10 175MB/s ± 0% 181MB/s ± 0% +3.03% (p=0.008 n=5+5) wuffs_gif_decode_1k_color_part_init/gcc10 203MB/s ± 0% 209MB/s ± 0% +3.38% (p=0.008 n=5+5) wuffs_gif_decode_10k_bgra/gcc10 798MB/s ± 0% 804MB/s ± 0% +0.70% (p=0.008 n=5+5) wuffs_gif_decode_10k_indexed/gcc10 210MB/s ± 0% 212MB/s ± 0% +0.84% (p=0.008 n=5+5) wuffs_gif_decode_20k/gcc10 265MB/s ± 0% 265MB/s ± 0% ~ (p=0.222 n=5+5) wuffs_gif_decode_100k_artificial/gcc10 576MB/s ± 0% 577MB/s ± 0% ~ (p=0.690 n=5+5) wuffs_gif_decode_100k_realistic/gcc10 226MB/s ± 0% 227MB/s ± 0% +0.21% (p=0.008 n=5+5) wuffs_gif_decode_1000k_full_init/gcc10 230MB/s ± 0% 231MB/s ± 0% +0.32% (p=0.008 n=5+5) wuffs_gif_decode_1000k_part_init/gcc10 230MB/s ± 0% 231MB/s ± 0% +0.43% (p=0.008 n=5+5) wuffs_gif_decode_anim_screencap/gcc10 1.32GB/s ± 0% 1.32GB/s ± 0% +0.18% (p=0.008 n=5+5) wuffs_png_decode_image_19k_8bpp/clang11 267MB/s ± 0% 273MB/s ± 0% +2.47% (p=0.008 n=5+5) wuffs_png_decode_image_40k_24bpp/clang11 326MB/s ± 0% 327MB/s ± 0% +0.51% (p=0.008 n=5+5) wuffs_png_decode_image_77k_8bpp/clang11 954MB/s ± 0% 969MB/s ± 0% +1.58% (p=0.008 n=5+5) wuffs_png_decode_image_552k_32bpp_ignore_checksum/clang11 865MB/s ± 0% 864MB/s ± 0% -0.18% (p=0.016 n=5+5) wuffs_png_decode_image_552k_32bpp_verify_checksum/clang11 832MB/s ± 0% 831MB/s ± 0% -0.11% (p=0.016 n=5+5) wuffs_png_decode_image_4002k_24bpp/clang11 331MB/s ± 0% 332MB/s ± 0% +0.18% (p=0.016 n=5+5) wuffs_png_decode_image_19k_8bpp/gcc10 298MB/s ± 0% 292MB/s ± 0% -2.17% (p=0.008 n=5+5) wuffs_png_decode_image_40k_24bpp/gcc10 352MB/s ± 0% 349MB/s ± 0% -0.75% (p=0.008 n=5+5) wuffs_png_decode_image_77k_8bpp/gcc10 1.05GB/s ± 0% 1.03GB/s ± 0% -1.56% (p=0.008 n=5+5) wuffs_png_decode_image_552k_32bpp_ignore_checksum/gcc10 950MB/s ± 0% 949MB/s ± 0% ~ (p=0.310 n=5+5) wuffs_png_decode_image_552k_32bpp_verify_checksum/gcc10 905MB/s ± 0% 902MB/s ± 0% -0.35% (p=0.008 n=5+5) wuffs_png_decode_image_4002k_24bpp/gcc10 360MB/s ± 0% 358MB/s ± 0% -0.40% (p=0.008 n=5+5) wuffs_tga_decode_19k_8bpp/clang11 7.81GB/s ± 0% 7.90GB/s ± 0% +1.22% (p=0.008 n=5+5) wuffs_tga_decode_77k_24bpp/clang11 4.34GB/s ± 0% 4.36GB/s ± 0% +0.59% (p=0.008 n=5+5) wuffs_tga_decode_19k_8bpp/gcc10 7.10GB/s ± 0% 7.13GB/s ± 0% +0.33% (p=0.008 n=5+5) wuffs_tga_decode_77k_24bpp/gcc10 4.61GB/s ± 0% 4.60GB/s ± 0% -0.35% (p=0.008 n=5+5) Updates #96
This commit is contained in:
1 parent
3705e0d93a
commit
248bddcfd2
15 files changed
+1895
-349
No files matched your search
@@ -101,6 +101,34 @@ test_wuffs_bmp_decode_interface() {
|
||||
"test/data/hippopotamus.bmp", 0, SIZE_MAX, 36, 28, 0xFFF5F5F5);
|
||||
}
|
||||
|
||||
const char* //
|
||||
test_wuffs_bmp_decode_truncated_input() {
|
||||
CHECK_FOCUS(__func__);
|
||||
|
||||
wuffs_base__io_buffer src =
|
||||
wuffs_base__ptr_u8__reader(g_src_array_u8, 0, false);
|
||||
wuffs_bmp__decoder dec;
|
||||
CHECK_STATUS("initialize",
|
||||
wuffs_bmp__decoder__initialize(
|
||||
&dec, sizeof dec, WUFFS_VERSION,
|
||||
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
|
||||
|
||||
wuffs_base__status status =
|
||||
wuffs_bmp__decoder__decode_image_config(&dec, NULL, &src);
|
||||
if (status.repr != wuffs_base__suspension__short_read) {
|
||||
RETURN_FAIL("closed=false: have \"%s\", want \"%s\"", status.repr,
|
||||
wuffs_base__suspension__short_read);
|
||||
}
|
||||
|
||||
src.meta.closed = true;
|
||||
status = wuffs_bmp__decoder__decode_image_config(&dec, NULL, &src);
|
||||
if (status.repr != wuffs_bmp__error__truncated_input) {
|
||||
RETURN_FAIL("closed=true: have \"%s\", want \"%s\"", status.repr,
|
||||
wuffs_bmp__error__truncated_input);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const char* //
|
||||
test_wuffs_bmp_decode_frame_config() {
|
||||
CHECK_FOCUS(__func__);
|
||||
@@ -213,6 +241,7 @@ proc g_tests[] = {
|
||||
test_wuffs_bmp_decode_frame_config,
|
||||
test_wuffs_bmp_decode_interface,
|
||||
test_wuffs_bmp_decode_io_redirect,
|
||||
test_wuffs_bmp_decode_truncated_input,
|
||||
|
||||
#ifdef WUFFS_MIMIC
|
||||
|
||||
|
||||
+32
-3
@@ -182,6 +182,34 @@ test_wuffs_gif_decode_interface_image_decoder() {
|
||||
"test/data/bricks-nodither.gif", 0, SIZE_MAX, 160, 120, 0xFF012463);
|
||||
}
|
||||
|
||||
const char* //
|
||||
test_wuffs_gif_decode_truncated_input() {
|
||||
CHECK_FOCUS(__func__);
|
||||
|
||||
wuffs_base__io_buffer src =
|
||||
wuffs_base__ptr_u8__reader(g_src_array_u8, 0, false);
|
||||
wuffs_gif__decoder dec;
|
||||
CHECK_STATUS("initialize",
|
||||
wuffs_gif__decoder__initialize(
|
||||
&dec, sizeof dec, WUFFS_VERSION,
|
||||
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
|
||||
|
||||
wuffs_base__status status =
|
||||
wuffs_gif__decoder__decode_image_config(&dec, NULL, &src);
|
||||
if (status.repr != wuffs_base__suspension__short_read) {
|
||||
RETURN_FAIL("closed=false: have \"%s\", want \"%s\"", status.repr,
|
||||
wuffs_base__suspension__short_read);
|
||||
}
|
||||
|
||||
src.meta.closed = true;
|
||||
status = wuffs_gif__decoder__decode_image_config(&dec, NULL, &src);
|
||||
if (status.repr != wuffs_gif__error__truncated_input) {
|
||||
RETURN_FAIL("closed=true: have \"%s\", want \"%s\"", status.repr,
|
||||
wuffs_gif__error__truncated_input);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const char* //
|
||||
wuffs_gif_decode(uint64_t* n_bytes_out,
|
||||
wuffs_base__io_buffer* dst,
|
||||
@@ -1238,9 +1266,9 @@ test_wuffs_gif_decode_interlaced_truncated() {
|
||||
|
||||
wuffs_base__status status = wuffs_gif__decoder__decode_frame(
|
||||
&dec, &pb, &src, WUFFS_BASE__PIXEL_BLEND__SRC, g_work_slice_u8, NULL);
|
||||
if (status.repr != wuffs_base__suspension__short_read) {
|
||||
if (status.repr != wuffs_gif__error__truncated_input) {
|
||||
RETURN_FAIL("decode_frame: have \"%s\", want \"%s\"", status.repr,
|
||||
wuffs_base__suspension__short_read);
|
||||
wuffs_gif__error__truncated_input);
|
||||
}
|
||||
|
||||
// Even though the source GIF data was truncated, replicating the interlaced
|
||||
@@ -1462,7 +1490,7 @@ test_wuffs_gif_decode_missing_two_src_bytes() {
|
||||
src.meta.wi -= 2;
|
||||
|
||||
return do_test_wuffs_gif_decode_expecting(
|
||||
src, 0, wuffs_base__suspension__short_read, false);
|
||||
src, 0, wuffs_gif__error__truncated_input, false);
|
||||
}
|
||||
|
||||
const char* //
|
||||
@@ -2356,6 +2384,7 @@ proc g_tests[] = {
|
||||
test_wuffs_gif_decode_pixfmt_bgra_nonpremul,
|
||||
test_wuffs_gif_decode_pixfmt_rgb,
|
||||
test_wuffs_gif_decode_pixfmt_rgba_nonpremul,
|
||||
test_wuffs_gif_decode_truncated_input,
|
||||
test_wuffs_gif_decode_zero_width_frame,
|
||||
test_wuffs_gif_frame_dirty_rect,
|
||||
test_wuffs_gif_num_decoded_frame_configs,
|
||||
|
||||
@@ -82,6 +82,34 @@ test_wuffs_nie_decode_interface() {
|
||||
"test/data/hippopotamus.nie", 0, SIZE_MAX, 36, 28, 0xFFF5F5F5);
|
||||
}
|
||||
|
||||
const char* //
|
||||
test_wuffs_nie_decode_truncated_input() {
|
||||
CHECK_FOCUS(__func__);
|
||||
|
||||
wuffs_base__io_buffer src =
|
||||
wuffs_base__ptr_u8__reader(g_src_array_u8, 0, false);
|
||||
wuffs_nie__decoder dec;
|
||||
CHECK_STATUS("initialize",
|
||||
wuffs_nie__decoder__initialize(
|
||||
&dec, sizeof dec, WUFFS_VERSION,
|
||||
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
|
||||
|
||||
wuffs_base__status status =
|
||||
wuffs_nie__decoder__decode_image_config(&dec, NULL, &src);
|
||||
if (status.repr != wuffs_base__suspension__short_read) {
|
||||
RETURN_FAIL("closed=false: have \"%s\", want \"%s\"", status.repr,
|
||||
wuffs_base__suspension__short_read);
|
||||
}
|
||||
|
||||
src.meta.closed = true;
|
||||
status = wuffs_nie__decoder__decode_image_config(&dec, NULL, &src);
|
||||
if (status.repr != wuffs_nie__error__truncated_input) {
|
||||
RETURN_FAIL("closed=true: have \"%s\", want \"%s\"", status.repr,
|
||||
wuffs_nie__error__truncated_input);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const char* //
|
||||
test_wuffs_nie_decode_frame_config() {
|
||||
CHECK_FOCUS(__func__);
|
||||
@@ -134,6 +162,7 @@ proc g_tests[] = {
|
||||
|
||||
test_wuffs_nie_decode_frame_config,
|
||||
test_wuffs_nie_decode_interface,
|
||||
test_wuffs_nie_decode_truncated_input,
|
||||
|
||||
#ifdef WUFFS_MIMIC
|
||||
|
||||
|
||||
@@ -194,6 +194,34 @@ test_wuffs_png_decode_interface() {
|
||||
"test/data/bricks-gray.png", 0, SIZE_MAX, 160, 120, 0xFF060606);
|
||||
}
|
||||
|
||||
const char* //
|
||||
test_wuffs_png_decode_truncated_input() {
|
||||
CHECK_FOCUS(__func__);
|
||||
|
||||
wuffs_base__io_buffer src =
|
||||
wuffs_base__ptr_u8__reader(g_src_array_u8, 0, false);
|
||||
wuffs_png__decoder dec;
|
||||
CHECK_STATUS("initialize",
|
||||
wuffs_png__decoder__initialize(
|
||||
&dec, sizeof dec, WUFFS_VERSION,
|
||||
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
|
||||
|
||||
wuffs_base__status status =
|
||||
wuffs_png__decoder__decode_image_config(&dec, NULL, &src);
|
||||
if (status.repr != wuffs_base__suspension__short_read) {
|
||||
RETURN_FAIL("closed=false: have \"%s\", want \"%s\"", status.repr,
|
||||
wuffs_base__suspension__short_read);
|
||||
}
|
||||
|
||||
src.meta.closed = true;
|
||||
status = wuffs_png__decoder__decode_image_config(&dec, NULL, &src);
|
||||
if (status.repr != wuffs_png__error__truncated_input) {
|
||||
RETURN_FAIL("closed=true: have \"%s\", want \"%s\"", status.repr,
|
||||
wuffs_png__error__truncated_input);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const char* //
|
||||
test_wuffs_png_decode_multiple_idats() {
|
||||
CHECK_FOCUS(__func__);
|
||||
@@ -1288,6 +1316,7 @@ proc g_tests[] = {
|
||||
test_wuffs_png_decode_metadata_kvp,
|
||||
test_wuffs_png_decode_multiple_idats,
|
||||
test_wuffs_png_decode_restart_frame,
|
||||
test_wuffs_png_decode_truncated_input,
|
||||
|
||||
#ifdef WUFFS_MIMIC
|
||||
|
||||
|
||||
@@ -99,6 +99,34 @@ test_wuffs_tga_decode_interface() {
|
||||
"test/data/bricks-color.tga", 0, SIZE_MAX, 160, 120, 0xFF022460);
|
||||
}
|
||||
|
||||
const char* //
|
||||
test_wuffs_tga_decode_truncated_input() {
|
||||
CHECK_FOCUS(__func__);
|
||||
|
||||
wuffs_base__io_buffer src =
|
||||
wuffs_base__ptr_u8__reader(g_src_array_u8, 0, false);
|
||||
wuffs_tga__decoder dec;
|
||||
CHECK_STATUS("initialize",
|
||||
wuffs_tga__decoder__initialize(
|
||||
&dec, sizeof dec, WUFFS_VERSION,
|
||||
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
|
||||
|
||||
wuffs_base__status status =
|
||||
wuffs_tga__decoder__decode_image_config(&dec, NULL, &src);
|
||||
if (status.repr != wuffs_base__suspension__short_read) {
|
||||
RETURN_FAIL("closed=false: have \"%s\", want \"%s\"", status.repr,
|
||||
wuffs_base__suspension__short_read);
|
||||
}
|
||||
|
||||
src.meta.closed = true;
|
||||
status = wuffs_tga__decoder__decode_image_config(&dec, NULL, &src);
|
||||
if (status.repr != wuffs_tga__error__truncated_input) {
|
||||
RETURN_FAIL("closed=true: have \"%s\", want \"%s\"", status.repr,
|
||||
wuffs_tga__error__truncated_input);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// ---------------- Mimic Tests
|
||||
|
||||
#ifdef WUFFS_MIMIC
|
||||
@@ -141,6 +169,7 @@ bench_wuffs_tga_decode_77k_24bpp() {
|
||||
proc g_tests[] = {
|
||||
|
||||
test_wuffs_tga_decode_interface,
|
||||
test_wuffs_tga_decode_truncated_input,
|
||||
|
||||
#ifdef WUFFS_MIMIC
|
||||
|
||||
|
||||
@@ -436,6 +436,34 @@ test_wuffs_wbmp_decode_interface() {
|
||||
"test/data/muybridge-frame-000.wbmp", 0, SIZE_MAX, 30, 20, 0xFFFFFFFF);
|
||||
}
|
||||
|
||||
const char* //
|
||||
test_wuffs_wbmp_decode_truncated_input() {
|
||||
CHECK_FOCUS(__func__);
|
||||
|
||||
wuffs_base__io_buffer src =
|
||||
wuffs_base__ptr_u8__reader(g_src_array_u8, 0, false);
|
||||
wuffs_wbmp__decoder dec;
|
||||
CHECK_STATUS("initialize",
|
||||
wuffs_wbmp__decoder__initialize(
|
||||
&dec, sizeof dec, WUFFS_VERSION,
|
||||
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
|
||||
|
||||
wuffs_base__status status =
|
||||
wuffs_wbmp__decoder__decode_image_config(&dec, NULL, &src);
|
||||
if (status.repr != wuffs_base__suspension__short_read) {
|
||||
RETURN_FAIL("closed=false: have \"%s\", want \"%s\"", status.repr,
|
||||
wuffs_base__suspension__short_read);
|
||||
}
|
||||
|
||||
src.meta.closed = true;
|
||||
status = wuffs_wbmp__decoder__decode_image_config(&dec, NULL, &src);
|
||||
if (status.repr != wuffs_wbmp__error__truncated_input) {
|
||||
RETURN_FAIL("closed=true: have \"%s\", want \"%s\"", status.repr,
|
||||
wuffs_wbmp__error__truncated_input);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const char* //
|
||||
test_wuffs_wbmp_decode_frame_config() {
|
||||
CHECK_FOCUS(__func__);
|
||||
@@ -653,6 +681,7 @@ proc g_tests[] = {
|
||||
test_wuffs_wbmp_decode_frame_config,
|
||||
test_wuffs_wbmp_decode_image_config,
|
||||
test_wuffs_wbmp_decode_interface,
|
||||
test_wuffs_wbmp_decode_truncated_input,
|
||||
|
||||
#ifdef WUFFS_MIMIC
|
||||
|
||||
|
||||
Reference in new issue
Block a user