commit 9492b0748d530c4f1d858acd5dc702791d75afa5
author Jayant Chowdhary <jchowdhary@google.com> Tue Jun 13 18:07:42 2023 -0700
committer Jayant Chowdhary <jchowdhary@google.com> Tue Jun 13 18:07:43 2023 -0700
tree 53741a395e598acdbce1a1fecb7cc8d84521f5d6
parent c506352145c6d7d9806701edce16a7eb11880302

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

Bug: 284273379

Test: vendor testing

Change-Id: Ia037fc37cfc9132a2f75534067de98cd44b07b5b
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp

diff --git a/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp b/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
index ffd9f01..89e75b3 100644
--- a/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
+++ b/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
@@ -73,11 +73,11 @@
 
     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);