summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorDaniel Hillenbrand <codeworkx@cyanogenmod.org>2014-01-04 22:11:40 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2014-01-04 22:11:40 +0000
commit89814620fc60e68478de32fa7633e0ac469be5f2 (patch)
treeba81a05bec7afecee655ba903ceee99bbef3cf1e /camera
parent9d32da5f03eb6357e3a89349116671649fdd7a23 (diff)
parentfecfc168ab1330c4076e1a4576ec0905afdff6a7 (diff)
downloaddevice_samsung_smdk4412-common-89814620fc60e68478de32fa7633e0ac469be5f2.zip
device_samsung_smdk4412-common-89814620fc60e68478de32fa7633e0ac469be5f2.tar.gz
device_samsung_smdk4412-common-89814620fc60e68478de32fa7633e0ac469be5f2.tar.bz2
Merge "smdk4412-common: camera: don't defer picture if CAF is in progress" into cm-11.0
Diffstat (limited to 'camera')
-rw-r--r--camera/exynos_camera.c17
-rw-r--r--camera/exynos_camera.h1
2 files changed, 5 insertions, 13 deletions
diff --git a/camera/exynos_camera.c b/camera/exynos_camera.c
index 59cf23c..c112663 100644
--- a/camera/exynos_camera.c
+++ b/camera/exynos_camera.c
@@ -1528,14 +1528,11 @@ int exynos_camera_capture(struct exynos_camera *exynos_camera)
current_af = CAMERA_AF_STATUS_RESTART;
}
- if (current_af != exynos_camera->auto_focus_result) {
- exynos_camera->auto_focus_result = current_af;
- if (exynos_camera->auto_focus_enabled) {
- rc = exynos_camera_auto_focus(exynos_camera, current_af);
- if (rc < 0) {
- ALOGE("%s: Unable to auto focus", __func__);
- goto error;
- }
+ if (exynos_camera->auto_focus_enabled) {
+ rc = exynos_camera_auto_focus(exynos_camera, current_af);
+ if (rc < 0) {
+ ALOGE("%s: Unable to auto focus", __func__);
+ goto error;
}
}
@@ -2774,10 +2771,6 @@ 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->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) {
diff --git a/camera/exynos_camera.h b/camera/exynos_camera.h
index 6579305..5118539 100644
--- a/camera/exynos_camera.h
+++ b/camera/exynos_camera.h
@@ -320,7 +320,6 @@ struct exynos_camera {
int capture_memory_index;
void *capture_yuv_buffer;
void *capture_jpeg_buffer;
- int auto_focus_result;
int capture_hybrid;
int capture_width;
int capture_height;