summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2013-10-12 20:23:16 +0200
committerPaul Kocialkowski <contact@paulk.fr>2013-10-12 20:23:16 +0200
commit21ad33bb3a724557f7eee05810cd9319e7b94378 (patch)
tree8946de468c1a147dbdd8e605f8b796beb3fea58d
parent6f15b6993415f0e07cf62021407cd34c92553d36 (diff)
downloaddevice_samsung_i9300-21ad33bb3a724557f7eee05810cd9319e7b94378.zip
device_samsung_i9300-21ad33bb3a724557f7eee05810cd9319e7b94378.tar.gz
device_samsung_i9300-21ad33bb3a724557f7eee05810cd9319e7b94378.tar.bz2
camera: Don't wait for continuous focus when zoomed
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
-rw-r--r--camera/exynos_camera.c2
1 files changed, 1 insertions, 1 deletions
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;