diff options
| author | James Dong <jdong@google.com> | 2011-11-16 00:25:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-16 00:25:17 -0800 |
| commit | 9a9525d60b0a7337915d69eedaa41f10cc8be02f (patch) | |
| tree | 94f28d6fb1306e7e2e57ed1575433b1df8748ddd | |
| parent | e5c5100b401b6190ce883f7fbee724ff1bf874a4 (diff) | |
| parent | ba6048f2cc99adecb28651a7a162f4a3c958edcd (diff) | |
| download | hardware_ti_omap4-9a9525d60b0a7337915d69eedaa41f10cc8be02f.zip hardware_ti_omap4-9a9525d60b0a7337915d69eedaa41f10cc8be02f.tar.gz hardware_ti_omap4-9a9525d60b0a7337915d69eedaa41f10cc8be02f.tar.bz2 | |
am 6014a8f2: When camera.flash_off is 1, disable camera flash. This is for testing purpose only
* commit '6014a8f2648911e7e0f5ba9256afa1a7a9eaf526':
When camera.flash_off is 1, disable camera flash. This is for testing purpose only
| -rw-r--r-- | camera/OMXCameraAdapter/OMX3A.cpp | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/camera/OMXCameraAdapter/OMX3A.cpp b/camera/OMXCameraAdapter/OMX3A.cpp index 6b4aa63..be4c0e7 100644 --- a/camera/OMXCameraAdapter/OMX3A.cpp +++ b/camera/OMXCameraAdapter/OMX3A.cpp @@ -29,6 +29,8 @@ #include "OMXCameraAdapter.h" #include "ErrorUtils.h" +#include <cutils/properties.h> + #undef TRUE #undef FALSE #define TRUE "true" @@ -475,6 +477,22 @@ status_t OMXCameraAdapter::setExposureMode(Gen3A_settings& Gen3A) return ErrorUtils::omxToAndroidError(eError); } +static bool isFlashDisabled() { +#if (PROPERTY_VALUE_MAX < 5) +#error "PROPERTY_VALUE_MAX must be at least 5" +#endif + + char value[PROPERTY_VALUE_MAX]; + if (property_get("camera.flash_off", value, NULL) && + (!strcasecmp(value, "true") || !strcasecmp(value, "1"))) { + LOGW("flash is turned off"); + return true; + } + + LOGI("flash is turned on"); + return false; +} + status_t OMXCameraAdapter::setFlashMode(Gen3A_settings& Gen3A) { status_t ret = NO_ERROR; @@ -492,7 +510,12 @@ status_t OMXCameraAdapter::setFlashMode(Gen3A_settings& Gen3A) OMX_INIT_STRUCT_PTR (&flash, OMX_IMAGE_PARAM_FLASHCONTROLTYPE); flash.nPortIndex = OMX_ALL; - flash.eFlashControl = ( OMX_IMAGE_FLASHCONTROLTYPE ) Gen3A.FlashMode; + + if (isFlashDisabled()) { + flash.eFlashControl = ( OMX_IMAGE_FLASHCONTROLTYPE ) OMX_IMAGE_FlashControlOff; + } else { + flash.eFlashControl = ( OMX_IMAGE_FLASHCONTROLTYPE ) Gen3A.FlashMode; + } CAMHAL_LOGDB("Configuring flash mode 0x%x", flash.eFlashControl); eError = OMX_SetConfig(mCameraAdapterParameters.mHandleComp, |