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

Commit 0b9f7de6 authored by Dichen Zhang's avatar Dichen Zhang
Browse files

libjpegrecoverymap: a few fixes 

1. introduce maxLength parameter in compressed data structure that holds max available buffer size, and buffer boundary checks should rely on this parameter
2. make recovery map compress quality a static configuration instead of using a magic number

Change-Id: I4af25931ab905c0d524cfa02c6057e9cf128b5ca
Test: build
Bug: b/252835416
parent d4ebf542

libs/jpegrecoverymap/include/jpegrecoverymap/recoverymap.h

+3 −1
Original line number Diff line number Diff line
@@ -54,8 +54,10 @@ struct jpegr_uncompressed_struct { 
struct jpegr_compressed_struct {

    // Pointer to the data location.

    void* data;

    // Data length.

    // Used data length in bytes.

    int length;

    // Maximum available data length in bytes.

    int maxLength;

    // Color gamut.

    jpegr_color_gamut colorGamut;

};

libs/jpegrecoverymap/recoverymap.cpp

+16 −10
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ static const uint32_t kJpegrVersion = 1; 


// Map is quarter res / sixteenth size

static const size_t kMapDimensionScaleFactor = 4;

// JPEG compress quality (0 ~ 100) for recovery map

static const int kMapCompressQuality = 85;



// TODO: fill in st2086 metadata

static const st2086_metadata kSt2086Metadata = {
@@ -77,7 +79,7 @@ string Name(const string &prefix, const string &suffix) { 
 * @return status of succeed or error code.

 */

status_t Write(jr_compressed_ptr destination, const void* source, size_t length, int &position) {

  if (position + length > destination->length) {

  if (position + length > destination->maxLength) {

    return ERROR_JPEGR_BUFFER_TOO_SMALL;

  }
@@ -121,8 +123,8 @@ status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image, 
  map_data.reset(reinterpret_cast<uint8_t*>(map.data));



  jpegr_compressed_struct compressed_map;

  std::unique_ptr<uint8_t[]> compressed_map_data =

      std::make_unique<uint8_t[]>(map.width * map.height);

  compressed_map.maxLength = map.width * map.height;

  unique_ptr<uint8_t[]> compressed_map_data = make_unique<uint8_t[]>(compressed_map.maxLength);

  compressed_map.data = compressed_map_data.get();

  JPEGR_CHECK(compressRecoveryMap(&map, &compressed_map));
@@ -173,8 +175,8 @@ status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image, 
  map_data.reset(reinterpret_cast<uint8_t*>(map.data));



  jpegr_compressed_struct compressed_map;

  std::unique_ptr<uint8_t[]> compressed_map_data =

      std::make_unique<uint8_t[]>(map.width * map.height);

  compressed_map.maxLength = map.width * map.height;

  unique_ptr<uint8_t[]> compressed_map_data = make_unique<uint8_t[]>(compressed_map.maxLength);

  compressed_map.data = compressed_map_data.get();

  JPEGR_CHECK(compressRecoveryMap(&map, &compressed_map));
@@ -222,8 +224,8 @@ status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image, 
  map_data.reset(reinterpret_cast<uint8_t*>(map.data));



  jpegr_compressed_struct compressed_map;

  std::unique_ptr<uint8_t[]> compressed_map_data =

      std::make_unique<uint8_t[]>(map.width * map.height);

  compressed_map.maxLength = map.width * map.height;

  unique_ptr<uint8_t[]> compressed_map_data = make_unique<uint8_t[]>(compressed_map.maxLength);

  compressed_map.data = compressed_map_data.get();

  JPEGR_CHECK(compressRecoveryMap(&map, &compressed_map));
@@ -289,13 +291,17 @@ status_t RecoveryMap::compressRecoveryMap(jr_uncompressed_ptr uncompressed_recov 


  // TODO: should we have ICC data for the map?

  JpegEncoder jpeg_encoder;

  if (!jpeg_encoder.compressImage(uncompressed_recovery_map->data, uncompressed_recovery_map->width,

                                  uncompressed_recovery_map->height, 85, nullptr, 0,

  if (!jpeg_encoder.compressImage(uncompressed_recovery_map->data,

                                  uncompressed_recovery_map->width,

                                  uncompressed_recovery_map->height,

                                  kMapCompressQuality,

                                  nullptr,

                                  0,

                                  true /* isSingleChannel */)) {

    return ERROR_JPEGR_ENCODE_ERROR;

  }



  if (dest->length < jpeg_encoder.getCompressedImageSize()) {

  if (dest->maxLength < jpeg_encoder.getCompressedImageSize()) {

    return ERROR_JPEGR_BUFFER_TOO_SMALL;

  }