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

Commit d60d3d35 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

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

Merge "Camera: Use originalFormat for getMaxPreviewFps" into udc-dev am: b63b68bc am: fb757f5b am: a3ed2ffe

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



Change-Id: I50e2ec754b3fea6ce3b0a2e6bbb6869a0a2bf7bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 92a73ecc a3ed2ffe

services/camera/libcameraservice/device3/Camera3Device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1906,7 +1906,7 @@ float Camera3Device::getMaxPreviewFps(sp<camera3::Camera3OutputStreamInterface> 
    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];