mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 08:32:11 +01:00
Have std/png check CRC-32 checksums
wuffs_png_decode_19k_8bpp/clang9 90.3MB/s ± 0% 89.0MB/s ± 0% -1.49% (p=0.008 n=5+5) wuffs_png_decode_40k_24bpp/clang9 128MB/s ± 0% 126MB/s ± 0% -1.42% (p=0.008 n=5+5) wuffs_png_decode_77k_8bpp/clang9 340MB/s ± 0% 333MB/s ± 0% -1.81% (p=0.008 n=5+5) wuffs_png_decode_552k_32bpp/clang9 256MB/s ± 0% 253MB/s ± 0% -1.06% (p=0.008 n=5+5) wuffs_png_decode_4002k_24bpp/clang9 128MB/s ± 0% 126MB/s ± 0% -1.77% (p=0.008 n=5+5) wuffs_png_decode_19k_8bpp/gcc10 97.7MB/s ± 0% 95.2MB/s ± 0% -2.52% (p=0.008 n=5+5) wuffs_png_decode_40k_24bpp/gcc10 136MB/s ± 3% 129MB/s ± 0% -5.13% (p=0.008 n=5+5) wuffs_png_decode_77k_8bpp/gcc10 362MB/s ± 1% 353MB/s ± 1% -2.52% (p=0.008 n=5+5) wuffs_png_decode_552k_32bpp/gcc10 273MB/s ± 0% 271MB/s ± 0% -0.54% (p=0.008 n=5+5) wuffs_png_decode_4002k_24bpp/gcc10 136MB/s ± 0% 130MB/s ± 0% -4.45% (p=0.008 n=5+5)
This commit is contained in:
1 parent
909b933695
commit
04ab103809
5 files changed
+853
-316
No files matched your search
@@ -88,6 +88,46 @@ wuffs_png_decode(uint64_t* n_bytes_out,
|
||||
n_bytes_out, dst, pixfmt, src);
|
||||
}
|
||||
|
||||
const char* //
|
||||
do_test_xxxxx_png_decode_bad_crc32_checksum(
|
||||
const char* (*decode_func)(uint64_t* n_bytes_out,
|
||||
wuffs_base__io_buffer* dst,
|
||||
uint32_t wuffs_initialize_flags,
|
||||
wuffs_base__pixel_format pixfmt,
|
||||
wuffs_base__io_buffer* src)) {
|
||||
const char* test_cases[] = {
|
||||
// Change a byte in the IHDR CRC-32 checksum.
|
||||
"@001F=8A=00;test/data/hippopotamus.regular.png",
|
||||
// Change a byte in a final IDAT Adler-32 checksum.
|
||||
"@084E=26=00;test/data/hippopotamus.regular.png",
|
||||
// Change a byte in a final IDAT CRC-32 checksum.
|
||||
"@084F=F4=00;test/data/hippopotamus.regular.png",
|
||||
// Change a byte in a non-final IDAT CRC-32 checksum.
|
||||
"@2029=B7=00;test/data/bricks-color.png",
|
||||
// TODO: Change a byte in an ancillary chunk's CRC-32 checksum.
|
||||
};
|
||||
|
||||
int tc;
|
||||
for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) {
|
||||
wuffs_base__io_buffer src = ((wuffs_base__io_buffer){
|
||||
.data = g_src_slice_u8,
|
||||
});
|
||||
CHECK_STRING(read_file(&src, test_cases[tc]));
|
||||
|
||||
wuffs_base__io_buffer have = ((wuffs_base__io_buffer){
|
||||
.data = g_have_slice_u8,
|
||||
});
|
||||
if (NULL == (*decode_func)(NULL, &have, WUFFS_INITIALIZE__DEFAULT_OPTIONS,
|
||||
wuffs_base__make_pixel_format(
|
||||
WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL),
|
||||
&src)) {
|
||||
RETURN_FAIL("tc=%d (filename=\"%s\"): bad checksum not rejected", tc,
|
||||
test_cases[tc]);
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const char* //
|
||||
do_wuffs_png_swizzle(uint32_t width,
|
||||
uint32_t height,
|
||||
@@ -140,6 +180,12 @@ test_wuffs_png_decode_interface() {
|
||||
"test/data/bricks-gray.png", 0, SIZE_MAX, 160, 120, 0xFF060606);
|
||||
}
|
||||
|
||||
const char* //
|
||||
test_wuffs_png_decode_bad_crc32_checksum() {
|
||||
CHECK_FOCUS(__func__);
|
||||
return do_test_xxxxx_png_decode_bad_crc32_checksum(&wuffs_png_decode);
|
||||
}
|
||||
|
||||
const char* //
|
||||
test_wuffs_png_decode_filters_golden() {
|
||||
CHECK_FOCUS(__func__);
|
||||
@@ -480,6 +526,12 @@ test_mimic_png_decode_4002k_24bpp() {
|
||||
return do_test_mimic_png_decode("test/data/harvesters.png");
|
||||
}
|
||||
|
||||
const char* //
|
||||
test_mimic_png_decode_bad_crc32_checksum() {
|
||||
CHECK_FOCUS(__func__);
|
||||
return do_test_xxxxx_png_decode_bad_crc32_checksum(&mimic_png_decode);
|
||||
}
|
||||
|
||||
#endif // WUFFS_MIMIC
|
||||
|
||||
// ---------------- PNG Benches
|
||||
@@ -709,6 +761,7 @@ bench_mimic_png_decode_4002k_24bpp() {
|
||||
|
||||
proc g_tests[] = {
|
||||
|
||||
test_wuffs_png_decode_bad_crc32_checksum,
|
||||
test_wuffs_png_decode_filters_golden,
|
||||
test_wuffs_png_decode_filters_round_trip,
|
||||
test_wuffs_png_decode_frame_config,
|
||||
@@ -721,6 +774,7 @@ proc g_tests[] = {
|
||||
test_mimic_png_decode_77k_8bpp,
|
||||
test_mimic_png_decode_552k_32bpp,
|
||||
test_mimic_png_decode_4002k_24bpp,
|
||||
test_mimic_png_decode_bad_crc32_checksum,
|
||||
|
||||
#endif // WUFFS_MIMIC
|
||||
|
||||
|
||||
Reference in new issue
Block a user