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

Commit 0c4e56d0 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh
Browse files

Camera: make sure jpeg buffer size isn't too small 

Assuming the jpeg header can take up to 256KB, make sure we always
allocate enough size for the image data.

Bug: 18962703
Change-Id: I08eb3d198d12f71f3ab7266324e80fe7410bdc89
parent 7ccc6b9b

services/camera/libcameraservice/device3/Camera3Device.cpp

+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;