diff options
| author | Vladimir Petrov <vppetrov@mm-sol.com> | 2012-08-27 18:33:08 +0300 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-11-26 20:05:27 +0200 |
| commit | bbb8fc4f2a018780b8e7e3cad517e4ab86d9e7fe (patch) | |
| tree | cadbbf0d1d61e434fa47a55a24011bc46ddff7c6 /camera/inc | |
| parent | 4b822fc9c87e86ba726863fd415b725565538cd0 (diff) | |
| download | hardware_ti_omap4-bbb8fc4f2a018780b8e7e3cad517e4ab86d9e7fe.zip hardware_ti_omap4-bbb8fc4f2a018780b8e7e3cad517e4ab86d9e7fe.tar.gz hardware_ti_omap4-bbb8fc4f2a018780b8e7e3cad517e4ab86d9e7fe.tar.bz2 | |
CameraHal: Always set queued shot config in CPCAM mode
- Fixed deadlock in the case when application has ommiting
to set shot parameters with any bracketing configuration
in CPCAM mode. Should handle properly single shot and
burst shot.
Change-Id: I4f3e2b4ee5bc0aa9072d03da6f9edc4ba86253d8
Signed-off-by: Vladimir Petrov <vppetrov@mm-sol.com>
Diffstat (limited to 'camera/inc')
| -rw-r--r-- | camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h index 0e1a64d..fa73918 100644 --- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h +++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h @@ -259,10 +259,9 @@ public: enum CaptureSettingsFlags { SetFormat = 1 << 0, SetThumb = 1 << 1, - SetExpBracket = 1 << 2, + SetBurstExpBracket = 1 << 2, SetQuality = 1 << 3, SetRotation = 1 << 4, - SetBurst = 1 << 5, ECaptureSettingMax, ECapturesettingsAll = ( ((ECaptureSettingMax -1 ) << 1) -1 ), /// all possible flags raised ECaptureParamSettings = SetFormat | SetThumb | SetQuality, // Settings set with SetParam |