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

Commit 10f99216 authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Camera: Use area to check against 1080p size 

Some devices may support portrait resolutions in addition to landscape.
To better handle those cases, use area to compare size rather than
comparing width and height separately.

Test: Camera CTS
Bug: 264498709
Change-Id: I9060ebbd11cba4f2f55b01cc21c8f091ddc900a6
parent 0e50045c

services/camera/libcameraservice/common/CameraProviderManager.cpp

+6 −6
Original line number Diff line number Diff line
@@ -2439,8 +2439,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 ++;
@@ -2460,8 +2460,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++;
@@ -2481,8 +2481,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++;