commit b63b68bcba4bc28ddd17f00061cfa113e4655f51
author Shuzhen Wang <shuzhenwang@google.com> Wed May 31 21:55:15 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 31 21:55:15 2023 +0000
tree 4a3c3ae9cd920f6af820aa8323b92ec9cc38aa2b
parent 896a61f12678d07631701de07e52700ddcdf9335
parent fa23af18bd135f3e4d8f1c61a6f02b6750e7eebf

Merge "Camera: Use originalFormat for getMaxPreviewFps" into udc-dev

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index f5f50a5..cfe51c7 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -1906,7 +1906,7 @@
     camera_metadata_entry minDurations =
             mDeviceInfo.find(ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS);
     for (size_t i = 0; i < minDurations.count; i += 4) {
-        if (minDurations.data.i64[i] == stream->getFormat()
+        if (minDurations.data.i64[i] == stream->getOriginalFormat()
                 && minDurations.data.i64[i+1] == stream->getWidth()
                 && minDurations.data.i64[i+2] == stream->getHeight()) {
             int64_t minFrameDuration = minDurations.data.i64[i+3];