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

Commit 7790a332 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by Android Git Automerger
Browse files

am 656d738c: am a789e519: am 0c4e56d0: Camera: make sure jpeg buffer size isn\'t too small

* commit '656d738c':
  Camera: make sure jpeg buffer size isn't too small
parents 3f603dad 656d738c
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -361,16 +361,15 @@ ssize_t Camera3Device::getJpegBufferSize(uint32_t width, uint32_t height) const
        return BAD_VALUE;
    }
    maxJpegBufferSize = jpegBufMaxSize.data.i32[0];
    assert(kMinJpegBufferSize < maxJpegBufferSize);

    // Calculate final jpeg buffer size for the given resolution.
    float scaleFactor = ((float) (width * height)) /
            (maxJpegResolution.width * maxJpegResolution.height);
    ssize_t jpegBufferSize = scaleFactor * maxJpegBufferSize;
    // Bound the buffer size to [MIN_JPEG_BUFFER_SIZE, maxJpegBufferSize].
    ssize_t jpegBufferSize = scaleFactor * (maxJpegBufferSize - kMinJpegBufferSize) +
            kMinJpegBufferSize;
    if (jpegBufferSize > maxJpegBufferSize) {
        jpegBufferSize = maxJpegBufferSize;
    } else if (jpegBufferSize < kMinJpegBufferSize) {
        jpegBufferSize = kMinJpegBufferSize;
    }

    return jpegBufferSize;