std/jpeg: use default Huffman tables if missing

This commit is contained in:
Nigel Tao committed 2023-08-24 16:18:11 +10:00
1 parent eca57ef5b3
commit 4417dcea4e
5 files changed
+273 -11

No files matched your search

+3
View File
@@ -171,6 +171,9 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, sideEffectsOnly bool, depth u
} else {
b.writes("wuffs_base__make_slice_u8_ij(")
}
if lhs.MType().IsReadOnly() {
b.writes("(uint8_t*)")
}
if err := g.writeExpr(b, lhs, false, depth); err != nil {
return err
}
+159 -3
View File
@@ -39170,6 +39170,76 @@ WUFFS_JPEG__EXTEND[16] WUFFS_BASE__POTENTIALLY_UNUSED = {
65281, 65025, 64513, 63489, 61441, 57345, 49153, 32769,
};
static const uint8_t
WUFFS_JPEG__DEFAULT_HUFF_TABLE_DC_LUMA[29] WUFFS_BASE__POTENTIALLY_UNUSED = {
0, 0, 1, 5, 1, 1, 1, 1,
1, 1, 0, 0, 0, 0, 0, 0,
0, 0, 1, 2, 3, 4, 5, 6,
7, 8, 9, 10, 11,
};
static const uint8_t
WUFFS_JPEG__DEFAULT_HUFF_TABLE_DC_CHROMA[29] WUFFS_BASE__POTENTIALLY_UNUSED = {
1, 0, 3, 1, 1, 1, 1, 1,
1, 1, 1, 1, 0, 0, 0, 0,
0, 0, 1, 2, 3, 4, 5, 6,
7, 8, 9, 10, 11,
};
static const uint8_t
WUFFS_JPEG__DEFAULT_HUFF_TABLE_AC_LUMA[179] WUFFS_BASE__POTENTIALLY_UNUSED = {
16, 0, 2, 1, 3, 3, 2, 4,
3, 5, 5, 4, 4, 0, 0, 1,
125, 1, 2, 3, 0, 4, 17, 5,
18, 33, 49, 65, 6, 19, 81, 97,
7, 34, 113, 20, 50, 129, 145, 161,
8, 35, 66, 177, 193, 21, 82, 209,
240, 36, 51, 98, 114, 130, 9, 10,
22, 23, 24, 25, 26, 37, 38, 39,
40, 41, 42, 52, 53, 54, 55, 56,
57, 58, 67, 68, 69, 70, 71, 72,
73, 74, 83, 84, 85, 86, 87, 88,
89, 90, 99, 100, 101, 102, 103, 104,
105, 106, 115, 116, 117, 118, 119, 120,
121, 122, 131, 132, 133, 134, 135, 136,
137, 138, 146, 147, 148, 149, 150, 151,
152, 153, 154, 162, 163, 164, 165, 166,
167, 168, 169, 170, 178, 179, 180, 181,
182, 183, 184, 185, 186, 194, 195, 196,
197, 198, 199, 200, 201, 202, 210, 211,
212, 213, 214, 215, 216, 217, 218, 225,
226, 227, 228, 229, 230, 231, 232, 233,
234, 241, 242, 243, 244, 245, 246, 247,
248, 249, 250,
};
static const uint8_t
WUFFS_JPEG__DEFAULT_HUFF_TABLE_AC_CHROMA[179] WUFFS_BASE__POTENTIALLY_UNUSED = {
17, 0, 2, 1, 2, 4, 4, 3,
4, 7, 5, 4, 4, 0, 1, 2,
119, 0, 1, 2, 3, 17, 4, 5,
33, 49, 6, 18, 65, 81, 7, 97,
113, 19, 34, 50, 129, 8, 20, 66,
145, 161, 177, 193, 9, 35, 51, 82,
240, 21, 98, 114, 209, 10, 22, 36,
52, 225, 37, 241, 23, 24, 25, 26,
38, 39, 40, 41, 42, 53, 54, 55,
56, 57, 58, 67, 68, 69, 70, 71,
72, 73, 74, 83, 84, 85, 86, 87,
88, 89, 90, 99, 100, 101, 102, 103,
104, 105, 106, 115, 116, 117, 118, 119,
120, 121, 122, 130, 131, 132, 133, 134,
135, 136, 137, 138, 146, 147, 148, 149,
150, 151, 152, 153, 154, 162, 163, 164,
165, 166, 167, 168, 169, 170, 178, 179,
180, 181, 182, 183, 184, 185, 186, 194,
195, 196, 197, 198, 199, 200, 201, 202,
210, 211, 212, 213, 214, 215, 216, 217,
218, 226, 227, 228, 229, 230, 231, 232,
233, 234, 242, 243, 244, 245, 246, 247,
248, 249, 250,
};
// ---------------- Private Initializer Prototypes
// ---------------- Private Function Prototypes
@@ -39284,6 +39354,12 @@ wuffs_jpeg__decoder__prepare_scan(
wuffs_jpeg__decoder* self,
wuffs_base__io_buffer* a_src);
WUFFS_BASE__GENERATED_C_CODE
static wuffs_base__status
wuffs_jpeg__decoder__use_default_huffman_table(
wuffs_jpeg__decoder* self,
uint8_t a_tc4_th);
WUFFS_BASE__GENERATED_C_CODE
static wuffs_base__empty_struct
wuffs_jpeg__decoder__calculate_single_component_scan_fields(
@@ -43273,9 +43349,19 @@ wuffs_jpeg__decoder__prepare_scan(
}
v_i = 0u;
while (v_i < self->private_impl.f_scan_num_components) {
if (((self->private_impl.f_scan_ss == 0u) && ! self->private_impl.f_seen_dht[(0u | self->private_impl.f_scan_comps_td[v_i])]) || ((self->private_impl.f_scan_se != 0u) && ! self->private_impl.f_seen_dht[(4u | self->private_impl.f_scan_comps_ta[v_i])])) {
status = wuffs_base__make_status(wuffs_jpeg__error__missing_huffman_table);
goto exit;
if ((self->private_impl.f_scan_ss == 0u) && ! self->private_impl.f_seen_dht[(0u | self->private_impl.f_scan_comps_td[v_i])]) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
status = wuffs_jpeg__decoder__use_default_huffman_table(self, (0u | self->private_impl.f_scan_comps_td[v_i]));
if (status.repr) {
goto suspend;
}
}
if ((self->private_impl.f_scan_se != 0u) && ! self->private_impl.f_seen_dht[(4u | self->private_impl.f_scan_comps_ta[v_i])]) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
status = wuffs_jpeg__decoder__use_default_huffman_table(self, (4u | self->private_impl.f_scan_comps_ta[v_i]));
if (status.repr) {
goto suspend;
}
}
v_j = ((uint32_t)(self->private_impl.f_scan_ss));
v_j_max_incl = ((uint32_t)(wuffs_base__u8__min(self->private_impl.f_scan_se, 9u)));
@@ -43315,6 +43401,76 @@ wuffs_jpeg__decoder__prepare_scan(
return status;
}
// -------- func jpeg.decoder.use_default_huffman_table
WUFFS_BASE__GENERATED_C_CODE
static wuffs_base__status
wuffs_jpeg__decoder__use_default_huffman_table(
wuffs_jpeg__decoder* self,
uint8_t a_tc4_th) {
wuffs_base__status status = wuffs_base__make_status(NULL);
wuffs_base__slice_u8 v_data = {0};
wuffs_base__io_buffer u_r = wuffs_base__empty_io_buffer();
wuffs_base__io_buffer* v_r = &u_r;
const uint8_t* iop_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
const uint8_t* io0_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
const uint8_t* io1_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
const uint8_t* io2_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
wuffs_base__status v_status = wuffs_base__make_status(NULL);
if (a_tc4_th == 0u) {
v_data = wuffs_base__make_slice_u8((uint8_t*)WUFFS_JPEG__DEFAULT_HUFF_TABLE_DC_LUMA, 29);
} else if (a_tc4_th == 1u) {
v_data = wuffs_base__make_slice_u8((uint8_t*)WUFFS_JPEG__DEFAULT_HUFF_TABLE_DC_CHROMA, 29);
} else if (a_tc4_th == 4u) {
v_data = wuffs_base__make_slice_u8((uint8_t*)WUFFS_JPEG__DEFAULT_HUFF_TABLE_AC_LUMA, 179);
} else if (a_tc4_th == 5u) {
v_data = wuffs_base__make_slice_u8((uint8_t*)WUFFS_JPEG__DEFAULT_HUFF_TABLE_AC_CHROMA, 179);
} else {
status = wuffs_base__make_status(wuffs_jpeg__error__missing_huffman_table);
goto exit;
}
{
wuffs_base__io_buffer* o_0_v_r = v_r;
const uint8_t *o_0_iop_v_r = iop_v_r;
const uint8_t *o_0_io0_v_r = io0_v_r;
const uint8_t *o_0_io1_v_r = io1_v_r;
const uint8_t *o_0_io2_v_r = io2_v_r;
v_r = wuffs_base__io_reader__set(
&u_r,
&iop_v_r,
&io0_v_r,
&io1_v_r,
&io2_v_r,
v_data,
0u);
self->private_impl.f_payload_length = ((uint32_t)((((uint64_t)(v_data.len)) & 65535u)));
{
wuffs_base__status t_0 = wuffs_jpeg__decoder__decode_dht(self, v_r);
v_status = t_0;
}
v_r = o_0_v_r;
iop_v_r = o_0_iop_v_r;
io0_v_r = o_0_io0_v_r;
io1_v_r = o_0_io1_v_r;
io2_v_r = o_0_io2_v_r;
}
status = v_status;
if (wuffs_base__status__is_error(&status)) {
goto exit;
} else if (wuffs_base__status__is_suspension(&status)) {
status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
goto exit;
}
goto ok;
ok:
goto exit;
exit:
return status;
}
// -------- func jpeg.decoder.calculate_single_component_scan_fields
WUFFS_BASE__GENERATED_C_CODE
+80
View File
@@ -153,3 +153,83 @@ pri const EXTEND : roarray[16] base.u16 = [
0x0000, 0xFFFF, 0xFFFD, 0xFFF9, 0xFFF1, 0xFFE1, 0xFFC1, 0xFF81,
0xFF01, 0xFE01, 0xFC01, 0xF801, 0xF001, 0xE001, 0xC001, 0x8001,
]
// The DEFAULT_HUFF_TABLE_ETC numbers come from section K.3 "Typical Huffman
// tables for 8-bit precision luminance and chrominance" and
// https://github.com/libjpeg-turbo/libjpeg-turbo/commit/a113506d175d03ae0e40965c3d3d21a5d561e119
pri const DEFAULT_HUFF_TABLE_DC_LUMA : roarray[1 + 16 + 12] base.u8 = [
// tc=0, th=0.
0x00,
// 16 counts (totalling 12).
0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0,
// 12 symbols.
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
]
pri const DEFAULT_HUFF_TABLE_DC_CHROMA : roarray[1 + 16 + 12] base.u8 = [
// tc=0, th=1.
0x01,
// 16 counts (totalling 12).
0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
// 12 symbols.
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
]
pri const DEFAULT_HUFF_TABLE_AC_LUMA : roarray[1 + 16 + 162] base.u8 = [
// tc=1, th=0.
0x10,
// 16 counts (totalling 162).
0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 125,
// 162 symbols.
0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xA1, 0x08,
0x23, 0x42, 0xB1, 0xC1, 0x15, 0x52, 0xD1, 0xF0,
0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0A, 0x16,
0x17, 0x18, 0x19, 0x1A, 0x25, 0x26, 0x27, 0x28,
0x29, 0x2A, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
0x3A, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
0x4A, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
0x5A, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
0x7A, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
0x99, 0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7,
0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6,
0xB7, 0xB8, 0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5,
0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xD2, 0xD3, 0xD4,
0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xE1, 0xE2,
0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA,
0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8,
0xF9, 0xFA,
]
pri const DEFAULT_HUFF_TABLE_AC_CHROMA : roarray[1 + 16 + 162] base.u8 = [
// tc=1, th=1.
0x11,
// 16 counts (totalling 162).
0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 119,
// 162 symbols.
0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
0xA1, 0xB1, 0xC1, 0x09, 0x23, 0x33, 0x52, 0xF0,
0x15, 0x62, 0x72, 0xD1, 0x0A, 0x16, 0x24, 0x34,
0xE1, 0x25, 0xF1, 0x17, 0x18, 0x19, 0x1A, 0x26,
0x27, 0x28, 0x29, 0x2A, 0x35, 0x36, 0x37, 0x38,
0x39, 0x3A, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
0x49, 0x4A, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
0x59, 0x5A, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
0x69, 0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
0x79, 0x7A, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
0x88, 0x89, 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96,
0x97, 0x98, 0x99, 0x9A, 0xA2, 0xA3, 0xA4, 0xA5,
0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4,
0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xC2, 0xC3,
0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xD2,
0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA,
0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9,
0xEA, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8,
0xF9, 0xFA,
]
+30 -7
View File
@@ -1484,13 +1484,12 @@ pri func decoder.prepare_scan?(src: base.io_reader) {
i = 0
while i < this.scan_num_components {
assert i < 4 via "a < b: a < c; c <= b"(c: this.scan_num_components)
if ((this.scan_ss == 0) and (not this.seen_dht[0 | this.scan_comps_td[i]])) or
((this.scan_se <> 0) and (not this.seen_dht[4 | this.scan_comps_ta[i]])) {
// TODO: while not required by the spec, we could fall back to
// implicit tables? See section K.3 "Typical Huffman tables for
// 8-bit precision luminance and chrominance" and
// https://github.com/libjpeg-turbo/libjpeg-turbo/commit/a113506d175d03ae0e40965c3d3d21a5d561e119
return "#missing Huffman table"
if (this.scan_ss == 0) and (not this.seen_dht[0 | this.scan_comps_td[i]]) {
this.use_default_huffman_table?(tc4_th: 0 | this.scan_comps_td[i])
}
if (this.scan_se <> 0) and (not this.seen_dht[4 | this.scan_comps_ta[i]]) {
this.use_default_huffman_table?(tc4_th: 4 | this.scan_comps_ta[i])
}
j = this.scan_ss as base.u32
@@ -1516,6 +1515,30 @@ pri func decoder.prepare_scan?(src: base.io_reader) {
}
}
pri func decoder.use_default_huffman_table?(tc4_th: base.u8[..= 7]) {
var data : roslice base.u8
var r : base.io_reader
var status : base.status
if args.tc4_th == 0 {
data = DEFAULT_HUFF_TABLE_DC_LUMA[..]
} else if args.tc4_th == 1 {
data = DEFAULT_HUFF_TABLE_DC_CHROMA[..]
} else if args.tc4_th == 4 {
data = DEFAULT_HUFF_TABLE_AC_LUMA[..]
} else if args.tc4_th == 5 {
data = DEFAULT_HUFF_TABLE_AC_CHROMA[..]
} else {
return "#missing Huffman table"
}
io_bind (io: r, data: data, history_position: 0) {
this.payload_length = (data.length() & 0xFFFF) as base.u32
status =? this.decode_dht?(src: r)
}
return status
}
pri func decoder.calculate_single_component_scan_fields!() {
var csel : base.u8[..= 3]
+1 -1
View File
@@ -92,7 +92,7 @@ f37cea44 test/3pdata/blinksuite/icc-v2-gbr-422-whole-mcus.jpg
0da5f37e test/3pdata/blinksuite/jpeg-height-exif-orientation.jpg
4409dca6 test/3pdata/blinksuite/large-gif-checkerboard.gif
9a1b1c39 test/3pdata/blinksuite/missing-eoi.jpg
263cb2b3 test/3pdata/blinksuite/motion-jpeg-single-frame.jpg
72bbe2b6 test/3pdata/blinksuite/motion-jpeg-single-frame.jpg
0268284a test/3pdata/blinksuite/mu.png
263cb2b3 test/3pdata/blinksuite/non-interleaved_progressive-1.jpg
5265140a test/3pdata/blinksuite/non-interleaved_progressive.jpg