std/jpeg: drain bitstream for truncated input

name                                             old speed      new speed      delta

wuffs_jpeg_decode_19k_8bpp/clang11                367MB/s ± 0%   378MB/s ± 0%  +2.91%  (p=0.008 n=5+5)
wuffs_jpeg_decode_30k_24bpp_progressive/clang11   333MB/s ± 0%   325MB/s ± 0%  -2.46%  (p=0.008 n=5+5)
wuffs_jpeg_decode_30k_24bpp_sequential/clang11   1.00GB/s ± 0%  1.02GB/s ± 0%  +1.37%  (p=0.008 n=5+5)
wuffs_jpeg_decode_77k_24bpp/clang11               822MB/s ± 0%   842MB/s ± 0%  +2.39%  (p=0.008 n=5+5)
wuffs_jpeg_decode_552k_24bpp_420/clang11          898MB/s ± 0%   916MB/s ± 0%  +1.98%  (p=0.008 n=5+5)
wuffs_jpeg_decode_552k_24bpp_444/clang11         1.09GB/s ± 0%  1.10GB/s ± 0%  +1.21%  (p=0.008 n=5+5)
wuffs_jpeg_decode_4002k_24bpp/clang11             898MB/s ± 0%   919MB/s ± 0%  +2.29%  (p=0.008 n=5+5)

wuffs_jpeg_decode_19k_8bpp/gcc10                  362MB/s ± 0%   360MB/s ± 0%  -0.55%  (p=0.008 n=5+5)
wuffs_jpeg_decode_30k_24bpp_progressive/gcc10     292MB/s ± 0%   290MB/s ± 0%  -0.57%  (p=0.008 n=5+5)
wuffs_jpeg_decode_30k_24bpp_sequential/gcc10      934MB/s ± 0%   925MB/s ± 0%  -1.03%  (p=0.008 n=5+5)
wuffs_jpeg_decode_77k_24bpp/gcc10                 759MB/s ± 0%   758MB/s ± 0%  -0.25%  (p=0.008 n=5+5)
wuffs_jpeg_decode_552k_24bpp_420/gcc10            828MB/s ± 0%   829MB/s ± 0%    ~     (p=0.222 n=5+5)
wuffs_jpeg_decode_552k_24bpp_444/gcc10           1.00GB/s ± 0%  0.98GB/s ± 0%  -1.44%  (p=0.008 n=5+5)
wuffs_jpeg_decode_4002k_24bpp/gcc10               837MB/s ± 0%   835MB/s ± 0%  -0.29%  (p=0.008 n=5+5)
This commit is contained in:
Nigel Tao committed 2023-08-28 19:35:08 +10:00
1 parent 813c054c18
commit d89ec2d40b
4 files changed
+24 -4

No files matched your search

+9
View File
@@ -9201,6 +9201,7 @@ struct wuffs_jpeg__decoder__struct {
uint32_t f_bitstream_n_bits;
uint32_t f_bitstream_ri;
uint32_t f_bitstream_wi;
bool f_bitstream_is_closed;
uint32_t f_bitstream_padding;
uint16_t f_quant_tables[4][64];
uint16_t f_saved_quant_tables[4][64];
@@ -43081,6 +43082,13 @@ wuffs_jpeg__decoder__decode_sos(
} else if (self->private_impl.f_bitstream_padding == 0u) {
status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
goto exit;
} else if ((a_src && a_src->meta.closed) && ! self->private_impl.f_bitstream_is_closed) {
if (self->private_impl.f_bitstream_wi < 1024u) {
wuffs_base__bulk_memset(&self->private_data.f_bitstream_buffer[self->private_impl.f_bitstream_wi], 264u, 0u);
self->private_impl.f_bitstream_wi += 264u;
self->private_impl.f_bitstream_is_closed = true;
}
break;
}
status = wuffs_base__make_status(wuffs_base__suspension__short_read);
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
@@ -44091,6 +44099,7 @@ wuffs_jpeg__decoder__restart_frame(
return wuffs_base__make_status(wuffs_base__error__bad_argument);
}
self->private_impl.f_call_sequence = 40u;
self->private_impl.f_bitstream_is_closed = false;
self->private_impl.f_frame_config_io_position = a_io_position;
self->private_impl.f_scan_count = 0u;
self->private_impl.f_restart_interval = self->private_impl.f_saved_restart_interval;