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

Commit 41f0c977 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Automerger Merge Worker
Browse files

Merge "cameraserver: Fix floating point truncation for... 

Merge "cameraserver:  Fix floating point truncation for getUHRMaxJpegBufferSize" am: c1ea39b9 am: 0f6e84a0

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2151867



Change-Id: I5f9c55108d78a40895c39bf9de4b7829b46620dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bbeb1b5f 0f6e84a0

services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -127,7 +127,7 @@ camera3::Size getMaxJpegResolution(const CameraMetadata &metadata, 




size_t getUHRMaxJpegBufferSize(camera3::Size uhrMaxJpegSize,

size_t getUHRMaxJpegBufferSize(camera3::Size uhrMaxJpegSize,

        camera3::Size defaultMaxJpegSize, size_t defaultMaxJpegBufferSize) {

        camera3::Size defaultMaxJpegSize, size_t defaultMaxJpegBufferSize) {

    return (uhrMaxJpegSize.width * uhrMaxJpegSize.height) /

    return ((float)uhrMaxJpegSize.width * uhrMaxJpegSize.height) /

            (defaultMaxJpegSize.width * defaultMaxJpegSize.height) * defaultMaxJpegBufferSize;

            (defaultMaxJpegSize.width * defaultMaxJpegSize.height) * defaultMaxJpegBufferSize;

}

}