From bcbd55cff518f0345885b6b5ec94edd6049b41af Mon Sep 17 00:00:00 2001 From: nichcream Date: Sat, 7 Apr 2018 19:42:11 +0800 Subject: msm8996-common: camera: HAL3: Use the largest fps range during video record Change-Id: I45ddcc7dea608b4909442fdffdf65a9be5155977 Signed-off-by: Davide Garberi --- camera/QCamera2/HAL3/QCamera3HWI.cpp | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp index 2e13a2f..754a60e 100644 --- a/camera/QCamera2/HAL3/QCamera3HWI.cpp +++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp @@ -8161,25 +8161,12 @@ camera_metadata_t* QCamera3HardwareInterface::translateCapabilityToMetadata(int i++) { float range = gCamCapability[mCameraId]->fps_ranges_tbl[i].max_fps - gCamCapability[mCameraId]->fps_ranges_tbl[i].min_fps; - if (type == CAMERA3_TEMPLATE_PREVIEW || - type == CAMERA3_TEMPLATE_STILL_CAPTURE || - type == CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG) { - if (range > max_range) { - fps_range[0] = - (int32_t)gCamCapability[mCameraId]->fps_ranges_tbl[i].min_fps; - fps_range[1] = - (int32_t)gCamCapability[mCameraId]->fps_ranges_tbl[i].max_fps; - max_range = range; - } - } else { - if (range < 0.01 && max_fixed_fps < - gCamCapability[mCameraId]->fps_ranges_tbl[i].max_fps) { - fps_range[0] = - (int32_t)gCamCapability[mCameraId]->fps_ranges_tbl[i].min_fps; - fps_range[1] = - (int32_t)gCamCapability[mCameraId]->fps_ranges_tbl[i].max_fps; - max_fixed_fps = gCamCapability[mCameraId]->fps_ranges_tbl[i].max_fps; - } + if (range > max_range) { + fps_range[0] = + (int32_t)gCamCapability[mCameraId]->fps_ranges_tbl[i].min_fps; + fps_range[1] = + (int32_t)gCamCapability[mCameraId]->fps_ranges_tbl[i].max_fps; + max_range = range; } } settings.update(ANDROID_CONTROL_AE_TARGET_FPS_RANGE, fps_range, 2); -- cgit v1.2.3