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

Commit 2db27ab9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "cameraserver: Fix DYNAMIC_DEPTH / HEIC keys selected for UHR stream... 

Merge "cameraserver: Fix DYNAMIC_DEPTH / HEIC keys selected for UHR stream configurations." into udc-dev am: 16fd990d

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



Change-Id: I2a4172d5863340ead09422829926456331804485
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a9f2ee0c 16fd990d

services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -73,11 +73,11 @@ void StreamConfiguration::getStreamConfigurations( 


    int32_t dynamicDepthKey =

            SessionConfigurationUtils::getAppropriateModeTag(

                    ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STREAM_CONFIGURATIONS);

                    ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STREAM_CONFIGURATIONS, maxRes);



    int32_t heicKey =

            SessionConfigurationUtils::getAppropriateModeTag(

                    ANDROID_HEIC_AVAILABLE_HEIC_STREAM_CONFIGURATIONS);

                    ANDROID_HEIC_AVAILABLE_HEIC_STREAM_CONFIGURATIONS, maxRes);



    getStreamConfigurations(staticInfo, scalerKey, scm);

    getStreamConfigurations(staticInfo, depthKey, scm);