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

Commit fa23af18 authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Camera: Use originalFormat for getMaxPreviewFps 

HAL could override IMPL_DEFINED format. Use original format instead.

Test: Camera CTS
Bug: 285170367
Change-Id: Ib5d59cd1639ac8814bb6b4054b2378a8730fc6bf
parent c10125de

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