From b6f26b5e415112fd5253a3eee52b996fc918380e Mon Sep 17 00:00:00 2001 From: Dheeraj CVR Date: Sat, 11 Jan 2014 15:35:45 +0530 Subject: Revert "camera: Fix loss of focus mode between shots" This reverts commit 40279ba1fd2d4f02d889699df1eccf3d3a01df55. V4L2_CID_CAMERA_FOCUS_MODE has the side effect of resetting the sensor AF position. Hence, the focus is lost each time SetParameters is called and this happens during a snapshot resulting in out of focus pictures. Change-Id: Ia644b62e3752196c0637053150af7899155d6a47 --- camera/exynos_camera.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'camera/exynos_camera.c') diff --git a/camera/exynos_camera.c b/camera/exynos_camera.c index 7e551dc..6ef2dc6 100644 --- a/camera/exynos_camera.c +++ b/camera/exynos_camera.c @@ -1086,9 +1086,11 @@ int exynos_camera_params_apply(struct exynos_camera *exynos_camera, int force) } } - rc = exynos_v4l2_s_ctrl(exynos_camera, 0, V4L2_CID_CAMERA_FOCUS_MODE, focus_mode); - if (rc < 0) - ALOGE("%s: Unable to set focus mode", __func__); + if (focus_mode != exynos_camera->focus_mode || force) { + rc = exynos_v4l2_s_ctrl(exynos_camera, 0, V4L2_CID_CAMERA_FOCUS_MODE, focus_mode); + if (rc < 0) + ALOGE("%s: Unable to set focus mode", __func__); + } exynos_camera->focus_mode = focus_mode; sprintf(exynos_camera->raw_focus_mode, "%s", focus_mode_string); -- cgit v1.2.3