commit 6ba9ef654408148d27f1f8d7559848571001610f
author Sungjoong Kang <sj3.kang@samsung.com> Tue Oct 16 17:42:38 2012 -0700
committer James Dong <jdong@google.com> Tue Oct 16 20:27:32 2012 -0700
tree 473f5a6d3600247aedbabe08026c2b725c0494c6
parent 5d99ec51e355e21a6c31c9a071f9eaf495a5acda

hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode

Removed codes for force-setting 30 FPS for recording mode.

BUG : 6970986
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>

Change-Id: Ife4cce05de3149761b18adf28139166807c4b3c4

libcamera2/ExynosCameraHWInterface2.cpp

diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp
index da4bf27..eca1a3a 100644
--- a/libcamera2/ExynosCameraHWInterface2.cpp
+++ b/libcamera2/ExynosCameraHWInterface2.cpp
@@ -729,13 +729,8 @@
     if (shot_ext->shot.ctl.stats.faceDetectMode != FACEDETECT_MODE_OFF)
         shot_ext->fd_bypass = 0;
 
-    if (targetStreamIndex & STREAM_MASK_RECORD) {
-        shot_ext->shot.ctl.aa.aeTargetFpsRange[0] = 30;
-        shot_ext->shot.ctl.aa.aeTargetFpsRange[1] = 30;
-    } else {
-        shot_ext->shot.ctl.aa.aeTargetFpsRange[0] = request_shot->shot.ctl.aa.aeTargetFpsRange[0];
-        shot_ext->shot.ctl.aa.aeTargetFpsRange[1] = request_shot->shot.ctl.aa.aeTargetFpsRange[1];
-    }
+    shot_ext->shot.ctl.aa.aeTargetFpsRange[0] = request_shot->shot.ctl.aa.aeTargetFpsRange[0];
+    shot_ext->shot.ctl.aa.aeTargetFpsRange[1] = request_shot->shot.ctl.aa.aeTargetFpsRange[1];
 
     ALOGV("(%s): applied aa(%d) aemode(%d) expComp(%d), awb(%d) afmode(%d), ", __FUNCTION__,
     (int)(shot_ext->shot.ctl.aa.mode), (int)(shot_ext->shot.ctl.aa.aeMode),
@@ -3252,8 +3247,6 @@
 
             if (m_wideAspect) {
                 shot_ext->setfile = ISS_SUB_SCENARIO_VIDEO;
-                shot_ext->shot.ctl.aa.aeTargetFpsRange[0] = 30;
-                shot_ext->shot.ctl.aa.aeTargetFpsRange[1] = 30;
             } else {
                 shot_ext->setfile = ISS_SUB_SCENARIO_STILL;
             }
@@ -3520,8 +3513,6 @@
             shot_ext->request_scp = 0;
             if (m_wideAspect) {
                 shot_ext->setfile = ISS_SUB_SCENARIO_VIDEO;
-                shot_ext->shot.ctl.aa.aeTargetFpsRange[0] = 30;
-                shot_ext->shot.ctl.aa.aeTargetFpsRange[1] = 30;
             } else {
                 shot_ext->setfile = ISS_SUB_SCENARIO_STILL;
             }