summaryrefslogtreecommitdiffstats
path: root/libcamera
diff options
context:
space:
mode:
authorJeong-Seok Yang <jseok.yang@samsung.com>2010-10-28 09:14:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-28 09:14:26 -0700
commit27fc90a2eb9a5282f7c254acbd8984993f793eba (patch)
treee02cc6f04f4538a1c90aa41aa8162ee5dc2c24cd /libcamera
parent7639b4de08763301673a32870b563b21f8873786 (diff)
parent9568ea0573113abd43b99640bade3f1f17f6213b (diff)
downloaddevice_samsung_crespo-27fc90a2eb9a5282f7c254acbd8984993f793eba.zip
device_samsung_crespo-27fc90a2eb9a5282f7c254acbd8984993f793eba.tar.gz
device_samsung_crespo-27fc90a2eb9a5282f7c254acbd8984993f793eba.tar.bz2
am 9568ea05: am a75b35c7: libcamera: for setting fixed frame rate on only camcording mode
* commit '9568ea0573113abd43b99640bade3f1f17f6213b': libcamera: for setting fixed frame rate on only camcording mode
Diffstat (limited to 'libcamera')
-rw-r--r--libcamera/SecCamera.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/libcamera/SecCamera.cpp b/libcamera/SecCamera.cpp
index 1519be8..4a6959b 100644
--- a/libcamera/SecCamera.cpp
+++ b/libcamera/SecCamera.cpp
@@ -1065,9 +1065,14 @@ int SecCamera::startRecord(void)
LOGE("%s: m_recording_width = %d, m_recording_height = %d\n", __func__, m_recording_width, m_recording_height);
ret = fimc_v4l2_s_fmt(m_cam_fd2, m_recording_width, m_recording_height, m_record_v4lformat, 0);
-
CHECK(ret);
+ if (m_camera_id == CAMERA_ID_BACK) {
+ ret = fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_CAMERA_FRAME_RATE,
+ m_params->capture.timeperframe.denominator);
+ CHECK(ret);
+ }
+
init_yuv_buffers(m_buffers_c2, m_recording_width, m_recording_height, m_record_v4lformat);
#else /* SWP1_CAMERA_ADD_ADVANCED_FUNCTION */
ret = fimc_v4l2_s_fmt(m_cam_fd2, m_preview_width, m_preview_height, m_record_v4lformat, 0);
@@ -1115,6 +1120,12 @@ int SecCamera::stopRecord(void)
int ret = fimc_v4l2_streamoff(m_cam_fd2);
+ if (m_camera_id == CAMERA_ID_BACK) {
+ ret = fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_CAMERA_FRAME_RATE,
+ FRAME_RATE_AUTO);
+ CHECK(ret);
+ }
+
m_flag_record_start = 0;
CHECK(ret);