mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 08:38:14 +01:00
std/jpeg: use default Huffman tables if missing
This commit is contained in:
1 parent
eca57ef5b3
commit
4417dcea4e
5 files changed
+273
-11
No files matched your search
@@ -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
|
||||
|
||||
Reference in new issue
Block a user