summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xinclude/videodev2_samsung.h5
-rwxr-xr-xlibcamera/SecCamera.cpp23
-rw-r--r--libcamera/SecCamera.h6
3 files changed, 30 insertions, 4 deletions
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,
diff --git a/libcamera/SecCamera.cpp b/libcamera/SecCamera.cpp
index e53fbc2..3fd7081 100755
--- a/libcamera/SecCamera.cpp
+++ b/libcamera/SecCamera.cpp
@@ -1680,12 +1680,29 @@ 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);
+ 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_FINISH_AUTO_FOCUS", __func__);
+ return -1;
+ }
return af_result;
}
diff --git a/libcamera/SecCamera.h b/libcamera/SecCamera.h
index 8b9548d..6df8bcd 100644
--- a/libcamera/SecCamera.h
+++ b/libcamera/SecCamera.h
@@ -148,6 +148,12 @@ namespace android {
#define BPP 2
#define MIN(x, y) (((x) < (y)) ? (x) : (y))
#define MAX_BUFFERS 4
+
+#define FIRST_AF_SEARCH_COUNT 600
+#define AF_PROGRESS 0x05
+#define AF_SUCCESS 0x02
+#define AF_DELAY 10000
+
/*
* V 4 L 2 F I M C E X T E N S I O N S
*