commit 63ebe6d1821288d6db104fae977f96105cdf0e14
author insup.choi <insup.choi@lge.com> Tue Oct 16 13:48:57 2012 -0700
committer The Android Automerger <android-build@android.com> Tue Oct 16 17:16:13 2012 -0700
tree 49c0c16534e32ba2fdbf30e2e16c6f6ae04626fc
parent cd1042cb4ba9d107933f18ae61d7b11fd8fc4144

camera: enhancement af functionality

-add case for reading AF status and retry value

Bug: 7324783
Change-Id: Ia377b54f296d2b7a240883d6ae128574359ebaba
Signed-off-by: Iliyan Malchev <malchev@google.com>

QCamera_Intf.h

diff --git a/QCamera_Intf.h b/QCamera_Intf.h
index c3b3972..19df6dd 100644
--- a/QCamera_Intf.h
+++ b/QCamera_Intf.h
@@ -471,6 +471,8 @@
     MM_CAMERA_PARM_CAF_TYPE,
 #endif
     MM_CAMERA_PARM_LUX_IDX,
+    MM_CAMERA_PARM_GET_AF_STATUS,
+    MM_CAMERA_PARM_CHECK_AF_RETRY,
     MM_CAMERA_PARM_MAX
 } mm_camera_parm_type_t;
 
@@ -621,6 +623,8 @@
 #endif
   CAMERA_GET_PARM_LUX_IDX,
   CAMERA_GET_PARM_LOW_LIGHT_FOR_ZSL,
+  CAMERA_GET_PARM_AF_STATUS,
+  CAMERA_CHECK_AF_RETRY,
   CAMERA_CTRL_PARM_MAX
 } cam_ctrl_type;
 
@@ -1066,6 +1070,11 @@
   LED_MODE_MAX
 } led_mode_t;
 
+typedef struct {
+  int is_checking_af_retry;
+  int is_moving;
+} af_actuator_status_t;
+
 typedef struct{
   int aec_index_for_zsl;
   int zsl_flash_enable;

mm-camera-interface/mm_camera.c

diff --git a/mm-camera-interface/mm_camera.c b/mm-camera-interface/mm_camera.c
index 54c269b..12b61c0 100644
--- a/mm-camera-interface/mm_camera.c
+++ b/mm-camera-interface/mm_camera.c
@@ -494,6 +494,9 @@
                             MM_CAMERA_STATE_EVT_SET_FMT, fmt);
         }
         break;
+    case MM_CAMERA_PARM_CHECK_AF_RETRY:
+        return mm_camera_send_native_ctrl_cmd(my_obj,   CAMERA_CHECK_AF_RETRY,
+                 0, (void *)NULL);
     default:
         rc = mm_camera_set_general_parm(my_obj, parm);
         break;
@@ -657,6 +660,10 @@
     case MM_CAMERA_GET_PARM_LOW_LIGHT_FOR_ZSL:
         return mm_camera_send_native_ctrl_cmd(my_obj,   CAMERA_GET_PARM_LOW_LIGHT_FOR_ZSL,
                      sizeof(aec_info_for_flash_t), (void *)parm->p_value);
+
+    case MM_CAMERA_PARM_GET_AF_STATUS:
+        return mm_camera_send_native_ctrl_cmd(my_obj,   CAMERA_GET_PARM_AF_STATUS,
+                     sizeof(af_actuator_status_t), (void *)parm->p_value);
     default:
         /* needs to add more implementation */
         rc = -1;