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

Commit 2c3d7fbc authored by Ram Mohan's avatar Ram Mohan Committed by Dichen Zhang
Browse files

ultrahdr: revert gain map image dimension calculation 

Gain map resolution is 1 / kMapDimensionScaleFactor of primary image.
Before computing the gain map image res, the primary image res is
aligned to kMapDimensionScaleFactor and divided. This would require
p010 and 420 to have additional bytes at each row end during access or
clamp the reads to width. Currently neither is present. Until this is
handled, adjust gain map res computations to avoid oob reads.

Bug: 294709120
Bug: 294320724
Test: ./ultrahdr_enc_fuzzer

Change-Id: I65daa5ac49255a8976cf929a5bd0ffe3e47afb6d
parent b08549f7

libs/ultrahdr/fuzzer/ultrahdr_enc_fuzzer.cpp

+2 −4
Original line number Diff line number Diff line
@@ -161,10 +161,8 @@ void UltraHdrEncFuzzer::process() { 
                fillP010Buffer(bufferUVHdr.get(), width, height / 2, uvStride);

            }

        } else {

            size_t map_width = static_cast<size_t>(

                    floor((width + kMapDimensionScaleFactor - 1) / kMapDimensionScaleFactor));

            size_t map_height = static_cast<size_t>(

                    floor((height + kMapDimensionScaleFactor - 1) / kMapDimensionScaleFactor));

            size_t map_width = width / kMapDimensionScaleFactor;

            size_t map_height = height / kMapDimensionScaleFactor;

            // init 400 image

            grayImg.width = map_width;

            grayImg.height = map_height;

libs/ultrahdr/jpegr.cpp

+4 −8
Original line number Diff line number Diff line
@@ -801,10 +801,8 @@ status_t JpegR::generateGainMap(jr_uncompressed_ptr yuv420_image_ptr, 


  size_t image_width = yuv420_image_ptr->width;

  size_t image_height = yuv420_image_ptr->height;

  size_t map_width = static_cast<size_t>(

          floor((image_width + kMapDimensionScaleFactor - 1) / kMapDimensionScaleFactor));

  size_t map_height = static_cast<size_t>(

          floor((image_height + kMapDimensionScaleFactor - 1) / kMapDimensionScaleFactor));

  size_t map_width = image_width / kMapDimensionScaleFactor;

  size_t map_height = image_height / kMapDimensionScaleFactor;



  dest->data = new uint8_t[map_width * map_height];

  dest->width = map_width;
@@ -984,10 +982,8 @@ status_t JpegR::applyGainMap(jr_uncompressed_ptr yuv420_image_ptr, 
  // TODO: remove once map scaling factor is computed based on actual map dims

  size_t image_width = yuv420_image_ptr->width;

  size_t image_height = yuv420_image_ptr->height;

  size_t map_width = static_cast<size_t>(

          floor((image_width + kMapDimensionScaleFactor - 1) / kMapDimensionScaleFactor));

  size_t map_height = static_cast<size_t>(

          floor((image_height + kMapDimensionScaleFactor - 1) / kMapDimensionScaleFactor));

  size_t map_width = image_width / kMapDimensionScaleFactor;

  size_t map_height = image_height / kMapDimensionScaleFactor;

  if (map_width != gainmap_image_ptr->width || map_height != gainmap_image_ptr->height) {

    ALOGE("gain map dimensions and primary image dimensions are not to scale, computed gain map "

          "resolution is %dx%d, received gain map resolution is %dx%d",