diff options
| author | Tyler Luu <tluu@ti.com> | 2011-10-19 16:21:03 -0500 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-10-19 14:27:28 -0700 |
| commit | 70e04f3b54d5100621ffa631dbc81579d2cc3c8c (patch) | |
| tree | a6f0ce3751856c40d300faf917adda367955bac8 | |
| parent | fab72086a1fa5d93037ec1355bc8b01355db0f41 (diff) | |
| download | hardware_ti_omap4xxx-70e04f3b54d5100621ffa631dbc81579d2cc3c8c.tar.gz hardware_ti_omap4xxx-70e04f3b54d5100621ffa631dbc81579d2cc3c8c.tar.bz2 hardware_ti_omap4xxx-70e04f3b54d5100621ffa631dbc81579d2cc3c8c.zip | |
CameraHal: Select proper CAF mode for scene feedback
We were not choosing the right CAF mode during scene mode
feedback because CAF video has precedence in the focus mode
LUT. Adding some logic to select CAF picture if we are not if
video mode.
Change-Id: I98260dae04708d5d42248cbafa4adb57ce18221f
Signed-off-by: Tyler Luu <tluu@ti.com>
| -rwxr-xr-x | camera/OMXCameraAdapter/OMXCameraAdapter.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp index b7a7e19..ba2de71 100755 --- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp +++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp @@ -634,7 +634,12 @@ void OMXCameraAdapter::getParameters(CameraParameters& params) if (valstr && valstr_supported && strstr(valstr_supported, valstr)) params.set(CameraParameters::KEY_FLASH_MODE, valstr); - valstr = getLUTvalue_OMXtoHAL(mParameters3A.Focus, FocusLUT); + if ((mParameters3A.Focus == OMX_IMAGE_FocusControlAuto) && + (mCapMode != OMXCameraAdapter::VIDEO_MODE)) { + valstr = CameraParameters::FOCUS_MODE_CONTINUOUS_PICTURE; + } else { + valstr = getLUTvalue_OMXtoHAL(mParameters3A.Focus, FocusLUT); + } valstr_supported = mParams.get(CameraParameters::KEY_SUPPORTED_FOCUS_MODES); if (valstr && valstr_supported && strstr(valstr_supported, valstr)) params.set(CameraParameters::KEY_FOCUS_MODE, valstr); |