| commit | 7432c03643d13b2cda42ac298f298f0699a43b29 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 09 16:57:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 09 16:57:53 2023 +0000 |
| tree | 2a0a2679b305b6089aed7905834ccd79b038bc21 | |
| parent | fe5a9f7b00cfef132b3e2f44e02582bf6ca30135 [diff] | |
| parent | 1fbc05b511a2cb4728862fac70e345e76ec10f73 [diff] |
Merge "Camera: Retrieve maximum duration BLOB tags" into udc-dev am: 1fbc05b511 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/23591958 Change-Id: Ibd7ae45be13c49809fcb52f23f3b865e0a1d5e9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp index a4d74cb..1a6e341 100644 --- a/services/camera/libcameraservice/common/CameraProviderManager.cpp +++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -1127,8 +1127,8 @@ const int32_t scalerSizesTag = SessionConfigurationUtils::getAppropriateModeTag( ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS, maxResolution); - const int32_t scalerMinFrameDurationsTag = - ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS; + const int32_t scalerMinFrameDurationsTag = SessionConfigurationUtils::getAppropriateModeTag( + ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS, maxResolution); const int32_t scalerStallDurationsTag = SessionConfigurationUtils::getAppropriateModeTag( ANDROID_SCALER_AVAILABLE_STALL_DURATIONS, maxResolution);