jpeg2000: fix parsing header for getting chroma format and bit depths

strukturag · Sep 15, 2024 · a680e3d · a680e3d
1 parent d2ea2d2
commit a680e3d
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 20 deletions.
diff --git a/libheif/codecs/image_item.cc b/libheif/codecs/image_item.cc
@@ -447,8 +447,13 @@ Error ImageItem::get_coded_image_colorspace(heif_colorspace* out_colorspace, hei
  *out_chroma = (heif_chroma) (av1C->get_configuration().get_heif_chroma());
  }
  else if (auto j2kH = m_heif_context->get_heif_file()->get_property<Box_j2kH>(id)) {
+ Result<std::vector<uint8_t>> dataResult = get_compressed_image_data();
+ if (dataResult.error) {
+ return dataResult.error;
+ }
+
  JPEG2000MainHeader jpeg2000Header;
- err = jpeg2000Header.parseHeader(*m_heif_context->get_heif_file(), id);
+ err = jpeg2000Header.parseHeader(*dataResult);
  if (err) {
  return err;
  }
@@ -1079,16 +1084,8 @@ Result<std::shared_ptr<HeifPixelImage>> ImageItem::decode_from_compressed_data(h
 }
 
 
-Result<std::shared_ptr<HeifPixelImage>> ImageItem::decode_compressed_image(const struct heif_decoding_options& options,
- bool decode_tile_only, uint32_t tile_x0, uint32_t tile_y0) const
+Result<std::vector<uint8_t>> ImageItem::get_compressed_image_data() const
 {
- // --- find the decoder plugin with the correct compression format
-
- heif_compression_format compression_format = get_compression_format();
- if (compression_format == heif_compression_undefined) {
- return Error{heif_error_Decoder_plugin_error, heif_suberror_Unsupported_codec, "Decoding not supported"};
- }
-
  // --- get the compressed image data
 
  // data from configuration blocks
@@ -1107,5 +1104,24 @@ Result<std::shared_ptr<HeifPixelImage>> ImageItem::decode_compressed_image(const
  return error;
  }
 
- return decode_from_compressed_data(compression_format, options, data);
+ return data;
+}
+
+
+Result<std::shared_ptr<HeifPixelImage>> ImageItem::decode_compressed_image(const struct heif_decoding_options& options,
+ bool decode_tile_only, uint32_t tile_x0, uint32_t tile_y0) const
+{
+ // --- find the decoder plugin with the correct compression format
+
+ heif_compression_format compression_format = get_compression_format();
+ if (compression_format == heif_compression_undefined) {
+ return Error{heif_error_Decoder_plugin_error, heif_suberror_Unsupported_codec, "Decoding not supported"};
+ }
+
+ Result<std::vector<uint8_t>> dataResult = get_compressed_image_data();
+ if (dataResult.error) {
+ return dataResult.error;
+ }
+
+ return decode_from_compressed_data(compression_format, options, *dataResult);
 }
diff --git a/libheif/codecs/image_item.h b/libheif/codecs/image_item.h
@@ -263,6 +263,8 @@ class ImageItem : public ErrorBuffer
  virtual Result<std::shared_ptr<HeifPixelImage>> decode_compressed_image(const struct heif_decoding_options& options,
  bool decode_tile_only, uint32_t tile_x0, uint32_t tile_y0) const;
 
+ virtual Result<std::vector<uint8_t>> get_compressed_image_data() const;
+
  Error check_for_valid_image_size(uint32_t width, uint32_t height) const;
 
  // === encoding ===

diff --git a/libheif/codecs/jpeg2000.cc b/libheif/codecs/jpeg2000.cc
@@ -312,12 +312,11 @@ std::string Box_j2kH::dump(Indent& indent) const
 }
 
 
-Error JPEG2000MainHeader::parseHeader(const HeifFile& file, const heif_item_id imageID)
+Error JPEG2000MainHeader::parseHeader(const std::vector<uint8_t>& compressedImageData)
 {
- Error err = file.get_compressed_image_data(imageID, &headerData);
- if (err) {
- return err;
- }
+ // TODO: it is very inefficient to store the whole image data when we only need the header
+
+ headerData = compressedImageData;
  return doParse();
 }
 
@@ -569,8 +568,13 @@ Result<std::vector<uint8_t>> ImageItem_JPEG2000::read_bitstream_configuration_da
 
 int ImageItem_JPEG2000::get_luma_bits_per_pixel() const
 {
+ Result<std::vector<uint8_t>> imageDataResult = get_compressed_image_data();
+ if (imageDataResult.error) {
+ return -1;
+ }
+
  JPEG2000MainHeader header;
- Error err = header.parseHeader(*get_file(), get_id());
+ Error err = header.parseHeader(*imageDataResult);
  if (err) {
  return -1;
  }
@@ -580,8 +584,13 @@ int ImageItem_JPEG2000::get_luma_bits_per_pixel() const
 
 int ImageItem_JPEG2000::get_chroma_bits_per_pixel() const
 {
+ Result<std::vector<uint8_t>> imageDataResult = get_compressed_image_data();
+ if (imageDataResult.error) {
+ return -1;
+ }
+
  JPEG2000MainHeader header;
- Error err = header.parseHeader(*get_file(), get_id());
+ Error err = header.parseHeader(*imageDataResult);
  if (err) {
  return -1;
  }

diff --git a/libheif/codecs/jpeg2000.h b/libheif/codecs/jpeg2000.h
@@ -440,7 +440,7 @@ struct JPEG2000MainHeader
 public:
  JPEG2000MainHeader() = default;
 
- Error parseHeader(const HeifFile& file, const heif_item_id imageID);
+ Error parseHeader(const std::vector<uint8_t>& compressedImageData);
 
  // Use parseHeader instead - these are mainly for unit testing
  Error doParse();

diff --git a/libheif/error.h b/libheif/error.h
@@ -33,7 +33,7 @@
 #include <sstream>
 
 #include "libheif/heif.h"
-
+#include <cassert>
 
 static constexpr char kSuccess[] = "Success";
 
@@ -115,6 +115,12 @@ template <typename T> class Result
 
  operator bool() const { return error.error_code == heif_error_Ok; }
 
+ T& operator*()
+ {
+ assert(error.error_code == heif_error_Ok);
+ return value;
+ }
+
  T value;
  Error error;
 };