diff options
| author | Vladislav Hristov <vhristov@mm-sol.com> | 2011-09-13 18:43:34 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-09-14 16:00:43 -0700 |
| commit | 648811d739148a9062316975c220c66d8a078279 (patch) | |
| tree | c613d8534fd9625cb2c55b7de4b8434f4bdb99c3 /camera | |
| parent | 01948ee975b283f0a988bebbbfdcae4669b1893d (diff) | |
| download | hardware_ti_omap4-648811d739148a9062316975c220c66d8a078279.zip hardware_ti_omap4-648811d739148a9062316975c220c66d8a078279.tar.gz hardware_ti_omap4-648811d739148a9062316975c220c66d8a078279.tar.bz2 | |
CameraHal: Set AF Assist depending on flash mode
Enable setting AF Assist enable/disable based on the flash mode.
When Flash is "on" or "auto" enable AF Assist.
When Flash is "off" disable AF Assist.
Change-Id: I963694c5e46ccbe0e1dea5acfd5eca4ea89c163e
Signed-off-by: Vladislav Hristov <vhristov@mm-sol.com>
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/OMXCameraAdapter/OMX3A.cpp | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/camera/OMXCameraAdapter/OMX3A.cpp b/camera/OMXCameraAdapter/OMX3A.cpp index 24842c8..8f458ac 100644 --- a/camera/OMXCameraAdapter/OMX3A.cpp +++ b/camera/OMXCameraAdapter/OMX3A.cpp @@ -430,6 +430,7 @@ status_t OMXCameraAdapter::setFlashMode(Gen3A_settings& Gen3A) status_t ret = NO_ERROR; OMX_ERRORTYPE eError = OMX_ErrorNone; OMX_IMAGE_PARAM_FLASHCONTROLTYPE flash; + OMX_CONFIG_FOCUSASSISTTYPE focusAssist; LOG_FUNCTION_NAME; @@ -456,6 +457,33 @@ status_t OMXCameraAdapter::setFlashMode(Gen3A_settings& Gen3A) CAMHAL_LOGDA("Camera flash mode configured successfully"); } + if ( OMX_ErrorNone == eError ) + { + OMX_INIT_STRUCT_PTR (&focusAssist, OMX_CONFIG_FOCUSASSISTTYPE); + focusAssist.nPortIndex = OMX_ALL; + if ( flash.eFlashControl == OMX_IMAGE_FlashControlOff ) + { + focusAssist.bFocusAssist = OMX_FALSE; + } + else + { + focusAssist.bFocusAssist = OMX_TRUE; + } + + CAMHAL_LOGDB("Configuring AF Assist mode 0x%x", focusAssist.bFocusAssist); + eError = OMX_SetConfig(mCameraAdapterParameters.mHandleComp, + (OMX_INDEXTYPE) OMX_IndexConfigFocusAssist, + &focusAssist); + if ( OMX_ErrorNone != eError ) + { + CAMHAL_LOGEB("Error while configuring AF Assist mode 0x%x", eError); + } + else + { + CAMHAL_LOGDA("Camera AF Assist mode configured successfully"); + } + } + LOG_FUNCTION_NAME_EXIT; return ErrorUtils::omxToAndroidError(eError); |