diff options
| -rw-r--r-- | bcm4329.ko | bin | 276884 -> 276884 bytes | |||
| -rwxr-xr-x | include/videodev2_samsung.h | 5 | ||||
| -rw-r--r-- | kernel | bin | 3349560 -> 3349208 bytes | |||
| -rwxr-xr-x | libcamera/SecCamera.cpp | 35 | ||||
| -rwxr-xr-x[-rw-r--r--] | libcamera/SecCamera.h | 7 |
5 files changed, 43 insertions, 4 deletions
| Binary files differ diff --git a/include/videodev2_samsung.h b/include/videodev2_samsung.h index 0a7d7c3..0d4dcc9 100755 --- a/include/videodev2_samsung.h +++ b/include/videodev2_samsung.h @@ -431,7 +431,10 @@ enum v4l2_caf_start_stop { CAF_MAX, }; -#define V4L2_CID_CAMERA_AUTO_FOCUS_RESULT (V4L2_CID_PRIVATE_BASE + 103) +#define V4L2_CID_CAMERA_AUTO_FOCUS_RESULT_FIRST (V4L2_CID_PRIVATE_BASE + 103) +#define V4L2_CID_CAMERA_AUTO_FOCUS_RESULT_SECOND (V4L2_CID_PRIVATE_BASE + 120) +#define V4L2_CID_CAMERA_FINISH_AUTO_FOCUS (V4L2_CID_PRIVATE_BASE + 121) + #define V4L2_CID_CAMERA_FRAME_RATE (V4L2_CID_PRIVATE_BASE + 104) enum v4l2_frame_rate { FRAME_RATE_AUTO = 0, Binary files differdiff --git a/libcamera/SecCamera.cpp b/libcamera/SecCamera.cpp index fdc3bb3..67f9647 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)) { + ALOGV("%s : 1st AF timed out, failed, or was canceled", __func__); + af_result = 0; + goto finish_auto_focus; + } - ALOGV("%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) { + ALOGV("%s : 2nd AF timed out, failed, or was canceled", __func__); + af_result = 0; + goto finish_auto_focus; + } + + af_result = 1; + ALOGV("%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 * |