diff options
| author | Tyler Luu <tluu@ti.com> | 2011-09-19 13:08:45 -0500 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-09-19 22:31:52 -0700 |
| commit | 7e037cc938575be44705eb863f33341587afc7f1 (patch) | |
| tree | b6506c22e81595bb3a26d398f9384cbd0635965d /camera/inc | |
| parent | 02663f6a34ecc6075588d10354600a0aedbea29b (diff) | |
| download | hardware_ti_omap4-7e037cc938575be44705eb863f33341587afc7f1.zip hardware_ti_omap4-7e037cc938575be44705eb863f33341587afc7f1.tar.gz hardware_ti_omap4-7e037cc938575be44705eb863f33341587afc7f1.tar.bz2 | |
CameraHal: Lock focus after AF completion
1) Add API to use OMX_IndexConfigImageFocusLock to lock autofocus
2) Remove FIXME to always return true status when CAF is set
Change-Id: Ie195206243bc1f750954def5f4f9f4466295bc7c
b/5338488
Diffstat (limited to 'camera/inc')
| -rw-r--r-- | camera/inc/General3A_Settings.h | 1 | ||||
| -rw-r--r-- | camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/camera/inc/General3A_Settings.h b/camera/inc/General3A_Settings.h index 8267c04..9dbe10f 100644 --- a/camera/inc/General3A_Settings.h +++ b/camera/inc/General3A_Settings.h @@ -229,6 +229,7 @@ class Gen3A_settings{ unsigned int Brightness; OMX_BOOL ExposureLock; + OMX_BOOL FocusLock; OMX_BOOL WhiteBalanceLock; }; diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h index e33746e..6ec32ad 100644 --- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h +++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h @@ -478,8 +478,9 @@ private: status_t setEffect(Gen3A_settings& Gen3A); status_t setExposureLock(Gen3A_settings& Gen3A); + status_t setFocusLock(Gen3A_settings& Gen3A); status_t setWhiteBalanceLock(Gen3A_settings& Gen3A); - status_t set3ALock(OMX_BOOL toggleExp, OMX_BOOL toggleWb); + status_t set3ALock(OMX_BOOL toggleExp, OMX_BOOL toggleWb, OMX_BOOL toggleFocus); status_t setMeteringAreas(Gen3A_settings& Gen3A); //API to set FrameRate using VFR interface |