mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-17 16:32:11 +01:00
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:
1 parent
813c054c18
commit
d89ec2d40b
4 files changed
+24
-4
No files matched your search
@@ -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;
|
||||
|
||||
@@ -280,6 +280,8 @@ pub struct decoder? implements base.image_decoder(
|
||||
bitstream_ri : base.u32[..= 0x800],
|
||||
bitstream_wi : base.u32[..= 0x800],
|
||||
|
||||
bitstream_is_closed : base.bool,
|
||||
|
||||
// bitstream_padding is the number (per restart) of implicit zeroes
|
||||
// remaining at the end of the bitstream. Its initial 12345 value is
|
||||
// arbitrary.
|
||||
@@ -1311,6 +1313,14 @@ pri func decoder.decode_sos?(src: base.io_reader, workbuf: slice base.u8) {
|
||||
break.fill_bitstream
|
||||
} else if this.bitstream_padding == 0 {
|
||||
return "#bad SOS marker"
|
||||
} else if args.src.is_closed() and (not this.bitstream_is_closed) {
|
||||
if this.bitstream_wi < (0x800 / 2) {
|
||||
assert this.bitstream_wi <= (this.bitstream_wi + 264) via "a <= (a + b): 0 <= b"()
|
||||
this.bitstream_buffer[this.bitstream_wi .. (this.bitstream_wi + 264)].bulk_memset!(byte_value: 0)
|
||||
this.bitstream_wi += 264
|
||||
this.bitstream_is_closed = true
|
||||
}
|
||||
break.fill_bitstream
|
||||
}
|
||||
yield? base."$short read"
|
||||
} endwhile.fill_bitstream
|
||||
@@ -2051,6 +2061,7 @@ pub func decoder.restart_frame!(index: base.u64, io_position: base.u64) base.sta
|
||||
}
|
||||
|
||||
this.call_sequence = 0x28
|
||||
this.bitstream_is_closed = false
|
||||
this.frame_config_io_position = args.io_position
|
||||
this.scan_count = 0
|
||||
this.restart_interval = this.saved_restart_interval
|
||||
|
||||
@@ -94,8 +94,8 @@ f37cea44 test/3pdata/blinksuite/icc-v2-gbr-422-whole-mcus.jpg
|
||||
2f310e57 test/3pdata/blinksuite/missing-eoi.jpg
|
||||
72bbe2b6 test/3pdata/blinksuite/motion-jpeg-single-frame.jpg
|
||||
0268284a test/3pdata/blinksuite/mu.png
|
||||
0c20dd5a test/3pdata/blinksuite/non-interleaved_progressive-1.jpg
|
||||
5265140a test/3pdata/blinksuite/non-interleaved_progressive.jpg
|
||||
741da22b test/3pdata/blinksuite/non-interleaved_progressive-1.jpg
|
||||
7c1387ad test/3pdata/blinksuite/non-interleaved_progressive.jpg
|
||||
96a8bcfd test/3pdata/blinksuite/oval.png
|
||||
918aa35f test/3pdata/blinksuite/palatted-color-png-gamma-one-color-profile.png
|
||||
f5e09699 test/3pdata/blinksuite/pixel-crack-image-background-webkit-transform-scale.png
|
||||
|
||||
@@ -82,7 +82,7 @@ dcbb225a test/data/hippopotamus.regular.png
|
||||
db2733f5 test/data/muybridge.apng
|
||||
db2733f5 test/data/muybridge.gif
|
||||
d42a13cd test/data/peacock.default.jpeg
|
||||
3fa7f01b test/data/peacock.default.truncated.jpeg
|
||||
91b6bebb test/data/peacock.default.truncated.jpeg
|
||||
d49bab2d test/data/peacock.grayscale.jpeg
|
||||
d42a13cd test/data/peacock.optimize.jpeg
|
||||
bdf8cc70 test/data/peacock.png
|
||||
@@ -98,7 +98,7 @@ b12a7c4f test/data/peacock.progressive.scan005.jpeg
|
||||
0adacc97 test/data/peacock.progressive.scan007.jpeg
|
||||
bc00fee5 test/data/peacock.progressive.scan008.jpeg
|
||||
d42a13cd test/data/peacock.progressive.scan009.jpeg
|
||||
ec5a371f test/data/peacock.progressive.truncated.jpeg
|
||||
245d37de test/data/peacock.progressive.truncated.jpeg
|
||||
951676cc test/data/peacock.q30.jpeg
|
||||
56835223 test/data/peacock.q99.jpeg
|
||||
7fa9064e test/data/peacock.s-very-weird.jpeg
|
||||
|
||||
Reference in new issue
Block a user