diff options
| author | James Dong <jdong@google.com> | 2010-10-29 14:54:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-29 14:54:51 -0700 |
| commit | 42a94f19fce4ad88d05f5970249a6e8d481199d8 (patch) | |
| tree | d11d84cd1a7654b43aa8838565bc60def1907f11 /libcamera | |
| parent | 1569dcc7ba24fd5d79d75e3cd98cfde4cde0426c (diff) | |
| parent | 0b46e2aeab4ba2327daa9e53c33b19264266d81b (diff) | |
| download | device_samsung_crespo-42a94f19fce4ad88d05f5970249a6e8d481199d8.zip device_samsung_crespo-42a94f19fce4ad88d05f5970249a6e8d481199d8.tar.gz device_samsung_crespo-42a94f19fce4ad88d05f5970249a6e8d481199d8.tar.bz2 | |
am 0b46e2ae: am dbc622a6: Revert "libcamera: for setting fixed frame rate on only camcording mode"
* commit '0b46e2aeab4ba2327daa9e53c33b19264266d81b':
Revert "libcamera: for setting fixed frame rate on only camcording mode"
Diffstat (limited to 'libcamera')
| -rw-r--r-- | libcamera/SecCamera.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/libcamera/SecCamera.cpp b/libcamera/SecCamera.cpp index 2aa9eec..3323de1 100644 --- a/libcamera/SecCamera.cpp +++ b/libcamera/SecCamera.cpp @@ -1067,13 +1067,8 @@ 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); - } + CHECK(ret); init_yuv_buffers(m_buffers_c2, m_recording_width, m_recording_height, m_record_v4lformat); #else /* SWP1_CAMERA_ADD_ADVANCED_FUNCTION */ @@ -1122,12 +1117,6 @@ 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); |