From 21ad33bb3a724557f7eee05810cd9319e7b94378 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Sat, 12 Oct 2013 20:23:16 +0200 Subject: camera: Don't wait for continuous focus when zoomed Signed-off-by: Paul Kocialkowski --- camera/exynos_camera.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camera/exynos_camera.c b/camera/exynos_camera.c index 47ea1cf..5e34f01 100644 --- a/camera/exynos_camera.c +++ b/camera/exynos_camera.c @@ -2602,7 +2602,7 @@ 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 (exynos_camera->camera_capture_format == V4L2_PIX_FMT_INTERLEAVED && exynos_camera->focus_mode == FOCUS_MODE_CONTINOUS_PICTURE && exynos_camera->capture_auto_focus_result == CAMERA_AF_STATUS_IN_PROGRESS) { + if (exynos_camera->camera_capture_format == V4L2_PIX_FMT_INTERLEAVED && exynos_camera->zoom == 0 && exynos_camera->focus_mode == FOCUS_MODE_CONTINOUS_PICTURE && exynos_camera->capture_auto_focus_result == CAMERA_AF_STATUS_IN_PROGRESS) { LOGD("%s: Not asking for picture until auto focus is done", __func__); pthread_mutex_unlock(&exynos_camera->picture_mutex); return 0; -- cgit v1.1