mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Roll back 'decode truncated... on MCU boundaries'
See the previous commit for the rationale.
This commit is contained in:
1 parent
a3cecef69a
commit
186bdc5fe2
4 files changed
+10
-41
No files matched your search
@@ -9201,7 +9201,6 @@ struct wuffs_jpeg__decoder__struct {
|
||||
uint32_t f_bitstream_n_bits;
|
||||
uint32_t f_bitstream_ri;
|
||||
uint32_t f_bitstream_wi;
|
||||
uint32_t f_bitstream_zi;
|
||||
bool f_bitstream_is_closed;
|
||||
uint32_t f_bitstream_padding;
|
||||
uint16_t f_quant_tables[4][64];
|
||||
@@ -43085,9 +43084,8 @@ wuffs_jpeg__decoder__decode_sos(
|
||||
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) {
|
||||
self->private_impl.f_bitstream_zi = self->private_impl.f_bitstream_wi;
|
||||
wuffs_base__bulk_memset(&self->private_data.f_bitstream_buffer[self->private_impl.f_bitstream_wi], 999u, 0u);
|
||||
self->private_impl.f_bitstream_wi += 999u;
|
||||
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;
|
||||
@@ -43127,14 +43125,10 @@ wuffs_jpeg__decoder__decode_sos(
|
||||
self->private_impl.f_bitstream_padding = 12345u;
|
||||
}
|
||||
}
|
||||
if (self->private_impl.f_bitstream_is_closed && (self->private_impl.f_bitstream_ri >= (self->private_impl.f_bitstream_zi + (self->private_impl.f_bitstream_n_bits / 8u)))) {
|
||||
goto label__outer__break;
|
||||
}
|
||||
v_mx += 1u;
|
||||
}
|
||||
v_my += 1u;
|
||||
}
|
||||
label__outer__break:;
|
||||
wuffs_base__u32__sat_add_indirect(&self->private_impl.f_scan_count, 1u);
|
||||
|
||||
ok:
|
||||
@@ -43588,12 +43582,6 @@ wuffs_jpeg__decoder__fill_bitstream(
|
||||
io2_a_src = io0_a_src + a_src->meta.wi;
|
||||
}
|
||||
|
||||
if (self->private_impl.f_bitstream_is_closed) {
|
||||
if (a_src && a_src->data.ptr) {
|
||||
a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
|
||||
}
|
||||
return wuffs_base__make_empty_struct();
|
||||
}
|
||||
if (self->private_impl.f_bitstream_ri <= 0u) {
|
||||
} else if (self->private_impl.f_bitstream_ri >= self->private_impl.f_bitstream_wi) {
|
||||
self->private_impl.f_bitstream_ri = 0u;
|
||||
|
||||
@@ -280,15 +280,6 @@ pub struct decoder? implements base.image_decoder(
|
||||
bitstream_ri : base.u32[..= 0x800],
|
||||
bitstream_wi : base.u32[..= 0x800],
|
||||
|
||||
// This is the index (like bitstream_ri and bitstream_wi) where "EOF
|
||||
// means implicit zeroes" kicked in. It only affects truncated
|
||||
// (malformed) JPEGs, and in that case, encourages decoding to finish
|
||||
// on an MCU boundary. This behavior is closer to how libjpeg-turbo
|
||||
// works (again, on truncated JPEGs; well-formed JPEGs are unaffected),
|
||||
// but it does have a performance penalty. It's not clear that it's
|
||||
// worth keeping.
|
||||
bitstream_zi : base.u32[..= 0x800],
|
||||
|
||||
bitstream_is_closed : base.bool,
|
||||
|
||||
// bitstream_padding is the number (per restart) of implicit zeroes
|
||||
@@ -1287,7 +1278,7 @@ pri func decoder.decode_sos?(src: base.io_reader, workbuf: slice base.u8) {
|
||||
this.fill_bitstream!(src: args.src)
|
||||
|
||||
my = 0
|
||||
while.outer my < this.scan_height_in_mcus {
|
||||
while my < this.scan_height_in_mcus {
|
||||
assert my < 0x2000 via "a < b: a < c; c <= b"(c: this.scan_height_in_mcus)
|
||||
mx = 0
|
||||
while mx < this.scan_width_in_mcus,
|
||||
@@ -1324,11 +1315,9 @@ pri func decoder.decode_sos?(src: base.io_reader, workbuf: slice base.u8) {
|
||||
return "#bad SOS marker"
|
||||
} else if args.src.is_closed() and (not this.bitstream_is_closed) {
|
||||
if this.bitstream_wi < (0x800 / 2) {
|
||||
// 999 is arbitrary, but bigger than (2 * 264).
|
||||
assert this.bitstream_wi <= (this.bitstream_wi + 999) via "a <= (a + b): 0 <= b"()
|
||||
this.bitstream_zi = this.bitstream_wi
|
||||
this.bitstream_buffer[this.bitstream_wi .. (this.bitstream_wi + 999)].bulk_memset!(byte_value: 0)
|
||||
this.bitstream_wi += 999
|
||||
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
|
||||
@@ -1362,14 +1351,10 @@ pri func decoder.decode_sos?(src: base.io_reader, workbuf: slice base.u8) {
|
||||
}
|
||||
}
|
||||
|
||||
if this.bitstream_is_closed and (this.bitstream_ri >= (this.bitstream_zi + (this.bitstream_n_bits / 8))) {
|
||||
break.outer
|
||||
}
|
||||
|
||||
mx += 1
|
||||
} endwhile
|
||||
my += 1
|
||||
} endwhile.outer
|
||||
} endwhile
|
||||
|
||||
this.scan_count ~sat+= 1
|
||||
}
|
||||
@@ -1658,10 +1643,6 @@ pri func decoder.fill_bitstream!(src: base.io_reader) {
|
||||
var c : base.u8
|
||||
var new_wi : base.u32[..= 0x800]
|
||||
|
||||
if this.bitstream_is_closed {
|
||||
return nothing
|
||||
}
|
||||
|
||||
// Compact unread bytes to the start of the buffer.
|
||||
if this.bitstream_ri <= 0 {
|
||||
// No-op.
|
||||
|
||||
@@ -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
|
||||
3a8f4a53 test/3pdata/blinksuite/non-interleaved_progressive-1.jpg
|
||||
595c9d21 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
|
||||
|
||||
@@ -84,7 +84,7 @@ db2733f5 test/data/muybridge.gif
|
||||
d42a13cd test/data/peacock.default.jpeg
|
||||
c8a50351 test/data/peacock.default.truncated.decoded-by-djpeg.png
|
||||
91b6bebb test/data/peacock.default.truncated.decoded-by-wuffs.png
|
||||
c8a50351 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
|
||||
|
||||
Reference in new issue
Block a user