| commit | 2df9d7389324c531ad05ff2dd9fc4493cf84df93 | [log] [tgz] |
|---|---|---|
| author | Shuzhen Wang <shuzhenwang@google.com> | Wed May 31 23:17:47 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 31 23:17:47 2023 +0000 |
| tree | 46ced8d7c35701f27714f23ec77234b2a38ceea0 | |
| parent | 033b1bb2c82fd1ff58db521947ae73de6f461d8f [diff] | |
| parent | 2c6bb16f32934c0ab05d7bb7a39b8a3bca002642 [diff] |
Merge "Camera: Use originalFormat for getMaxPreviewFps" into udc-dev am: b63b68bcba am: 2c6bb16f32 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/23498276 Change-Id: I1f77b998047f3c932324c9d1b8cbfc262cd46fce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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];