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

Commit 4f139b17 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by android-build-merger
Browse files

Merge "Camera: fix expectation of BLOB buffer size" into nyc-dev am: b00df419

am: d2a23dce

* commit 'd2a23dce':
  Camera: fix expectation of BLOB buffer size
parents f3721239 d2a23dce
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -735,8 +735,15 @@ status_t getLockedImageInfo(LockedImage* buffer, int idx,
        case HAL_PIXEL_FORMAT_BLOB:
            // Used for JPEG data, height must be 1, width == size, single plane.
            LOG_ALWAYS_FATAL_IF(idx != 0, "Wrong index: %d", idx);
            // When RGBA override is being used, buffer height will be equal to width
            if (usingRGBAOverride) {
                LOG_ALWAYS_FATAL_IF(buffer->height != buffer->width,
                        "RGBA override BLOB format buffer should have height == width");
            } else {
                LOG_ALWAYS_FATAL_IF(buffer->height != 1,
                    "BLOB format buffer should has height value %d", buffer->height);
                        "BLOB format buffer should have height value 1");
            }


            pData = buffer->data;
            dataSize = Image_getJpegSize(buffer, usingRGBAOverride);