summaryrefslogtreecommitdiffstats
path: root/camera/inc
diff options
context:
space:
mode:
authorTyler Luu <tluu@ti.com>2011-10-07 16:19:07 -0500
committerIliyan Malchev <malchev@google.com>2011-10-07 14:28:00 -0700
commitcacb0651c406df6b9ad2ee3bd48cc756718ba1a2 (patch)
treecf8488d6c9953ec6c701fe1ef2a539cbbe87fcf7 /camera/inc
parentd9d2fa13dcf81e9603a653625c65adf030a18204 (diff)
downloadhardware_ti_omap4xxx-cacb0651c406df6b9ad2ee3bd48cc756718ba1a2.zip
hardware_ti_omap4xxx-cacb0651c406df6b9ad2ee3bd48cc756718ba1a2.tar.gz
hardware_ti_omap4xxx-cacb0651c406df6b9ad2ee3bd48cc756718ba1a2.tar.bz2
CameraHal: Fix issue with not setting 3A settings
Accidently redefined some of the values for 3A settings enum in 3a general settings header file. Change-Id: I84b72ae0516d0362d381c4fa1d597cae86571fd7 Signed-off-by: Tyler Luu <tluu@ti.com>
Diffstat (limited to 'camera/inc')
-rw-r--r--camera/inc/OMXCameraAdapter/OMXCameraAdapter.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
index 4acc88c..da43b44 100644
--- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
+++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
@@ -265,9 +265,9 @@ public:
SetThumb = 1 << 1,
SetExpBracket = 1 << 2,
SetQuality = 1 << 3,
- SetRotation = 1 << 3,
- E3aSettingMax,
- E3AsettingsAll = ( ((E3aSettingMax -1 ) << 1) -1 ) /// all possible flags raised
+ SetRotation = 1 << 4,
+ ECaptureSettingMax,
+ ECapturesettingsAll = ( ((ECaptureSettingMax -1 ) << 1) -1 ) /// all possible flags raised
};
class GPSData