diff options
| author | Simon Wilson <simonwilson@google.com> | 2010-10-29 18:50:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-29 18:50:24 -0700 |
| commit | b3320b82a1300fb446beb35e035b014f963ea81e (patch) | |
| tree | 20f8e2baceafffb8ff061806c68bf57bc75b8d23 | |
| parent | d83f1dafcb041d5d86b8e7864b5e3533d363ff90 (diff) | |
| parent | 0df2d5f227df6916a4f026bdc2ec60b6b1b999f1 (diff) | |
| download | device_samsung_crespo-b3320b82a1300fb446beb35e035b014f963ea81e.zip device_samsung_crespo-b3320b82a1300fb446beb35e035b014f963ea81e.tar.gz device_samsung_crespo-b3320b82a1300fb446beb35e035b014f963ea81e.tar.bz2 | |
Merge "libcamera: for keeping user settings of vga camera" into gingerbread
| -rw-r--r-- | libcamera/SecCamera.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/libcamera/SecCamera.cpp b/libcamera/SecCamera.cpp index 3323de1..c336a69 100644 --- a/libcamera/SecCamera.cpp +++ b/libcamera/SecCamera.cpp @@ -968,15 +968,10 @@ int SecCamera::startPreview(void) #ifdef SWP1_CAMERA_ADD_ADVANCED_FUNCTION m_flag_camera_start = 1; - if (m_camera_id == CAMERA_ID_BACK) { - ret = fimc_v4l2_s_parm(m_cam_fd, &m_streamparm); - CHECK(ret); - } else { // In case VGA camera - /* Brightness setting */ - LOGV("m_params->brightness = %d", m_params->brightness); - ret = fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_CAMERA_BRIGHTNESS, - m_params->brightness); - CHECK(ret); + ret = fimc_v4l2_s_parm(m_cam_fd, &m_streamparm); + CHECK(ret); + + if (m_camera_id == CAMERA_ID_FRONT) { /* Blur setting */ LOGV("m_blur_level = %d", m_blur_level); ret = fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_CAMERA_VGA_BLUR, |