diff options
| author | Simon Wilson <simonwilson@google.com> | 2010-10-29 18:55:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-29 18:55:30 -0700 |
| commit | 6612cbde7f43130569aa59493edb532697592a76 (patch) | |
| tree | 11a55dc103f640ba7220aa35638b2fc4a950630e /libcamera | |
| parent | 03b7fc3b921ddfdb2d464d5cb1012fc40d77bfba (diff) | |
| parent | 4e4cd0fe1b9bb2832ae87ff24eb92b2b9edcae85 (diff) | |
| download | device_samsung_crespo-6612cbde7f43130569aa59493edb532697592a76.zip device_samsung_crespo-6612cbde7f43130569aa59493edb532697592a76.tar.gz device_samsung_crespo-6612cbde7f43130569aa59493edb532697592a76.tar.bz2 | |
am 4e4cd0fe: am b3320b82: Merge "libcamera: for keeping user settings of vga camera" into gingerbread
* commit '4e4cd0fe1b9bb2832ae87ff24eb92b2b9edcae85':
libcamera: for keeping user settings of vga camera
Diffstat (limited to 'libcamera')
| -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, |