From fd1f1c6b53b069f43b154c458a8de1f40b929d39 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 4 Mar 2021 15:17:47 +1100 Subject: [PATCH] Have wuffs_aux::DecodeImage handle I/O redirects --- internal/cgen/auxiliary/image.cc | 139 ++++++++++++++++++------- internal/cgen/data/data.go | 17 +-- release/c/wuffs-unsupported-snapshot.c | 139 ++++++++++++++++++------- 3 files changed, 214 insertions(+), 81 deletions(-) diff --git a/internal/cgen/auxiliary/image.cc b/internal/cgen/auxiliary/image.cc index 20461df0..3d48ae7e 100644 --- a/internal/cgen/auxiliary/image.cc +++ b/internal/cgen/auxiliary/image.cc @@ -110,6 +110,36 @@ const char DecodeImage_UnsupportedPixelFormat[] = // namespace { +std::string // +DecodeImageAdvanceIOBuf(sync_io::Input& input, + wuffs_base__io_buffer& io_buf, + bool compactable, + uint64_t min_excl_pos, + uint64_t pos) { + if ((pos <= min_excl_pos) || (pos < io_buf.reader_position())) { + // Redirects must go forward. + return DecodeImage_UnsupportedImageFormat; + } + while (true) { + uint64_t relative_pos = pos - io_buf.reader_position(); + if (relative_pos <= io_buf.reader_length()) { + io_buf.meta.ri += (size_t)relative_pos; + break; + } else if (io_buf.meta.closed) { + return DecodeImage_UnexpectedEndOfFile; + } + io_buf.meta.ri = io_buf.meta.wi; + if (compactable) { + io_buf.compact(); + } + std::string error_message = input.CopyIn(&io_buf); + if (!error_message.empty()) { + return std::move(error_message); + } + } + return ""; +} + DecodeImageResult // DecodeImage0(DecodeImageCallbacks& callbacks, sync_io::Input& input, @@ -136,48 +166,83 @@ DecodeImage0(DecodeImageCallbacks& callbacks, return DecodeImageResult(DecodeImage_UnsupportedPixelBlend); } - // Determine the image format. + wuffs_base__image_config image_config = wuffs_base__null_image_config(); + wuffs_base__image_decoder::unique_ptr image_decoder(nullptr, &free); + uint64_t start_pos = io_buf.reader_position(); + bool redirected = false; int32_t fourcc = 0; - while (true) { - fourcc = wuffs_base__magic_number_guess_fourcc(io_buf.reader_slice()); - if (fourcc > 0) { - break; - } else if ((fourcc == 0) && (io_buf.reader_length() >= 64)) { - break; - } else if (io_buf.meta.closed || (io_buf.writer_length() == 0)) { - fourcc = 0; - break; - } - std::string error_message = input.CopyIn(&io_buf); - if (!error_message.empty()) { - return DecodeImageResult(std::move(error_message)); - } - } - wuffs_base__image_decoder::unique_ptr image_decoder = - callbacks.OnImageFormat(fourcc, io_buf.reader_slice()); - if (!image_decoder) { - return DecodeImageResult(DecodeImage_UnsupportedImageFormat); - } - - // Decode the image config. - wuffs_base__image_config image_config; - while (true) { - wuffs_base__status id_dic_status = - image_decoder->decode_image_config(&image_config, &io_buf); - if (id_dic_status.repr == NULL) { - break; - } else if (id_dic_status.repr != wuffs_base__suspension__short_read) { - // TODO: handle wuffs_base__note__i_o_redirect. - return DecodeImageResult(id_dic_status.message()); - } else if (io_buf.meta.closed) { - return DecodeImageResult(DecodeImage_UnexpectedEndOfFile); +redirect: + do { + // Determine the image format. + if (!redirected) { + while (true) { + fourcc = wuffs_base__magic_number_guess_fourcc(io_buf.reader_slice()); + if (fourcc > 0) { + break; + } else if ((fourcc == 0) && (io_buf.reader_length() >= 64)) { + break; + } else if (io_buf.meta.closed || (io_buf.writer_length() == 0)) { + fourcc = 0; + break; + } + std::string error_message = input.CopyIn(&io_buf); + if (!error_message.empty()) { + return DecodeImageResult(std::move(error_message)); + } + } } else { - std::string error_message = input.CopyIn(&io_buf); + wuffs_base__io_buffer empty = wuffs_base__empty_io_buffer(); + wuffs_base__more_information minfo = wuffs_base__empty_more_information(); + wuffs_base__status tmm_status = + image_decoder->tell_me_more(&empty, &minfo, &io_buf); + if (minfo.flavor != WUFFS_BASE__MORE_INFORMATION__FLAVOR__IO_REDIRECT) { + return DecodeImageResult(DecodeImage_UnsupportedImageFormat); + } + uint64_t pos = minfo.io_redirect__range().min_incl; + std::string error_message = DecodeImageAdvanceIOBuf( + input, io_buf, !input.BringsItsOwnIOBuffer(), start_pos, pos); if (!error_message.empty()) { return DecodeImageResult(std::move(error_message)); } + fourcc = (int32_t)(minfo.io_redirect__fourcc()); + if (fourcc == 0) { + return DecodeImageResult(DecodeImage_UnsupportedImageFormat); + } + image_decoder.reset(); } - } + + // Make the image decoder. + image_decoder = callbacks.OnImageFormat( + (uint32_t)fourcc, + fourcc ? wuffs_base__empty_slice_u8() : io_buf.reader_slice()); + if (!image_decoder) { + return DecodeImageResult(DecodeImage_UnsupportedImageFormat); + } + + // Decode the image config. + while (true) { + wuffs_base__status id_dic_status = + image_decoder->decode_image_config(&image_config, &io_buf); + if (id_dic_status.repr == NULL) { + break; + } else if (id_dic_status.repr == wuffs_base__note__i_o_redirect) { + if (redirected) { + return DecodeImageResult(DecodeImage_UnsupportedImageFormat); + } + redirected = true; + goto redirect; + } else if (id_dic_status.repr != wuffs_base__suspension__short_read) { + return DecodeImageResult(id_dic_status.message()); + } else if (io_buf.meta.closed) { + return DecodeImageResult(DecodeImage_UnexpectedEndOfFile); + } else { + std::string error_message = input.CopyIn(&io_buf); + if (!error_message.empty()) { + return DecodeImageResult(std::move(error_message)); + } + } + } + } while (false); // Apply the override pixel format. uint32_t w = image_config.pixcfg.width(); @@ -223,7 +288,7 @@ DecodeImage0(DecodeImageCallbacks& callbacks, } // Decode the frame config. - wuffs_base__frame_config frame_config; + wuffs_base__frame_config frame_config = wuffs_base__null_frame_config(); while (true) { wuffs_base__status id_dfc_status = image_decoder->decode_frame_config(&frame_config, &io_buf); diff --git a/internal/cgen/data/data.go b/internal/cgen/data/data.go index 71fdeff0..a157c84d 100644 --- a/internal/cgen/data/data.go +++ b/internal/cgen/data/data.go @@ -736,13 +736,16 @@ const AuxImageCc = "" + "s_base__range_ii_u64 len) {\n if (len.max_incl == 0) {\n return DecodeImageCallbacks::AllocResult(\"\");\n } else if (SIZE_MAX < len.max_incl) {\n return DecodeImageCallbacks::AllocResult(DecodeImage_OutOfMemory);\n }\n void* p = calloc((size_t)len.max_incl, 1);\n if (!p) {\n return DecodeImageCallbacks::AllocResult(DecodeImage_OutOfMemory);\n }\n return DecodeImageCallbacks::AllocResult(\n MemOwner(p, &free),\n wuffs_base__make_slice_u8((uint8_t*)p, (size_t)len.max_incl));\n}\n\nvoid //\nDecodeImageCallbacks::Done(DecodeImageResult& result,\n sync_io::Input& input,\n IOBuffer& buffer) {}\n\nconst char DecodeImage_BufferIsTooShort[] = //\n \"wuffs_aux::DecodeImage: buffer is too short\";\nconst char DecodeImage_MaxInclDimensionExceeded[] = //\n \"wuffs_aux::DecodeImage: max_incl_dimension exceeded\";\nconst char DecodeImage_OutOfMemory[] = //\n \"wuffs_aux::DecodeImage: out of memory\";\nconst char DecodeImage_UnexpectedEndOfFile[] = //\n \"wuffs_aux:" + ":DecodeImage: unexpected end of file\";\nconst char DecodeImage_UnsupportedImageFormat[] = //\n \"wuffs_aux::DecodeImage: unsupported image format\";\nconst char DecodeImage_UnsupportedPixelBlend[] = //\n \"wuffs_aux::DecodeImage: unsupported pixel blend\";\nconst char DecodeImage_UnsupportedPixelConfiguration[] = //\n \"wuffs_aux::DecodeImage: unsupported pixel configuration\";\nconst char DecodeImage_UnsupportedPixelFormat[] = //\n \"wuffs_aux::DecodeImage: unsupported pixel format\";\n\n" + "" + - "// --------\n\nnamespace {\n\nDecodeImageResult //\nDecodeImage0(DecodeImageCallbacks& callbacks,\n sync_io::Input& input,\n wuffs_base__io_buffer& io_buf,\n uint32_t override_pixel_format_repr,\n wuffs_base__pixel_blend pixel_blend,\n uint32_t max_incl_dimension) {\n // Check args.\n switch (override_pixel_format_repr) {\n case 0:\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565:\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n break;\n default:\n return DecodeImageResult(DecodeImage_UnsupportedPixelFormat);\n }\n switch (pixel_blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n break;\n default:\n return DecodeImageResult(DecodeImage_UnsupportedPixelBlend);\n }\n\n // Determine the image format.\n int32_t fourcc = 0;\n while (true) {\n fourcc = wuffs_base__magic_number_guess_fourcc(io_buf.reader_slice());\n " + - " if (fourcc > 0) {\n break;\n } else if ((fourcc == 0) && (io_buf.reader_length() >= 64)) {\n break;\n } else if (io_buf.meta.closed || (io_buf.writer_length() == 0)) {\n fourcc = 0;\n break;\n }\n std::string error_message = input.CopyIn(&io_buf);\n if (!error_message.empty()) {\n return DecodeImageResult(std::move(error_message));\n }\n }\n wuffs_base__image_decoder::unique_ptr image_decoder =\n callbacks.OnImageFormat(fourcc, io_buf.reader_slice());\n if (!image_decoder) {\n return DecodeImageResult(DecodeImage_UnsupportedImageFormat);\n }\n\n // Decode the image config.\n wuffs_base__image_config image_config;\n while (true) {\n wuffs_base__status id_dic_status =\n image_decoder->decode_image_config(&image_config, &io_buf);\n if (id_dic_status.repr == NULL) {\n break;\n } else if (id_dic_status.repr != wuffs_base__suspension__short_read) {\n // TODO: handle wuffs_base__note__i_o_redirect.\n return DecodeImageResult(id_dic_status.message());\n " + - "} else if (io_buf.meta.closed) {\n return DecodeImageResult(DecodeImage_UnexpectedEndOfFile);\n } else {\n std::string error_message = input.CopyIn(&io_buf);\n if (!error_message.empty()) {\n return DecodeImageResult(std::move(error_message));\n }\n }\n }\n\n // Apply the override pixel format.\n uint32_t w = image_config.pixcfg.width();\n uint32_t h = image_config.pixcfg.height();\n if ((w > max_incl_dimension) || (h > max_incl_dimension)) {\n return DecodeImageResult(DecodeImage_MaxInclDimensionExceeded);\n }\n if (override_pixel_format_repr != 0) {\n image_config.pixcfg.set(override_pixel_format_repr,\n WUFFS_BASE__PIXEL_SUBSAMPLING__NONE, w, h);\n }\n\n // Allocate the pixel buffer.\n size_t pixbuf_len_min_incl = 0;\n if ((w > 0) && (h > 0)) {\n pixbuf_len_min_incl = image_config.pixcfg.pixbuf_len();\n if (pixbuf_len_min_incl == 0) {\n return DecodeImageResult(DecodeImage_UnsupportedPixelFormat);\n }\n }\n DecodeImageCallbacks::AllocResult oi" + - "c_result =\n callbacks.OnImageConfig(image_config);\n if (!oic_result.error_message.empty()) {\n return DecodeImageResult(std::move(oic_result.error_message));\n } else if (oic_result.mem_slice.len < pixbuf_len_min_incl) {\n return DecodeImageResult(DecodeImage_BufferIsTooShort);\n }\n wuffs_base__pixel_buffer pixel_buffer;\n wuffs_base__status pb_sfs_status =\n pixel_buffer.set_from_slice(&image_config.pixcfg, oic_result.mem_slice);\n if (!pb_sfs_status.is_ok()) {\n return DecodeImageResult(pb_sfs_status.message());\n }\n\n // Allocate the work buffer.\n wuffs_base__range_ii_u64 workbuf_len = image_decoder->workbuf_len();\n DecodeImageCallbacks::AllocResult alloc_workbuf_result =\n callbacks.AllocWorkbuf(workbuf_len);\n if (!alloc_workbuf_result.error_message.empty()) {\n return DecodeImageResult(std::move(alloc_workbuf_result.error_message));\n } else if (alloc_workbuf_result.mem_slice.len < workbuf_len.min_incl) {\n return DecodeImageResult(DecodeImage_BufferIsTooShort);\n }\n\n // Deco" + - "de the frame config.\n wuffs_base__frame_config frame_config;\n while (true) {\n wuffs_base__status id_dfc_status =\n image_decoder->decode_frame_config(&frame_config, &io_buf);\n if (id_dfc_status.repr == NULL) {\n break;\n } else if (id_dfc_status.repr != wuffs_base__suspension__short_read) {\n return DecodeImageResult(id_dfc_status.message());\n } else if (io_buf.meta.closed) {\n return DecodeImageResult(DecodeImage_UnexpectedEndOfFile);\n } else {\n std::string error_message = input.CopyIn(&io_buf);\n if (!error_message.empty()) {\n return DecodeImageResult(std::move(error_message));\n }\n }\n }\n\n // Decode the frame (the pixels).\n //\n // From here on, always returns the pixel_buffer. If we get this far, we can\n // still display a partial image, even if we encounter an error.\n std::string message(\"\");\n if ((pixel_blend == WUFFS_BASE__PIXEL_BLEND__SRC_OVER) &&\n frame_config.overwrite_instead_of_blend()) {\n pixel_blend = WUFFS_BASE__PIXEL_BLEND__" + - "SRC;\n }\n while (true) {\n wuffs_base__status id_df_status =\n image_decoder->decode_frame(&pixel_buffer, &io_buf, pixel_blend,\n alloc_workbuf_result.mem_slice, NULL);\n if (id_df_status.repr == NULL) {\n break;\n } else if (id_df_status.repr != wuffs_base__suspension__short_read) {\n message = id_df_status.message();\n break;\n } else if (io_buf.meta.closed) {\n message = DecodeImage_UnexpectedEndOfFile;\n break;\n } else {\n std::string error_message = input.CopyIn(&io_buf);\n if (!error_message.empty()) {\n message = std::move(error_message);\n break;\n }\n }\n }\n return DecodeImageResult(std::move(oic_result.mem_owner),\n oic_result.mem_slice, pixel_buffer,\n std::move(message));\n}\n\n} // namespace\n\nDecodeImageResult //\nDecodeImage(DecodeImageCallbacks& callbacks,\n sync_io::Input& input,\n uint32_t override_pixel_format_repr,\n " + - " wuffs_base__pixel_blend pixel_blend,\n uint32_t max_incl_dimension) {\n wuffs_base__io_buffer* io_buf = input.BringsItsOwnIOBuffer();\n wuffs_base__io_buffer fallback_io_buf = wuffs_base__empty_io_buffer();\n std::unique_ptr fallback_io_array(nullptr);\n if (!io_buf) {\n fallback_io_array = std::unique_ptr(new uint8_t[32768]);\n fallback_io_buf =\n wuffs_base__ptr_u8__writer(fallback_io_array.get(), 32768);\n io_buf = &fallback_io_buf;\n }\n\n DecodeImageResult result =\n DecodeImage0(callbacks, input, *io_buf, override_pixel_format_repr,\n pixel_blend, max_incl_dimension);\n callbacks.Done(result, input, *io_buf);\n return result;\n}\n\n} // namespace wuffs_aux\n\n#endif // !defined(WUFFS_CONFIG__MODULES) ||\n // defined(WUFFS_CONFIG__MODULE__AUX__IMAGE)\n" + + "// --------\n\nnamespace {\n\nstd::string //\nDecodeImageAdvanceIOBuf(sync_io::Input& input,\n wuffs_base__io_buffer& io_buf,\n bool compactable,\n uint64_t min_excl_pos,\n uint64_t pos) {\n if ((pos <= min_excl_pos) || (pos < io_buf.reader_position())) {\n // Redirects must go forward.\n return DecodeImage_UnsupportedImageFormat;\n }\n while (true) {\n uint64_t relative_pos = pos - io_buf.reader_position();\n if (relative_pos <= io_buf.reader_length()) {\n io_buf.meta.ri += (size_t)relative_pos;\n break;\n } else if (io_buf.meta.closed) {\n return DecodeImage_UnexpectedEndOfFile;\n }\n io_buf.meta.ri = io_buf.meta.wi;\n if (compactable) {\n io_buf.compact();\n }\n std::string error_message = input.CopyIn(&io_buf);\n if (!error_message.empty()) {\n return std::move(error_message);\n }\n }\n return \"\";\n}\n\nDecodeImageResult //\nDecodeImage0(DecodeImageCallbacks& callbacks,\n " + + " sync_io::Input& input,\n wuffs_base__io_buffer& io_buf,\n uint32_t override_pixel_format_repr,\n wuffs_base__pixel_blend pixel_blend,\n uint32_t max_incl_dimension) {\n // Check args.\n switch (override_pixel_format_repr) {\n case 0:\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565:\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n break;\n default:\n return DecodeImageResult(DecodeImage_UnsupportedPixelFormat);\n }\n switch (pixel_blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n break;\n default:\n return DecodeImageResult(DecodeImage_UnsupportedPixelBlend);\n }\n\n wuffs_base__image_config image_config = wuffs_base__null_image_config();\n wuffs_base__image_decoder::unique_ptr image_decoder(nullptr, &free);\n uint64_t start_pos = io_buf.reader_position();\n bool redirected = false;\n int32_t fourcc = 0;\nredirect:\n " + + "do {\n // Determine the image format.\n if (!redirected) {\n while (true) {\n fourcc = wuffs_base__magic_number_guess_fourcc(io_buf.reader_slice());\n if (fourcc > 0) {\n break;\n } else if ((fourcc == 0) && (io_buf.reader_length() >= 64)) {\n break;\n } else if (io_buf.meta.closed || (io_buf.writer_length() == 0)) {\n fourcc = 0;\n break;\n }\n std::string error_message = input.CopyIn(&io_buf);\n if (!error_message.empty()) {\n return DecodeImageResult(std::move(error_message));\n }\n }\n } else {\n wuffs_base__io_buffer empty = wuffs_base__empty_io_buffer();\n wuffs_base__more_information minfo = wuffs_base__empty_more_information();\n wuffs_base__status tmm_status =\n image_decoder->tell_me_more(&empty, &minfo, &io_buf);\n if (minfo.flavor != WUFFS_BASE__MORE_INFORMATION__FLAVOR__IO_REDIRECT) {\n return DecodeImageResult(DecodeImage_UnsupportedImageFormat);\n }\n uint6" + + "4_t pos = minfo.io_redirect__range().min_incl;\n std::string error_message = DecodeImageAdvanceIOBuf(\n input, io_buf, !input.BringsItsOwnIOBuffer(), start_pos, pos);\n if (!error_message.empty()) {\n return DecodeImageResult(std::move(error_message));\n }\n fourcc = (int32_t)(minfo.io_redirect__fourcc());\n if (fourcc == 0) {\n return DecodeImageResult(DecodeImage_UnsupportedImageFormat);\n }\n image_decoder.reset();\n }\n\n // Make the image decoder.\n image_decoder = callbacks.OnImageFormat(\n (uint32_t)fourcc,\n fourcc ? wuffs_base__empty_slice_u8() : io_buf.reader_slice());\n if (!image_decoder) {\n return DecodeImageResult(DecodeImage_UnsupportedImageFormat);\n }\n\n // Decode the image config.\n while (true) {\n wuffs_base__status id_dic_status =\n image_decoder->decode_image_config(&image_config, &io_buf);\n if (id_dic_status.repr == NULL) {\n break;\n } else if (id_dic_status.repr == wuffs_base__note" + + "__i_o_redirect) {\n if (redirected) {\n return DecodeImageResult(DecodeImage_UnsupportedImageFormat);\n }\n redirected = true;\n goto redirect;\n } else if (id_dic_status.repr != wuffs_base__suspension__short_read) {\n return DecodeImageResult(id_dic_status.message());\n } else if (io_buf.meta.closed) {\n return DecodeImageResult(DecodeImage_UnexpectedEndOfFile);\n } else {\n std::string error_message = input.CopyIn(&io_buf);\n if (!error_message.empty()) {\n return DecodeImageResult(std::move(error_message));\n }\n }\n }\n } while (false);\n\n // Apply the override pixel format.\n uint32_t w = image_config.pixcfg.width();\n uint32_t h = image_config.pixcfg.height();\n if ((w > max_incl_dimension) || (h > max_incl_dimension)) {\n return DecodeImageResult(DecodeImage_MaxInclDimensionExceeded);\n }\n if (override_pixel_format_repr != 0) {\n image_config.pixcfg.set(override_pixel_format_repr,\n WU" + + "FFS_BASE__PIXEL_SUBSAMPLING__NONE, w, h);\n }\n\n // Allocate the pixel buffer.\n size_t pixbuf_len_min_incl = 0;\n if ((w > 0) && (h > 0)) {\n pixbuf_len_min_incl = image_config.pixcfg.pixbuf_len();\n if (pixbuf_len_min_incl == 0) {\n return DecodeImageResult(DecodeImage_UnsupportedPixelFormat);\n }\n }\n DecodeImageCallbacks::AllocResult oic_result =\n callbacks.OnImageConfig(image_config);\n if (!oic_result.error_message.empty()) {\n return DecodeImageResult(std::move(oic_result.error_message));\n } else if (oic_result.mem_slice.len < pixbuf_len_min_incl) {\n return DecodeImageResult(DecodeImage_BufferIsTooShort);\n }\n wuffs_base__pixel_buffer pixel_buffer;\n wuffs_base__status pb_sfs_status =\n pixel_buffer.set_from_slice(&image_config.pixcfg, oic_result.mem_slice);\n if (!pb_sfs_status.is_ok()) {\n return DecodeImageResult(pb_sfs_status.message());\n }\n\n // Allocate the work buffer.\n wuffs_base__range_ii_u64 workbuf_len = image_decoder->workbuf_len();\n DecodeImageCallbacks::All" + + "ocResult alloc_workbuf_result =\n callbacks.AllocWorkbuf(workbuf_len);\n if (!alloc_workbuf_result.error_message.empty()) {\n return DecodeImageResult(std::move(alloc_workbuf_result.error_message));\n } else if (alloc_workbuf_result.mem_slice.len < workbuf_len.min_incl) {\n return DecodeImageResult(DecodeImage_BufferIsTooShort);\n }\n\n // Decode the frame config.\n wuffs_base__frame_config frame_config = wuffs_base__null_frame_config();\n while (true) {\n wuffs_base__status id_dfc_status =\n image_decoder->decode_frame_config(&frame_config, &io_buf);\n if (id_dfc_status.repr == NULL) {\n break;\n } else if (id_dfc_status.repr != wuffs_base__suspension__short_read) {\n return DecodeImageResult(id_dfc_status.message());\n } else if (io_buf.meta.closed) {\n return DecodeImageResult(DecodeImage_UnexpectedEndOfFile);\n } else {\n std::string error_message = input.CopyIn(&io_buf);\n if (!error_message.empty()) {\n return DecodeImageResult(std::move(error_message));\n" + + " }\n }\n }\n\n // Decode the frame (the pixels).\n //\n // From here on, always returns the pixel_buffer. If we get this far, we can\n // still display a partial image, even if we encounter an error.\n std::string message(\"\");\n if ((pixel_blend == WUFFS_BASE__PIXEL_BLEND__SRC_OVER) &&\n frame_config.overwrite_instead_of_blend()) {\n pixel_blend = WUFFS_BASE__PIXEL_BLEND__SRC;\n }\n while (true) {\n wuffs_base__status id_df_status =\n image_decoder->decode_frame(&pixel_buffer, &io_buf, pixel_blend,\n alloc_workbuf_result.mem_slice, NULL);\n if (id_df_status.repr == NULL) {\n break;\n } else if (id_df_status.repr != wuffs_base__suspension__short_read) {\n message = id_df_status.message();\n break;\n } else if (io_buf.meta.closed) {\n message = DecodeImage_UnexpectedEndOfFile;\n break;\n } else {\n std::string error_message = input.CopyIn(&io_buf);\n if (!error_message.empty()) {\n message = std::move(error_message);" + + "\n break;\n }\n }\n }\n return DecodeImageResult(std::move(oic_result.mem_owner),\n oic_result.mem_slice, pixel_buffer,\n std::move(message));\n}\n\n} // namespace\n\nDecodeImageResult //\nDecodeImage(DecodeImageCallbacks& callbacks,\n sync_io::Input& input,\n uint32_t override_pixel_format_repr,\n wuffs_base__pixel_blend pixel_blend,\n uint32_t max_incl_dimension) {\n wuffs_base__io_buffer* io_buf = input.BringsItsOwnIOBuffer();\n wuffs_base__io_buffer fallback_io_buf = wuffs_base__empty_io_buffer();\n std::unique_ptr fallback_io_array(nullptr);\n if (!io_buf) {\n fallback_io_array = std::unique_ptr(new uint8_t[32768]);\n fallback_io_buf =\n wuffs_base__ptr_u8__writer(fallback_io_array.get(), 32768);\n io_buf = &fallback_io_buf;\n }\n\n DecodeImageResult result =\n DecodeImage0(callbacks, input, *io_buf, override_pixel_format_repr,\n pixel_blend, max_incl_dim" + + "ension);\n callbacks.Done(result, input, *io_buf);\n return result;\n}\n\n} // namespace wuffs_aux\n\n#endif // !defined(WUFFS_CONFIG__MODULES) ||\n // defined(WUFFS_CONFIG__MODULE__AUX__IMAGE)\n" + "" const AuxImageHh = "" + diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index f35d5ea3..82d30ed5 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -36542,6 +36542,36 @@ const char DecodeImage_UnsupportedPixelFormat[] = // namespace { +std::string // +DecodeImageAdvanceIOBuf(sync_io::Input& input, + wuffs_base__io_buffer& io_buf, + bool compactable, + uint64_t min_excl_pos, + uint64_t pos) { + if ((pos <= min_excl_pos) || (pos < io_buf.reader_position())) { + // Redirects must go forward. + return DecodeImage_UnsupportedImageFormat; + } + while (true) { + uint64_t relative_pos = pos - io_buf.reader_position(); + if (relative_pos <= io_buf.reader_length()) { + io_buf.meta.ri += (size_t)relative_pos; + break; + } else if (io_buf.meta.closed) { + return DecodeImage_UnexpectedEndOfFile; + } + io_buf.meta.ri = io_buf.meta.wi; + if (compactable) { + io_buf.compact(); + } + std::string error_message = input.CopyIn(&io_buf); + if (!error_message.empty()) { + return std::move(error_message); + } + } + return ""; +} + DecodeImageResult // DecodeImage0(DecodeImageCallbacks& callbacks, sync_io::Input& input, @@ -36568,48 +36598,83 @@ DecodeImage0(DecodeImageCallbacks& callbacks, return DecodeImageResult(DecodeImage_UnsupportedPixelBlend); } - // Determine the image format. + wuffs_base__image_config image_config = wuffs_base__null_image_config(); + wuffs_base__image_decoder::unique_ptr image_decoder(nullptr, &free); + uint64_t start_pos = io_buf.reader_position(); + bool redirected = false; int32_t fourcc = 0; - while (true) { - fourcc = wuffs_base__magic_number_guess_fourcc(io_buf.reader_slice()); - if (fourcc > 0) { - break; - } else if ((fourcc == 0) && (io_buf.reader_length() >= 64)) { - break; - } else if (io_buf.meta.closed || (io_buf.writer_length() == 0)) { - fourcc = 0; - break; - } - std::string error_message = input.CopyIn(&io_buf); - if (!error_message.empty()) { - return DecodeImageResult(std::move(error_message)); - } - } - wuffs_base__image_decoder::unique_ptr image_decoder = - callbacks.OnImageFormat(fourcc, io_buf.reader_slice()); - if (!image_decoder) { - return DecodeImageResult(DecodeImage_UnsupportedImageFormat); - } - - // Decode the image config. - wuffs_base__image_config image_config; - while (true) { - wuffs_base__status id_dic_status = - image_decoder->decode_image_config(&image_config, &io_buf); - if (id_dic_status.repr == NULL) { - break; - } else if (id_dic_status.repr != wuffs_base__suspension__short_read) { - // TODO: handle wuffs_base__note__i_o_redirect. - return DecodeImageResult(id_dic_status.message()); - } else if (io_buf.meta.closed) { - return DecodeImageResult(DecodeImage_UnexpectedEndOfFile); +redirect: + do { + // Determine the image format. + if (!redirected) { + while (true) { + fourcc = wuffs_base__magic_number_guess_fourcc(io_buf.reader_slice()); + if (fourcc > 0) { + break; + } else if ((fourcc == 0) && (io_buf.reader_length() >= 64)) { + break; + } else if (io_buf.meta.closed || (io_buf.writer_length() == 0)) { + fourcc = 0; + break; + } + std::string error_message = input.CopyIn(&io_buf); + if (!error_message.empty()) { + return DecodeImageResult(std::move(error_message)); + } + } } else { - std::string error_message = input.CopyIn(&io_buf); + wuffs_base__io_buffer empty = wuffs_base__empty_io_buffer(); + wuffs_base__more_information minfo = wuffs_base__empty_more_information(); + wuffs_base__status tmm_status = + image_decoder->tell_me_more(&empty, &minfo, &io_buf); + if (minfo.flavor != WUFFS_BASE__MORE_INFORMATION__FLAVOR__IO_REDIRECT) { + return DecodeImageResult(DecodeImage_UnsupportedImageFormat); + } + uint64_t pos = minfo.io_redirect__range().min_incl; + std::string error_message = DecodeImageAdvanceIOBuf( + input, io_buf, !input.BringsItsOwnIOBuffer(), start_pos, pos); if (!error_message.empty()) { return DecodeImageResult(std::move(error_message)); } + fourcc = (int32_t)(minfo.io_redirect__fourcc()); + if (fourcc == 0) { + return DecodeImageResult(DecodeImage_UnsupportedImageFormat); + } + image_decoder.reset(); } - } + + // Make the image decoder. + image_decoder = callbacks.OnImageFormat( + (uint32_t)fourcc, + fourcc ? wuffs_base__empty_slice_u8() : io_buf.reader_slice()); + if (!image_decoder) { + return DecodeImageResult(DecodeImage_UnsupportedImageFormat); + } + + // Decode the image config. + while (true) { + wuffs_base__status id_dic_status = + image_decoder->decode_image_config(&image_config, &io_buf); + if (id_dic_status.repr == NULL) { + break; + } else if (id_dic_status.repr == wuffs_base__note__i_o_redirect) { + if (redirected) { + return DecodeImageResult(DecodeImage_UnsupportedImageFormat); + } + redirected = true; + goto redirect; + } else if (id_dic_status.repr != wuffs_base__suspension__short_read) { + return DecodeImageResult(id_dic_status.message()); + } else if (io_buf.meta.closed) { + return DecodeImageResult(DecodeImage_UnexpectedEndOfFile); + } else { + std::string error_message = input.CopyIn(&io_buf); + if (!error_message.empty()) { + return DecodeImageResult(std::move(error_message)); + } + } + } + } while (false); // Apply the override pixel format. uint32_t w = image_config.pixcfg.width(); @@ -36655,7 +36720,7 @@ DecodeImage0(DecodeImageCallbacks& callbacks, } // Decode the frame config. - wuffs_base__frame_config frame_config; + wuffs_base__frame_config frame_config = wuffs_base__null_frame_config(); while (true) { wuffs_base__status id_dfc_status = image_decoder->decode_frame_config(&frame_config, &io_buf);