diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index f1c9f02d..f2c04aae 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -9264,11 +9264,17 @@ struct wuffs_png__decoder__struct { uint64_t f_overall_workbuf_length; uint64_t f_pass_workbuf_length; uint8_t f_call_sequence; + bool f_report_metadata_chrm; + bool f_report_metadata_gama; + bool f_report_metadata_iccp; bool f_ignore_checksum; uint8_t f_depth; uint8_t f_color_type; uint8_t f_filter_distance; uint8_t f_interlace_pass; + bool f_seen_chrm; + bool f_seen_gama; + bool f_seen_iccp; bool f_seen_plte; bool f_seen_trns; uint32_t f_dst_pixfmt; @@ -9277,6 +9283,11 @@ struct wuffs_png__decoder__struct { uint8_t f_chunk_type_array[4]; uint64_t f_chunk_length; uint64_t f_frame_config_io_position; + uint32_t f_metadata_flavor; + uint32_t f_metadata_fourcc; + uint64_t f_metadata_x; + uint64_t f_metadata_y; + uint64_t f_metadata_z; wuffs_base__pixel_swizzler f_swizzler; wuffs_base__empty_struct (*choosy_filter_1)( @@ -9293,6 +9304,8 @@ struct wuffs_png__decoder__struct { uint32_t p_decode_image_config[1]; uint32_t p_decode_ihdr[1]; uint32_t p_decode_other_chunk[1]; + uint32_t p_decode_chrm[1]; + uint32_t p_decode_gama[1]; uint32_t p_decode_plte[1]; uint32_t p_decode_trns[1]; uint32_t p_decode_frame_config[1]; @@ -9320,6 +9333,12 @@ struct wuffs_png__decoder__struct { struct { uint64_t scratch; } s_decode_other_chunk[1]; + struct { + uint64_t scratch; + } s_decode_chrm[1]; + struct { + uint64_t scratch; + } s_decode_gama[1]; struct { uint32_t v_num_entries; uint32_t v_i; @@ -35132,6 +35151,16 @@ wuffs_png__decoder__decode_other_chunk( wuffs_png__decoder* self, wuffs_base__io_buffer* a_src); +static wuffs_base__status +wuffs_png__decoder__decode_chrm( + wuffs_png__decoder* self, + wuffs_base__io_buffer* a_src); + +static wuffs_base__status +wuffs_png__decoder__decode_gama( + wuffs_png__decoder* self, + wuffs_base__io_buffer* a_src); + static wuffs_base__status wuffs_png__decoder__decode_plte( wuffs_png__decoder* self, @@ -36766,7 +36795,8 @@ wuffs_png__decoder__decode_image_config( switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; - if (self->private_impl.f_call_sequence != 0) { + if (self->private_impl.f_call_sequence == 2) { + } else if (self->private_impl.f_call_sequence != 0) { status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence); goto exit; } else { @@ -37023,6 +37053,11 @@ wuffs_png__decoder__decode_image_config( status = wuffs_base__make_status(wuffs_png__error__bad_checksum); goto exit; } + if (self->private_impl.f_metadata_fourcc != 0) { + self->private_impl.f_call_sequence = 1; + status = wuffs_base__make_status(wuffs_base__note__metadata_reported); + goto ok; + } } label__1__break:; if ((self->private_impl.f_color_type == 3) && ! self->private_impl.f_seen_plte) { @@ -37448,6 +37483,40 @@ wuffs_png__decoder__decode_other_chunk( goto suspend; } self->private_impl.f_seen_plte = true; + } else if ((self->private_impl.f_chunk_type == 1297238115) && self->private_impl.f_report_metadata_chrm) { + if (self->private_impl.f_seen_chrm) { + status = wuffs_base__make_status(wuffs_png__error__bad_chunk); + goto exit; + } + if (a_src) { + a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); + } + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); + status = wuffs_png__decoder__decode_chrm(self, a_src); + if (a_src) { + iop_a_src = a_src->data.ptr + a_src->meta.ri; + } + if (status.repr) { + goto suspend; + } + self->private_impl.f_seen_chrm = true; + } else if ((self->private_impl.f_chunk_type == 1095582055) && self->private_impl.f_report_metadata_gama) { + if (self->private_impl.f_seen_gama) { + status = wuffs_base__make_status(wuffs_png__error__bad_chunk); + goto exit; + } + if (a_src) { + a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); + } + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); + status = wuffs_png__decoder__decode_gama(self, a_src); + if (a_src) { + iop_a_src = a_src->data.ptr + a_src->meta.ri; + } + if (status.repr) { + goto suspend; + } + self->private_impl.f_seen_gama = true; } else if (self->private_impl.f_chunk_type == 1397641844) { if (self->private_impl.f_seen_trns || (self->private_impl.f_color_type > 3) || ((self->private_impl.f_color_type == 3) && ! self->private_impl.f_seen_plte)) { status = wuffs_base__make_status(wuffs_png__error__bad_chunk); @@ -37456,7 +37525,7 @@ wuffs_png__decoder__decode_other_chunk( if (a_src) { a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); status = wuffs_png__decoder__decode_trns(self, a_src); if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; @@ -37467,7 +37536,7 @@ wuffs_png__decoder__decode_other_chunk( self->private_impl.f_seen_trns = true; } else { self->private_data.s_decode_other_chunk[0].scratch = self->private_impl.f_chunk_length; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); if (self->private_data.s_decode_other_chunk[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) { self->private_data.s_decode_other_chunk[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src)); iop_a_src = io2_a_src; @@ -37496,6 +37565,382 @@ wuffs_png__decoder__decode_other_chunk( return status; } +// -------- func png.decoder.decode_chrm + +static wuffs_base__status +wuffs_png__decoder__decode_chrm( + wuffs_png__decoder* self, + wuffs_base__io_buffer* a_src) { + wuffs_base__status status = wuffs_base__make_status(NULL); + + uint64_t v_u = 0; + + const uint8_t* iop_a_src = NULL; + const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + if (a_src) { + io0_a_src = a_src->data.ptr; + io1_a_src = io0_a_src + a_src->meta.ri; + iop_a_src = io1_a_src; + io2_a_src = io0_a_src + a_src->meta.wi; + } + + uint32_t coro_susp_point = self->private_impl.p_decode_chrm[0]; + switch (coro_susp_point) { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; + + if (self->private_impl.f_chunk_length != 32) { + status = wuffs_base__make_status(wuffs_png__error__bad_chunk); + goto exit; + } + self->private_impl.f_metadata_flavor = 4; + self->private_impl.f_metadata_fourcc = 1128813133; + self->private_impl.f_metadata_x = 0; + self->private_impl.f_metadata_y = 0; + self->private_impl.f_metadata_z = 0; + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); + uint64_t t_0; + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) { + t_0 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src))); + iop_a_src += 4; + } else { + self->private_data.s_decode_chrm[0].scratch = 0; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); + while (true) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint64_t* scratch = &self->private_data.s_decode_chrm[0].scratch; + uint32_t num_bits_0 = ((uint32_t)(*scratch & 0xFF)); + *scratch >>= 8; + *scratch <<= 8; + *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_0); + if (num_bits_0 == 24) { + t_0 = ((uint64_t)(*scratch >> 32)); + break; + } + num_bits_0 += 8; + *scratch |= ((uint64_t)(num_bits_0)); + } + } + v_u = t_0; + } + self->private_impl.f_metadata_x |= ((16777215 & v_u) << 0); + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); + uint64_t t_1; + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) { + t_1 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src))); + iop_a_src += 4; + } else { + self->private_data.s_decode_chrm[0].scratch = 0; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); + while (true) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint64_t* scratch = &self->private_data.s_decode_chrm[0].scratch; + uint32_t num_bits_1 = ((uint32_t)(*scratch & 0xFF)); + *scratch >>= 8; + *scratch <<= 8; + *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_1); + if (num_bits_1 == 24) { + t_1 = ((uint64_t)(*scratch >> 32)); + break; + } + num_bits_1 += 8; + *scratch |= ((uint64_t)(num_bits_1)); + } + } + v_u = t_1; + } + self->private_impl.f_metadata_x |= ((16777215 & v_u) << 24); + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); + uint64_t t_2; + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) { + t_2 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src))); + iop_a_src += 4; + } else { + self->private_data.s_decode_chrm[0].scratch = 0; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); + while (true) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint64_t* scratch = &self->private_data.s_decode_chrm[0].scratch; + uint32_t num_bits_2 = ((uint32_t)(*scratch & 0xFF)); + *scratch >>= 8; + *scratch <<= 8; + *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_2); + if (num_bits_2 == 24) { + t_2 = ((uint64_t)(*scratch >> 32)); + break; + } + num_bits_2 += 8; + *scratch |= ((uint64_t)(num_bits_2)); + } + } + v_u = t_2; + } + self->private_impl.f_metadata_x |= ((uint64_t)((16777215 & v_u) << 48)); + self->private_impl.f_metadata_y |= ((16777215 & v_u) >> 16); + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); + uint64_t t_3; + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) { + t_3 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src))); + iop_a_src += 4; + } else { + self->private_data.s_decode_chrm[0].scratch = 0; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); + while (true) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint64_t* scratch = &self->private_data.s_decode_chrm[0].scratch; + uint32_t num_bits_3 = ((uint32_t)(*scratch & 0xFF)); + *scratch >>= 8; + *scratch <<= 8; + *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_3); + if (num_bits_3 == 24) { + t_3 = ((uint64_t)(*scratch >> 32)); + break; + } + num_bits_3 += 8; + *scratch |= ((uint64_t)(num_bits_3)); + } + } + v_u = t_3; + } + self->private_impl.f_metadata_y |= ((16777215 & v_u) << 8); + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9); + uint64_t t_4; + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) { + t_4 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src))); + iop_a_src += 4; + } else { + self->private_data.s_decode_chrm[0].scratch = 0; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10); + while (true) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint64_t* scratch = &self->private_data.s_decode_chrm[0].scratch; + uint32_t num_bits_4 = ((uint32_t)(*scratch & 0xFF)); + *scratch >>= 8; + *scratch <<= 8; + *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_4); + if (num_bits_4 == 24) { + t_4 = ((uint64_t)(*scratch >> 32)); + break; + } + num_bits_4 += 8; + *scratch |= ((uint64_t)(num_bits_4)); + } + } + v_u = t_4; + } + self->private_impl.f_metadata_y |= ((16777215 & v_u) << 32); + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11); + uint64_t t_5; + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) { + t_5 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src))); + iop_a_src += 4; + } else { + self->private_data.s_decode_chrm[0].scratch = 0; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(12); + while (true) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint64_t* scratch = &self->private_data.s_decode_chrm[0].scratch; + uint32_t num_bits_5 = ((uint32_t)(*scratch & 0xFF)); + *scratch >>= 8; + *scratch <<= 8; + *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_5); + if (num_bits_5 == 24) { + t_5 = ((uint64_t)(*scratch >> 32)); + break; + } + num_bits_5 += 8; + *scratch |= ((uint64_t)(num_bits_5)); + } + } + v_u = t_5; + } + self->private_impl.f_metadata_y |= ((uint64_t)((16777215 & v_u) << 56)); + self->private_impl.f_metadata_z |= ((16777215 & v_u) >> 8); + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(13); + uint64_t t_6; + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) { + t_6 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src))); + iop_a_src += 4; + } else { + self->private_data.s_decode_chrm[0].scratch = 0; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(14); + while (true) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint64_t* scratch = &self->private_data.s_decode_chrm[0].scratch; + uint32_t num_bits_6 = ((uint32_t)(*scratch & 0xFF)); + *scratch >>= 8; + *scratch <<= 8; + *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_6); + if (num_bits_6 == 24) { + t_6 = ((uint64_t)(*scratch >> 32)); + break; + } + num_bits_6 += 8; + *scratch |= ((uint64_t)(num_bits_6)); + } + } + v_u = t_6; + } + self->private_impl.f_metadata_z |= ((16777215 & v_u) << 16); + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15); + uint64_t t_7; + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) { + t_7 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src))); + iop_a_src += 4; + } else { + self->private_data.s_decode_chrm[0].scratch = 0; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(16); + while (true) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint64_t* scratch = &self->private_data.s_decode_chrm[0].scratch; + uint32_t num_bits_7 = ((uint32_t)(*scratch & 0xFF)); + *scratch >>= 8; + *scratch <<= 8; + *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_7); + if (num_bits_7 == 24) { + t_7 = ((uint64_t)(*scratch >> 32)); + break; + } + num_bits_7 += 8; + *scratch |= ((uint64_t)(num_bits_7)); + } + } + v_u = t_7; + } + self->private_impl.f_metadata_z |= ((16777215 & v_u) << 40); + + goto ok; + ok: + self->private_impl.p_decode_chrm[0] = 0; + goto exit; + } + + goto suspend; + suspend: + self->private_impl.p_decode_chrm[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0; + + goto exit; + exit: + if (a_src) { + a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); + } + + return status; +} + +// -------- func png.decoder.decode_gama + +static wuffs_base__status +wuffs_png__decoder__decode_gama( + wuffs_png__decoder* self, + wuffs_base__io_buffer* a_src) { + wuffs_base__status status = wuffs_base__make_status(NULL); + + const uint8_t* iop_a_src = NULL; + const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + if (a_src) { + io0_a_src = a_src->data.ptr; + io1_a_src = io0_a_src + a_src->meta.ri; + iop_a_src = io1_a_src; + io2_a_src = io0_a_src + a_src->meta.wi; + } + + uint32_t coro_susp_point = self->private_impl.p_decode_gama[0]; + switch (coro_susp_point) { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; + + if (self->private_impl.f_chunk_length != 4) { + status = wuffs_base__make_status(wuffs_png__error__bad_chunk); + goto exit; + } + self->private_impl.f_metadata_flavor = 4; + self->private_impl.f_metadata_fourcc = 1195461953; + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); + uint64_t t_0; + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) { + t_0 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src))); + iop_a_src += 4; + } else { + self->private_data.s_decode_gama[0].scratch = 0; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); + while (true) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint64_t* scratch = &self->private_data.s_decode_gama[0].scratch; + uint32_t num_bits_0 = ((uint32_t)(*scratch & 0xFF)); + *scratch >>= 8; + *scratch <<= 8; + *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_0); + if (num_bits_0 == 24) { + t_0 = ((uint64_t)(*scratch >> 32)); + break; + } + num_bits_0 += 8; + *scratch |= ((uint64_t)(num_bits_0)); + } + } + self->private_impl.f_metadata_x = t_0; + } + self->private_impl.f_metadata_y = 0; + self->private_impl.f_metadata_z = 0; + + goto ok; + ok: + self->private_impl.p_decode_gama[0] = 0; + goto exit; + } + + goto suspend; + suspend: + self->private_impl.p_decode_gama[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0; + + goto exit; + exit: + if (a_src) { + a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); + } + + return status; +} + // -------- func png.decoder.decode_plte static wuffs_base__status @@ -38325,6 +38770,20 @@ wuffs_png__decoder__set_report_metadata( wuffs_png__decoder* self, uint32_t a_fourcc, bool a_report) { + if (!self) { + return wuffs_base__make_empty_struct(); + } + if (self->private_impl.magic != WUFFS_BASE__MAGIC) { + return wuffs_base__make_empty_struct(); + } + + if (a_fourcc == 1128813133) { + self->private_impl.f_report_metadata_chrm = a_report; + } else if (a_fourcc == 1195461953) { + self->private_impl.f_report_metadata_gama = a_report; + } else if (a_fourcc == 1229144912) { + self->private_impl.f_report_metadata_iccp = a_report; + } return wuffs_base__make_empty_struct(); } @@ -38357,10 +38816,31 @@ wuffs_png__decoder__tell_me_more( self->private_impl.active_coroutine = 0; wuffs_base__status status = wuffs_base__make_status(NULL); - status = wuffs_base__make_status(wuffs_base__error__no_more_information); - goto exit; - + if (self->private_impl.f_call_sequence != 1) { + status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence); + goto exit; + } + if (self->private_impl.f_metadata_fourcc == 0) { + status = wuffs_base__make_status(wuffs_base__error__no_more_information); + goto exit; + } + if (a_minfo != NULL) { + wuffs_base__more_information__set(a_minfo, + self->private_impl.f_metadata_flavor, + self->private_impl.f_metadata_fourcc, + self->private_impl.f_metadata_x, + self->private_impl.f_metadata_y, + self->private_impl.f_metadata_z); + } + self->private_impl.f_call_sequence = 2; + self->private_impl.f_metadata_flavor = 0; + self->private_impl.f_metadata_fourcc = 0; + self->private_impl.f_metadata_x = 0; + self->private_impl.f_metadata_y = 0; + self->private_impl.f_metadata_z = 0; + status = wuffs_base__make_status(NULL); goto ok; + ok: goto exit; exit: diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index d24d2c55..60f2b944 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -40,7 +40,7 @@ pub struct decoder? implements base.image_decoder( // - 0x00 -> 0x04: via DFC with implicit DIC // - 0x00 -> 0x05: via DF with implicit DIC and DFC // - // - 0x01 -> 0x02: via AMC + // - 0x01 -> 0x02: via TMM // // - 0x02 -> 0x01: via DIC (metadata reported) // - 0x02 -> 0x03: via DIC (metadata not reported) @@ -57,11 +57,11 @@ pub struct decoder? implements base.image_decoder( // - ???? -> 0x05: via RF for ???? > 0x00 // // Where: - // - AMC is ack_metadata_chunk // - DF is decode_frame, implicit means skip_frame // - DFC is decode_frame_config, implicit means nullptr args.dst // - DIC is decode_image_config, implicit means nullptr args.dst // - RF is restart_frame + // - TMM is tell_me_more call_sequence : base.u8, ignore_metadata : base.bool, diff --git a/std/png/decode_png.wuffs b/std/png/decode_png.wuffs index d33759d5..88907d1a 100644 --- a/std/png/decode_png.wuffs +++ b/std/png/decode_png.wuffs @@ -43,16 +43,24 @@ pub struct decoder? implements base.image_decoder( // Call sequence states: // - 0x00: initial state. + // - 0x01: metadata reported; image config decode is in progress. + // - 0x02: metadata finished; image config decode is in progress. // - 0x03: image config decoded. // - 0x04: frame config decoded. // - 0xFF: end-of-data, usually after (the non-animated) frame decoded. // // State transitions: // - // - 0x00 -> 0x03: via DIC + // - 0x00 -> 0x01: via DIC (metadata reported) + // - 0x00 -> 0x03: via DIC (metadata not reported) // - 0x00 -> 0x04: via DFC with implicit DIC // - 0x00 -> 0xFF: via DF with implicit DIC and DFC // + // - 0x01 -> 0x02: via TMM + // + // - 0x02 -> 0x01: via DIC (metadata reported) + // - 0x02 -> 0x03: via DIC (metadata not reported) + // // - 0x03 -> 0x04: via DFC // - 0x03 -> 0xFF: via DF with implicit DFC // @@ -66,8 +74,13 @@ pub struct decoder? implements base.image_decoder( // - DFC is decode_frame_config, implicit means nullptr args.dst // - DIC is decode_image_config, implicit means nullptr args.dst // - RF is restart_frame + // - TMM is tell_me_more call_sequence : base.u8, + report_metadata_chrm : base.bool, + report_metadata_gama : base.bool, + report_metadata_iccp : base.bool, + ignore_checksum : base.bool, depth : base.u8[..= 16], @@ -75,6 +88,9 @@ pub struct decoder? implements base.image_decoder( filter_distance : base.u8[..= 8], interlace_pass : base.u8[..= 7], + seen_chrm : base.bool, + seen_gama : base.bool, + seen_iccp : base.bool, seen_plte : base.bool, seen_trns : base.bool, @@ -87,6 +103,12 @@ pub struct decoder? implements base.image_decoder( frame_config_io_position : base.u64, + metadata_flavor : base.u32, + metadata_fourcc : base.u32, + metadata_x : base.u64, + metadata_y : base.u64, + metadata_z : base.u64, + swizzler : base.pixel_swizzler, util : base.utility, )( @@ -111,7 +133,9 @@ pub func decoder.decode_image_config?(dst: nptr base.image_config, src: base.io_ var checksum_want : base.u32 var status : base.status - if this.call_sequence <> 0 { + if this.call_sequence == 2 { + // No-op. + } else if this.call_sequence <> 0 { return base."#bad call sequence" } else { magic = args.src.read_u64le?() @@ -194,6 +218,10 @@ pub func decoder.decode_image_config?(dst: nptr base.image_config, src: base.io_ return "#bad checksum" } + if this.metadata_fourcc <> 0 { + this.call_sequence = 1 + return base."@metadata reported" + } } endwhile if (this.color_type == 3) and (not this.seen_plte) { @@ -403,6 +431,21 @@ pri func decoder.decode_other_chunk?(src: base.io_reader) { } this.decode_plte?(src: args.src) this.seen_plte = true + + } else if (this.chunk_type == 'cHRM'le) and this.report_metadata_chrm { + if this.seen_chrm { + return "#bad chunk" + } + this.decode_chrm?(src: args.src) + this.seen_chrm = true + + } else if (this.chunk_type == 'gAMA'le) and this.report_metadata_gama { + if this.seen_gama { + return "#bad chunk" + } + this.decode_gama?(src: args.src) + this.seen_gama = true + } else if this.chunk_type == 'tRNS'le { if this.seen_trns or (this.color_type > 3) or ((this.color_type == 3) and (not this.seen_plte)) { @@ -410,11 +453,59 @@ pri func decoder.decode_other_chunk?(src: base.io_reader) { } this.decode_trns?(src: args.src) this.seen_trns = true + } else { args.src.skip?(n: this.chunk_length) } } +pri func decoder.decode_chrm?(src: base.io_reader) { + var u : base.u64 + + if this.chunk_length <> 32 { + return "#bad chunk" + } + this.metadata_flavor = base.MORE_INFORMATION__FLAVOR__METADATA_PARSED + this.metadata_fourcc = 'CHRM'be + this.metadata_x = 0 + this.metadata_y = 0 + this.metadata_z = 0 + + // See the wuffs_base__more_information__metadata_parsed__chrm comments for + // how we pack the eight chromaticity values into three u64 fields. This + // admittedly truncates chromaticity values from 32 to 24 bits, but in + // practice they only range between 0 and 100000 (which is 0x01_86A0). + u = args.src.read_u32be_as_u64?() + this.metadata_x |= (0xFF_FFFF & u) << 0 + u = args.src.read_u32be_as_u64?() + this.metadata_x |= (0xFF_FFFF & u) << 24 + u = args.src.read_u32be_as_u64?() + this.metadata_x |= (0xFF_FFFF & u) ~mod<< 48 + this.metadata_y |= (0xFF_FFFF & u) >> 16 + u = args.src.read_u32be_as_u64?() + this.metadata_y |= (0xFF_FFFF & u) << 8 + u = args.src.read_u32be_as_u64?() + this.metadata_y |= (0xFF_FFFF & u) << 32 + u = args.src.read_u32be_as_u64?() + this.metadata_y |= (0xFF_FFFF & u) ~mod<< 56 + this.metadata_z |= (0xFF_FFFF & u) >> 8 + u = args.src.read_u32be_as_u64?() + this.metadata_z |= (0xFF_FFFF & u) << 16 + u = args.src.read_u32be_as_u64?() + this.metadata_z |= (0xFF_FFFF & u) << 40 +} + +pri func decoder.decode_gama?(src: base.io_reader) { + if this.chunk_length <> 4 { + return "#bad chunk" + } + this.metadata_flavor = base.MORE_INFORMATION__FLAVOR__METADATA_PARSED + this.metadata_fourcc = 'GAMA'be + this.metadata_x = args.src.read_u32be_as_u64?() + this.metadata_y = 0 + this.metadata_z = 0 +} + pri func decoder.decode_plte?(src: base.io_reader) { var num_entries : base.u32[..= 256] var i : base.u32 @@ -699,11 +790,37 @@ pub func decoder.restart_frame!(index: base.u64, io_position: base.u64) base.sta } pub func decoder.set_report_metadata!(fourcc: base.u32, report: base.bool) { - // TODO. + if args.fourcc == 'CHRM'be { + this.report_metadata_chrm = args.report + } else if args.fourcc == 'GAMA'be { + this.report_metadata_gama = args.report + } else if args.fourcc == 'ICCP'be { + this.report_metadata_iccp = args.report + } } pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_information, src: base.io_reader) { - return base."#no more information" + if this.call_sequence <> 1 { + return base."#bad call sequence" + } + if this.metadata_fourcc == 0 { + return base."#no more information" + } + if args.minfo <> nullptr { + args.minfo.set!( + flavor: this.metadata_flavor, + w: this.metadata_fourcc, + x: this.metadata_x, + y: this.metadata_y, + z: this.metadata_z) + } + this.call_sequence = 2 + this.metadata_flavor = 0 + this.metadata_fourcc = 0 + this.metadata_x = 0 + this.metadata_y = 0 + this.metadata_z = 0 + return ok } pub func decoder.workbuf_len() base.range_ii_u64 { diff --git a/test/c/std/png.c b/test/c/std/png.c index 95d50eb3..5e84247c 100644 --- a/test/c/std/png.c +++ b/test/c/std/png.c @@ -472,6 +472,96 @@ test_wuffs_png_decode_frame_config() { return NULL; } +const char* // +test_wuffs_png_decode_metadata_chrm_gama() { + CHECK_FOCUS(__func__); + wuffs_png__decoder dec; + + int q; + for (q = 0; q < 3; q++) { + wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ + .data = g_src_slice_u8, + }); + CHECK_STRING(read_file( + &src, (q == 1) ? "test/data/bricks-dither.png" + : "test/data/red-blue-gradient.gamma1dot8.png")); + wuffs_base__image_config ic = ((wuffs_base__image_config){}); + + CHECK_STATUS("initialize", + wuffs_png__decoder__initialize( + &dec, sizeof dec, WUFFS_VERSION, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); + + uint32_t want_fourcc = 0; + uint32_t want[8] = {0}; + uint32_t have[8] = {0}; + if (q == 1) { + want_fourcc = WUFFS_BASE__FOURCC__CHRM; + want[0] = 31270; + want[1] = 32900; + want[2] = 64000; + want[3] = 33000; + want[4] = 30000; + want[5] = 60000; + want[6] = 15000; + want[7] = 6000; + } else if (q == 2) { + want_fourcc = WUFFS_BASE__FOURCC__GAMA; + want[0] = 55556; + } + wuffs_png__decoder__set_report_metadata(&dec, want_fourcc, true); + + while (true) { + wuffs_base__status status = + wuffs_png__decoder__decode_image_config(&dec, &ic, &src); + if (wuffs_base__status__is_ok(&status)) { + break; + } else if (status.repr != wuffs_base__note__metadata_reported) { + RETURN_FAIL("decode_image_config (q=%d): have \"%s\", want \"%s\"", q, + status.repr, wuffs_base__note__metadata_reported); + } + + wuffs_base__io_buffer empty = wuffs_base__empty_io_buffer(); + wuffs_base__more_information minfo = wuffs_base__empty_more_information(); + status = wuffs_png__decoder__tell_me_more(&dec, &empty, &minfo, &src); + if (wuffs_base__status__is_error(&status)) { + RETURN_FAIL("tell_me_more (q=%d): \"%s\"", q, status.repr); + } else if (minfo.flavor != + WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_PARSED) { + RETURN_FAIL("tell_me_more (q=%d): flavor: have %" PRIu32 + ", want %" PRIu32, + q, minfo.flavor, + WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_PARSED); + } + uint32_t have_fourcc = + wuffs_base__more_information__metadata__fourcc(&minfo); + if (have_fourcc != want_fourcc) { + RETURN_FAIL("tell_me_more (q=%d): fourcc: have 0x%08" PRIX32 + ", want 0x%08" PRIX32, + q, have_fourcc, want_fourcc); + } else if (have_fourcc == WUFFS_BASE__FOURCC__CHRM) { + int i; + for (i = 0; i < 8; i++) { + have[i] = ((uint32_t)( + wuffs_base__more_information__metadata_parsed__chrm(&minfo, i))); + } + } else if (have_fourcc == WUFFS_BASE__FOURCC__GAMA) { + have[0] = wuffs_base__more_information__metadata_parsed__gama(&minfo); + } + } + + int i; + for (i = 0; i < 8; i++) { + if (have[i] != want[i]) { + RETURN_FAIL("(q=%d, i=%d): have %" PRIu32 ", want %" PRIu32, q, i, + have[i], want[i]); + } + } + } + + return NULL; +} + // ---------------- Mimic Tests #ifdef WUFFS_MIMIC @@ -803,6 +893,7 @@ proc g_tests[] = { test_wuffs_png_decode_filters_round_trip, test_wuffs_png_decode_frame_config, test_wuffs_png_decode_interface, + test_wuffs_png_decode_metadata_chrm_gama, #ifdef WUFFS_MIMIC