diff options
Diffstat (limited to 'camera/OMXCameraAdapter/OMX3A.cpp')
-rw-r--r-- | camera/OMXCameraAdapter/OMX3A.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/camera/OMXCameraAdapter/OMX3A.cpp b/camera/OMXCameraAdapter/OMX3A.cpp index 9baad08..8e6437a 100644 --- a/camera/OMXCameraAdapter/OMX3A.cpp +++ b/camera/OMXCameraAdapter/OMX3A.cpp @@ -387,6 +387,7 @@ status_t OMXCameraAdapter::setParameters3A(const android::CameraParameters ¶ } } +#ifndef MOTOROLA_CAMERA // TI extensions for enable/disable algos declareParameter3ABool(params, TICameraParameters::KEY_ALGO_EXTERNAL_GAMMA, mParameters3A.AlgoExternalGamma, SetAlgoExternalGamma, "External Gamma"); @@ -403,12 +404,14 @@ status_t OMXCameraAdapter::setParameters3A(const android::CameraParameters ¶ // Gamma table str = params.get(TICameraParameters::KEY_GAMMA_TABLE); updateGammaTable(str); +#endif LOG_FUNCTION_NAME_EXIT; return ret; } +#ifndef MOTOROLA_CAMERA void OMXCameraAdapter::updateGammaTable(const char* gamma) { unsigned int plane = 0; @@ -485,6 +488,7 @@ void OMXCameraAdapter::updateGammaTable(const char* gamma) mPending3Asettings |= SetGammaTable; } } +#endif void OMXCameraAdapter::declareParameter3ABool(const android::CameraParameters ¶ms, const char *key, OMX_BOOL ¤t_setting, E3ASettingsFlags pending, @@ -1848,6 +1852,7 @@ status_t OMXCameraAdapter::setParameter3ABool(const OMX_INDEXTYPE omx_idx, return Utils::ErrorUtils::omxToAndroidError(eError); } +#ifndef MOTOROLA_CAMERA status_t OMXCameraAdapter::setAlgoExternalGamma(Gen3A_settings& Gen3A) { return setParameter3ABool((OMX_INDEXTYPE) OMX_TI_IndexConfigExternalGamma, Gen3A.AlgoExternalGamma, "External Gamma"); @@ -1957,6 +1962,7 @@ EXIT: return ret; } +#endif status_t OMXCameraAdapter::apply3Asettings( Gen3A_settings& Gen3A ) { @@ -2092,6 +2098,7 @@ status_t OMXCameraAdapter::apply3Asettings( Gen3A_settings& Gen3A ) } break; +#ifndef MOTOROLA_CAMERA //TI extensions for enable/disable algos case SetAlgoExternalGamma: { @@ -2134,6 +2141,7 @@ status_t OMXCameraAdapter::apply3Asettings( Gen3A_settings& Gen3A ) ret |= setGammaTable(Gen3A); } break; +#endif default: CAMHAL_LOGEB("this setting (0x%x) is still not supported in CameraAdapter ", |