diff options
author | kyoungho.yun <kyoungho.yun@samsung.com> | 2010-12-03 19:14:56 +0900 |
---|---|---|
committer | Simon Wilson <simonwilson@google.com> | 2010-12-07 16:58:13 -0800 |
commit | daed2d55e23ed162ecc804808d4411e50f142eeb (patch) | |
tree | e8411a7785598bd76b3ad25eec6655c52981b568 | |
parent | bc2e6e41fa1d7133c1fa63cc103b7c172d276146 (diff) | |
download | device_samsung_crespo-daed2d55e23ed162ecc804808d4411e50f142eeb.zip device_samsung_crespo-daed2d55e23ed162ecc804808d4411e50f142eeb.tar.gz device_samsung_crespo-daed2d55e23ed162ecc804808d4411e50f142eeb.tar.bz2 |
5PC11X: libcamera: move lens to default position when preview starts
After taking a picture, the focus is maintained.
So if user change from camera mode to video mode after taking
a picture very closely to object,
focus in video mode is not normal.
So move lens to default position when preview starts.
Change-Id: I3e41acbb22ad8a754755feae304c287dce690425
Signed-off-by: kyoungho.yun <kyoungho.yun@samsung.com>
-rwxr-xr-x[-rw-r--r--] | include/videodev2_samsung.h | 1 | ||||
-rwxr-xr-x[-rw-r--r--] | libcamera/SecCamera.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/videodev2_samsung.h b/include/videodev2_samsung.h index 56d1a4d..0a7d7c3 100644..100755 --- a/include/videodev2_samsung.h +++ b/include/videodev2_samsung.h @@ -476,6 +476,7 @@ enum v4l2_slow_ae_mode { #define V4L2_CID_CAMERA_SENSOR_MODE (V4L2_CID_PRIVATE_BASE + 116) #define V4L2_CID_ESD_INT (V4L2_CID_PRIVATE_BASE + 117) #define V4L2_CID_CAMERA_GET_FLASH_ONOFF (V4L2_CID_PRIVATE_BASE + 118) +#define V4L2_CID_CAMERA_RETURN_FOCUS (V4L2_CID_PRIVATE_BASE + 119) /* Pixel format FOURCC depth Description */ /* 12 Y/CbCr 4:2:0 64x32 macroblocks */ diff --git a/libcamera/SecCamera.cpp b/libcamera/SecCamera.cpp index a5191d3..83d100e 100644..100755 --- a/libcamera/SecCamera.cpp +++ b/libcamera/SecCamera.cpp @@ -991,6 +991,8 @@ int SecCamera::startPreview(void) // 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); + ret = fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_CAMERA_RETURN_FOCUS, 0); + CHECK(ret); #ifdef SWP1_CAMERA_ADD_ADVANCED_FUNCTION LOGV("%s: got the first frame of the preview\n", __func__); |