From b931db8c307db6b94fcc52ea3ff9adda5b8d9de4 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Tue, 29 Oct 2013 17:06:21 +0000 Subject: camera: Block out endlessly looping focus clause capture_auto_focus_result isn't updated from any realtime focus callback, so waiting for it to change in order to complete the capture introduces delay, and in some cases an infinite loop. Remove the focus state verification, at least until such a callback can be put in place. Change-Id: If4c6815563cb63009e717ee65a0a8fb816cc813e --- camera/exynos_camera.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'camera') diff --git a/camera/exynos_camera.c b/camera/exynos_camera.c index 0bd7a1e..ed618e3 100644 --- a/camera/exynos_camera.c +++ b/camera/exynos_camera.c @@ -2603,10 +2603,12 @@ int exynos_camera_picture_callback(struct exynos_camera *exynos_camera, pthread_mutex_lock(&exynos_camera->picture_mutex); if (!exynos_camera->picture_enabled && !exynos_camera->camera_fimc_is) { +#if 0 if (exynos_camera->focus_mode == FOCUS_MODE_CONTINOUS_PICTURE && exynos_camera->capture_auto_focus_result == CAMERA_AF_STATUS_IN_PROGRESS) { pthread_mutex_unlock(&exynos_camera->picture_mutex); return 0; } +#endif rc = exynos_v4l2_s_ctrl(exynos_camera, 0, V4L2_CID_CAMERA_CAPTURE, 0); if (rc < 0) { -- cgit v1.2.3