Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d40a05c7 authored by Dichen Zhang's avatar Dichen Zhang Committed by Automerger Merge Worker
Browse files

Merge "jpegr decoder: expose decoding result of recovery map" into udc-dev am: 72474b97 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21900309



Change-Id: I1e4663834949f643bcab52b92c906e28f6a4e0aa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6b241f9 72474b97

libs/jpegrecoverymap/include/jpegrecoverymap/jpegr.h

+3 −1
Original line number Diff line number Diff line
@@ -206,12 +206,14 @@ public: 
     * @param output_format flag for setting output color format. if set to

     *                      {@code JPEGR_OUTPUT_SDR}, decoder will only decode the primary image

     *                      which is SDR. Default value is JPEGR_OUTPUT_HDR_LINEAR.

     * @param recovery_map destination of the decoded recovery map.

     * @return NO_ERROR if decoding succeeds, error code if error occurs.

     */

    status_t decodeJPEGR(jr_compressed_ptr compressed_jpegr_image,

                         jr_uncompressed_ptr dest,

                         jr_exif_ptr exif = nullptr,

                         jpegr_output_format output_format = JPEGR_OUTPUT_HDR_LINEAR);

                         jpegr_output_format output_format = JPEGR_OUTPUT_HDR_LINEAR,

                         jr_uncompressed_ptr recovery_map = nullptr);



    /*

    * Gets Info from JPEGR file without decoding it.

libs/jpegrecoverymap/jpegr.cpp

+38 −8
Original line number Diff line number Diff line
@@ -331,7 +331,8 @@ status_t JpegR::getJPEGRInfo(jr_compressed_ptr compressed_jpegr_image, jr_info_p 
status_t JpegR::decodeJPEGR(jr_compressed_ptr compressed_jpegr_image,

                            jr_uncompressed_ptr dest,

                            jr_exif_ptr exif,

                            jpegr_output_format output_format) {

                            jpegr_output_format output_format,

                            jr_uncompressed_ptr recovery_map) {

  if (compressed_jpegr_image == nullptr || dest == nullptr) {

    return ERROR_JPEGR_INVALID_NULL_PTR;

  }
@@ -350,13 +351,46 @@ status_t JpegR::decodeJPEGR(jr_compressed_ptr compressed_jpegr_image, 
           uncompressed_rgba_image.width * uncompressed_rgba_image.height * 4);

    dest->width = uncompressed_rgba_image.width;

    dest->height = uncompressed_rgba_image.height;



    if (recovery_map == nullptr && exif == nullptr) {

      return NO_ERROR;

    }



    if (exif != nullptr) {

      if (exif->data == nullptr) {

        return ERROR_JPEGR_INVALID_NULL_PTR;

      }

      if (exif->length < jpeg_decoder.getEXIFSize()) {

        return ERROR_JPEGR_BUFFER_TOO_SMALL;

      }

      memcpy(exif->data, jpeg_decoder.getEXIFPtr(), jpeg_decoder.getEXIFSize());

      exif->length = jpeg_decoder.getEXIFSize();

    }

    if (recovery_map == nullptr) {

      return NO_ERROR;

    }

  }



  jpegr_compressed_struct compressed_map;

  jpegr_metadata metadata;

  JPEGR_CHECK(extractRecoveryMap(compressed_jpegr_image, &compressed_map));



  JpegDecoderHelper recovery_map_decoder;

  if (!recovery_map_decoder.decompressImage(compressed_map.data, compressed_map.length)) {

    return ERROR_JPEGR_DECODE_ERROR;

  }



  if (recovery_map != nullptr) {

    recovery_map->width = recovery_map_decoder.getDecompressedImageWidth();

    recovery_map->height = recovery_map_decoder.getDecompressedImageHeight();

    int size = recovery_map->width * recovery_map->height;

    recovery_map->data = malloc(size);

    memcpy(recovery_map->data, recovery_map_decoder.getDecompressedImagePtr(), size);

  }



  if (output_format == JPEGR_OUTPUT_SDR) {

    return NO_ERROR;

  }



  JpegDecoderHelper jpeg_decoder;

  if (!jpeg_decoder.decompressImage(compressed_jpegr_image->data, compressed_jpegr_image->length)) {

    return ERROR_JPEGR_DECODE_ERROR;
@@ -373,11 +407,6 @@ status_t JpegR::decodeJPEGR(jr_compressed_ptr compressed_jpegr_image, 
    exif->length = jpeg_decoder.getEXIFSize();

  }



  JpegDecoderHelper recovery_map_decoder;

  if (!recovery_map_decoder.decompressImage(compressed_map.data, compressed_map.length)) {

    return ERROR_JPEGR_DECODE_ERROR;

  }



  jpegr_uncompressed_struct map;

  map.data = recovery_map_decoder.getDecompressedImagePtr();

  map.width = recovery_map_decoder.getDecompressedImageWidth();
@@ -388,6 +417,7 @@ status_t JpegR::decodeJPEGR(jr_compressed_ptr compressed_jpegr_image, 
  uncompressed_yuv_420_image.width = jpeg_decoder.getDecompressedImageWidth();

  uncompressed_yuv_420_image.height = jpeg_decoder.getDecompressedImageHeight();



  jpegr_metadata metadata;

  if (!getMetadataFromXMP(static_cast<uint8_t*>(recovery_map_decoder.getXMPPtr()),

                          recovery_map_decoder.getXMPSize(), &metadata)) {

    return ERROR_JPEGR_DECODE_ERROR;