summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-10-29 17:06:21 +0000
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-10-29 17:06:21 +0000
commitb931db8c307db6b94fcc52ea3ff9adda5b8d9de4 (patch)
tree5cab7207f402be1ba613266e5187fe98d77d1b76 /camera
parentcd27cba5132a61e1385d5c805e0f1b49dd51e070 (diff)
downloaddevice_samsung_smdk4412-common-b931db8c307db6b94fcc52ea3ff9adda5b8d9de4.zip
device_samsung_smdk4412-common-b931db8c307db6b94fcc52ea3ff9adda5b8d9de4.tar.gz
device_samsung_smdk4412-common-b931db8c307db6b94fcc52ea3ff9adda5b8d9de4.tar.bz2
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
Diffstat (limited to 'camera')
-rw-r--r--camera/exynos_camera.c2
1 files changed, 2 insertions, 0 deletions
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) {