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

Commit 375d30aa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Use area to check against 1080p size" into tm-qpr-dev am: daa52e99 

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



Change-Id: Ic48e0beb857357c89392e823e24b24b9214a97d7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d4df35b daa52e99

services/camera/libcameraservice/common/CameraProviderManager.cpp

+6 −6
Original line number Diff line number Diff line
@@ -2443,8 +2443,8 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo3::filterSmallJpegSizes( 
    for (size_t i = 0; i < streamConfigs.count; i += 4) {

        if ((streamConfigs.data.i32[i] == HAL_PIXEL_FORMAT_BLOB) && (streamConfigs.data.i32[i+3] ==

                ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT)) {

            if (streamConfigs.data.i32[i+1] < thresholdW  ||

                    streamConfigs.data.i32[i+2] < thresholdH) {

            if (streamConfigs.data.i32[i+1] * streamConfigs.data.i32[i+2] <

                    thresholdW * thresholdH) {

                continue;

            } else {

                largeJpegCount ++;
@@ -2464,8 +2464,8 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo3::filterSmallJpegSizes( 
            mCameraCharacteristics.find(ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS);

    for (size_t i = 0; i < minDurations.count; i += 4) {

        if (minDurations.data.i64[i] == HAL_PIXEL_FORMAT_BLOB) {

            if (minDurations.data.i64[i+1] < thresholdW ||

                    minDurations.data.i64[i+2] < thresholdH) {

            if ((int32_t)minDurations.data.i64[i+1] * (int32_t)minDurations.data.i64[i+2] <

                    thresholdW * thresholdH) {

                continue;

            } else {

                largeJpegCount++;
@@ -2485,8 +2485,8 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo3::filterSmallJpegSizes( 
            mCameraCharacteristics.find(ANDROID_SCALER_AVAILABLE_STALL_DURATIONS);

    for (size_t i = 0; i < stallDurations.count; i += 4) {

        if (stallDurations.data.i64[i] == HAL_PIXEL_FORMAT_BLOB) {

            if (stallDurations.data.i64[i+1] < thresholdW ||

                    stallDurations.data.i64[i+2] < thresholdH) {

            if ((int32_t)stallDurations.data.i64[i+1] * (int32_t)stallDurations.data.i64[i+2] <

                    thresholdW * thresholdH) {

                continue;

            } else {

                largeJpegCount++;