diff options
| author | kyoungho.yun <kyoungho.yun@samsung.com> | 2011-11-10 19:58:37 +0900 |
|---|---|---|
| committer | Simon Wilson <simonwilson@google.com> | 2011-11-14 16:44:59 -0800 |
| commit | 3b869ce2ba1cc91c0acdcc8355a8499fc443e8a3 (patch) | |
| tree | 4e7d326420623cc58a1c9732835927d542b968db /libcamera | |
| parent | aae09e24c5ac5dbba702cc6ae65e25a83d49a3cb (diff) | |
| download | device_samsung_crespo-3b869ce2ba1cc91c0acdcc8355a8499fc443e8a3.zip device_samsung_crespo-3b869ce2ba1cc91c0acdcc8355a8499fc443e8a3.tar.gz device_samsung_crespo-3b869ce2ba1cc91c0acdcc8355a8499fc443e8a3.tar.bz2 | |
Camera: move AF polling code from driver into HAL
Preview is paused during auto focus.
To fix this, move polling code from driver to HAL.
Change-Id: Id46d9ccd2aad1a269806f4fddf8ad39c3c87bae9
Signed-off-by: kyoungho.yun <kyoungho.yun@samsung.com>
Diffstat (limited to 'libcamera')
| -rwxr-xr-x | libcamera/SecCamera.cpp | 35 | ||||
| -rwxr-xr-x[-rw-r--r--] | libcamera/SecCamera.h | 7 |
2 files changed, 39 insertions, 3 deletions
diff --git a/libcamera/SecCamera.cpp b/libcamera/SecCamera.cpp index 48cf02e..444001c 100755 --- a/libcamera/SecCamera.cpp +++ b/libcamera/SecCamera.cpp @@ -1557,12 +1557,41 @@ int SecCamera::setAutofocus(void) int SecCamera::getAutoFocusResult(void) { - int af_result; + int af_result, count, ret; - af_result = fimc_v4l2_g_ctrl(m_cam_fd, V4L2_CID_CAMERA_AUTO_FOCUS_RESULT); + for (count = 0; count < FIRST_AF_SEARCH_COUNT; count++) { + ret = fimc_v4l2_g_ctrl(m_cam_fd, V4L2_CID_CAMERA_AUTO_FOCUS_RESULT_FIRST); + if (ret != AF_PROGRESS) + break; + usleep(AF_DELAY); + } + if ((count >= FIRST_AF_SEARCH_COUNT) || (ret != AF_SUCCESS)) { + LOGV("%s : 1st AF timed out, failed, or was canceled", __func__); + af_result = 0; + goto finish_auto_focus; + } - LOGV("%s : returning %d", __func__, af_result); + for (count = 0; count < SECOND_AF_SEARCH_COUNT; count++) { + ret = fimc_v4l2_g_ctrl(m_cam_fd, V4L2_CID_CAMERA_AUTO_FOCUS_RESULT_SECOND); + /* low byte is garbage. done when high byte is 0x0 */ + if (!(ret & 0xff00)) + break; + usleep(AF_DELAY); + } + if (count >= SECOND_AF_SEARCH_COUNT) { + LOGV("%s : 2nd AF timed out, failed, or was canceled", __func__); + af_result = 0; + goto finish_auto_focus; + } + + af_result = 1; + LOGV("%s : AF was successful, returning %d", __func__, af_result); +finish_auto_focus: + if (fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_CAMERA_FINISH_AUTO_FOCUS, 0) < 0) { + LOGE("ERR(%s):Fail on V4L2_CID_CAMERA_SET_PRE_FLASH", __func__); + return -1; + } return af_result; } diff --git a/libcamera/SecCamera.h b/libcamera/SecCamera.h index 551eb03..5c62782 100644..100755 --- a/libcamera/SecCamera.h +++ b/libcamera/SecCamera.h @@ -146,6 +146,13 @@ namespace android { #define BPP 2 #define MIN(x, y) (((x) < (y)) ? (x) : (y)) #define MAX_BUFFERS 9 // 11 + +#define FIRST_AF_SEARCH_COUNT 80 +#define SECOND_AF_SEARCH_COUNT 80 +#define AF_PROGRESS 0x01 +#define AF_SUCCESS 0x02 +#define AF_DELAY 50000 + /* * V 4 L 2 F I M C E X T E N S I O N S * |