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

Commit 55637826 authored by Dichen Zhang's avatar Dichen Zhang Committed by Android (Google) Code Review
Browse files

Merge changes I65daa5ac,I67a5274b into main 

* changes:
  ultrahdr: revert gain map image dimension calculation
  ultrahdr: fix initialization in enc fuzzer
parents 1a948dde 2c3d7fbc

libs/ultrahdr/fuzzer/ultrahdr_enc_fuzzer.cpp

+3 −5
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;
@@ -207,7 +205,7 @@ void UltraHdrEncFuzzer::process() { 
                fill420Buffer(bufferYSdr.get(), width, height, yStride);

                size_t yuv420UVSize = uvStride * yuv420Img.height / 2 * 2;

                bufferUVSdr = std::make_unique<uint8_t[]>(yuv420UVSize);

                yuv420Img.chroma_data = bufferYSdr.get();

                yuv420Img.chroma_data = bufferUVSdr.get();

                yuv420Img.chroma_stride = uvStride;

                fill420Buffer(bufferUVSdr.get(), width / 2, height / 2, uvStride);

                fill420Buffer(bufferUVSdr.get() + uvStride * height / 2, width / 2, height / 2,

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",