diff options
| author | Sundar Raman <sunds@ti.com> | 2011-09-11 18:30:48 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-09-12 11:44:04 -0700 |
| commit | fb73e34d1c6aac02c6d5f2d6e04b561b115f0e73 (patch) | |
| tree | 41ea52f39fc11eb89d8776e3bf9bd3e485cff6a8 /camera/inc | |
| parent | 564de8170e2a56b4ae225a6cb7eb8944c281a85e (diff) | |
| download | hardware_ti_omap4-fb73e34d1c6aac02c6d5f2d6e04b561b115f0e73.zip hardware_ti_omap4-fb73e34d1c6aac02c6d5f2d6e04b561b115f0e73.tar.gz hardware_ti_omap4-fb73e34d1c6aac02c6d5f2d6e04b561b115f0e73.tar.bz2 | |
CameraHAL CTS: Fix for #testAutoExposureLock, #testAutoWhiteBalanceLock
Locks were not retained if the user forces the lock to true
before calling autoFocus. This patch addresses this scenario.
Change-Id: I2b5161806f8123b3042d46bc856773f0d4701458
Signed-off-by: Sundar Raman <sunds@ti.com>
Diffstat (limited to 'camera/inc')
| -rw-r--r-- | camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h index f6fc69a..a29095d 100644 --- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h +++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h @@ -478,7 +478,7 @@ private: status_t setExposureLock(Gen3A_settings& Gen3A); status_t setWhiteBalanceLock(Gen3A_settings& Gen3A); - status_t set3ALock(OMX_BOOL toggle); + status_t set3ALock(OMX_BOOL toggleExp, OMX_BOOL toggleWb); status_t setMeteringAreas(Gen3A_settings& Gen3A); //API to set FrameRate using VFR interface @@ -858,6 +858,9 @@ private: Semaphore mCaptureSem; bool mCaptureSignalled; + OMX_BOOL mUserSetExpLock; + OMX_BOOL mUserSetWbLock; + }; }; //// namespace #endif //OMX_CAMERA_ADAPTER_H |