diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2012-09-15 03:22:04 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-09-15 03:22:04 -0400 |
| commit | fc0deb70d64677d1d9a99d2c7ea82946326652a4 (patch) | |
| tree | 1d86a52e3dda3723a9d3de46cbf7a30eedaadf27 /libcamera | |
| parent | 00a0bbf345c52fc54595cb69cb82fe92077d9c39 (diff) | |
| parent | b661312dc3ef806feffd212f94269f93454b30b9 (diff) | |
| download | device_samsung_aries-common-fc0deb70d64677d1d9a99d2c7ea82946326652a4.zip device_samsung_aries-common-fc0deb70d64677d1d9a99d2c7ea82946326652a4.tar.gz device_samsung_aries-common-fc0deb70d64677d1d9a99d2c7ea82946326652a4.tar.bz2 | |
Merge "libcamera: Fix initial flash mode in camera HAL" into jellybean
Diffstat (limited to 'libcamera')
| -rwxr-xr-x | libcamera/SecCamera.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libcamera/SecCamera.cpp b/libcamera/SecCamera.cpp index a7ecea5..598f732 100755 --- a/libcamera/SecCamera.cpp +++ b/libcamera/SecCamera.cpp @@ -840,6 +840,11 @@ int SecCamera::startPreview(void) CHECK(ret); } +#ifdef HAVE_FLASH + ret = fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_CAMERA_FLASH_MODE, m_params->flash_mode); + CHECK(ret); +#endif + // It is a delay for a new frame, not to show the previous bigger ugly picture frame. ret = fimc_poll(&m_events_c); CHECK(ret); |