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

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

Merge "cameraserver: Fix SessionConfigurationUtils::getAppropriateModeTag"... 

Merge "cameraserver: Fix SessionConfigurationUtils::getAppropriateModeTag" into sc-dev am: 53a58911

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

Change-Id: I6753cdf390fffea4e3f4cb64e0088a5855fa8a49
parents e2fd9169 53a58911

services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp

+3 −3
Original line number Diff line number Diff line
@@ -142,19 +142,19 @@ int32_t SessionConfigurationUtils::getAppropriateModeTag(int32_t defaultTag, boo 
        case ANDROID_DEPTH_AVAILABLE_DEPTH_MIN_FRAME_DURATIONS:

            return ANDROID_DEPTH_AVAILABLE_DEPTH_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION;

        case ANDROID_DEPTH_AVAILABLE_DEPTH_STALL_DURATIONS:

            return ANDROID_DEPTH_AVAILABLE_DEPTH_STALL_DURATIONS;

            return ANDROID_DEPTH_AVAILABLE_DEPTH_STALL_DURATIONS_MAXIMUM_RESOLUTION;

        case ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STREAM_CONFIGURATIONS:

            return ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION;

        case ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_MIN_FRAME_DURATIONS:

            return ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION;

        case ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STALL_DURATIONS:

            return ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STALL_DURATIONS;

            return ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STALL_DURATIONS_MAXIMUM_RESOLUTION;

        case ANDROID_HEIC_AVAILABLE_HEIC_STREAM_CONFIGURATIONS:

            return ANDROID_HEIC_AVAILABLE_HEIC_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION;

        case ANDROID_HEIC_AVAILABLE_HEIC_MIN_FRAME_DURATIONS:

            return ANDROID_HEIC_AVAILABLE_HEIC_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION;

        case ANDROID_HEIC_AVAILABLE_HEIC_STALL_DURATIONS:

            return ANDROID_HEIC_AVAILABLE_HEIC_STALL_DURATIONS;

            return ANDROID_HEIC_AVAILABLE_HEIC_STALL_DURATIONS_MAXIMUM_RESOLUTION;

        case ANDROID_SENSOR_OPAQUE_RAW_SIZE:

            return ANDROID_SENSOR_OPAQUE_RAW_SIZE_MAXIMUM_RESOLUTION;

        case ANDROID_LENS_INTRINSIC_CALIBRATION: