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

Commit b63b68bc authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Android (Google) Code Review
Browse files

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

parents 896a61f1 fa23af18

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];