diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2013-10-08 17:52:26 +0200 |
|---|---|---|
| committer | Paul Kocialkowski <contact@paulk.fr> | 2013-10-08 18:06:12 +0200 |
| commit | 39a1ebdfea1a37d01f9c382b98cfd48a96e98184 (patch) | |
| tree | 6568d1811295c35066111f87e5c5c224212dc367 /camera | |
| parent | 199a88beb4c9dc88d11176e6db6e0acdabcc50c7 (diff) | |
| download | device_samsung_smdk4412-common-39a1ebdfea1a37d01f9c382b98cfd48a96e98184.zip device_samsung_smdk4412-common-39a1ebdfea1a37d01f9c382b98cfd48a96e98184.tar.gz device_samsung_smdk4412-common-39a1ebdfea1a37d01f9c382b98cfd48a96e98184.tar.bz2 | |
camera: Wait for continous focus to complete before taking a picture
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Change-Id: I2aef0e3e413c9a8708fe1c87860beb287c844a1c
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/exynos_camera.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/camera/exynos_camera.c b/camera/exynos_camera.c index ef9ee6b..0bd7a1e 100644 --- a/camera/exynos_camera.c +++ b/camera/exynos_camera.c @@ -2603,6 +2603,11 @@ 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->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; + } + rc = exynos_v4l2_s_ctrl(exynos_camera, 0, V4L2_CID_CAMERA_CAPTURE, 0); if (rc < 0) { ALOGE("%s: Unable to set capture", __func__); |