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

Commit bf241576 authored by Fyodor Kyslov's avatar Fyodor Kyslov
Browse files

librecoverymap: Fix lifecycle of recovery map decoder 

This fixes the issue with lifecycle of recovery map decoder and makes
decompressed data valid till the image is converted and copied to the
destination

Bug: b/252835416
Test: manual
Change-Id: Ieaef889bdabe77997063ea50dc81699af3cfb2cd
parent 80a1dd74

libs/jpegrecoverymap/include/jpegrecoverymap/recoverymap.h

+0 −10
Original line number Diff line number Diff line
@@ -250,16 +250,6 @@ public: 
    status_t getJPEGRInfo(jr_compressed_ptr compressed_jpegr_image,

                          jr_info_ptr jpegr_info);

private:

    /*

     * This method is called in the decoding pipeline. It will decode the recovery map.

     *

     * @param compressed_recovery_map compressed recovery map

     * @param dest decoded recover map

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

     */

    status_t decompressRecoveryMap(jr_compressed_ptr compressed_recovery_map,

                               jr_uncompressed_ptr dest);



    /*

     * This method is called in the encoding pipeline. It will encode the recovery map.

     *

libs/jpegrecoverymap/recoverymap.cpp

+12 −21
Original line number Diff line number Diff line
@@ -319,14 +319,24 @@ status_t RecoveryMap::decodeJPEGR(jr_compressed_ptr compressed_jpegr_image, 
  jpegr_metadata metadata;

  JPEGR_CHECK(extractRecoveryMap(compressed_jpegr_image, &compressed_map));



  jpegr_uncompressed_struct map;

  JPEGR_CHECK(decompressRecoveryMap(&compressed_map, &map));



  JpegDecoder jpeg_decoder;

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

    return ERROR_JPEGR_DECODE_ERROR;

  }



  JpegDecoder 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();

  map.height = recovery_map_decoder.getDecompressedImageHeight();





  jpegr_uncompressed_struct uncompressed_yuv_420_image;

  uncompressed_yuv_420_image.data = jpeg_decoder.getDecompressedImagePtr();

  uncompressed_yuv_420_image.width = jpeg_decoder.getDecompressedImageWidth();
@@ -349,25 +359,6 @@ status_t RecoveryMap::decodeJPEGR(jr_compressed_ptr compressed_jpegr_image, 
  return NO_ERROR;

}



status_t RecoveryMap::decompressRecoveryMap(jr_compressed_ptr compressed_recovery_map,

                                            jr_uncompressed_ptr dest) {

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

    return ERROR_JPEGR_INVALID_NULL_PTR;

  }



  JpegDecoder jpeg_decoder;

  if (!jpeg_decoder.decompressImage(compressed_recovery_map->data,

                                    compressed_recovery_map->length)) {

    return ERROR_JPEGR_DECODE_ERROR;

  }



  dest->data = jpeg_decoder.getDecompressedImagePtr();

  dest->width = jpeg_decoder.getDecompressedImageWidth();

  dest->height = jpeg_decoder.getDecompressedImageHeight();



  return NO_ERROR;

}



status_t RecoveryMap::compressRecoveryMap(jr_uncompressed_ptr uncompressed_recovery_map,

                                          jr_compressed_ptr dest) {

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