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

Commit 9b75da42 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: b63b68bc 

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



Change-Id: Ie7da10a3d59d4bfd38c9fc6f1fe589bdbff259c1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9bee9379 b63b68bc

services/camera/libcameraservice/device3/Camera3Device.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1906,7 +1906,7 @@ float Camera3Device::getMaxPreviewFps(sp<camera3::Camera3OutputStreamInterface> 
    camera_metadata_entry minDurations =

    camera_metadata_entry minDurations =

            mDeviceInfo.find(ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS);

            mDeviceInfo.find(ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS);

    for (size_t i = 0; i < minDurations.count; i += 4) {

    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+1] == stream->getWidth()

                && minDurations.data.i64[i+2] == stream->getHeight()) {

                && minDurations.data.i64[i+2] == stream->getHeight()) {

            int64_t minFrameDuration = minDurations.data.i64[i+3];

            int64_t minFrameDuration = minDurations.data.i64[i+3];