aboutsummaryrefslogtreecommitdiff
path: root/camera
diff options
context:
space:
mode:
authornichcream <c.potato23@gmail.com>2018-04-07 19:42:11 +0800
committerDavide Garberi <dade.garberi@gmail.com>2019-02-06 13:56:16 +0100
commitbcbd55cff518f0345885b6b5ec94edd6049b41af (patch)
treebefc5150f84ac11ff288d4af847890d5edbb6e42 /camera
parent08c7aa76919692fa44b0ddceb206cd78d6f263a5 (diff)
msm8996-common: camera: HAL3: Use the largest fps range during video record
Change-Id: I45ddcc7dea608b4909442fdffdf65a9be5155977 Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Diffstat (limited to 'camera')
-rw-r--r--camera/QCamera2/HAL3/QCamera3HWI.cpp25
1 files 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);