summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorVladimir Petrov <vppetrov@mm-sol.com>2012-06-19 20:15:19 +0300
committerDaniel Levin <dendy@ti.com>2012-11-26 18:22:45 +0200
commit91b06275f6e390e22f8278bc71f1bf09444b27ce (patch)
treeecf8174a2609cf53726dfde32fa70e80292dd30a /camera
parenta3edc80c36b1c55a0c0ca4975050001a9f5823f0 (diff)
downloadhardware_ti_omap4-91b06275f6e390e22f8278bc71f1bf09444b27ce.zip
hardware_ti_omap4-91b06275f6e390e22f8278bc71f1bf09444b27ce.tar.gz
hardware_ti_omap4-91b06275f6e390e22f8278bc71f1bf09444b27ce.tar.bz2
camera: Restart preview for ipp setting
Add IPP to list of settings that can trigger a preview restart. OMXCameraAdapter needs to be in loaded state for IPP to take effect. Change-Id: I5f5aa9a99c33ad7711cb25349be767714398041f Signed-off-by: Tyler Luu <tluu@ti.com> Signed-off-by: Vladimir Petrov <vppetrov@mm-sol.com> Signed-off-by: Daniel Levin <dendy@ti.com>
Diffstat (limited to 'camera')
-rw-r--r--camera/CameraHal.cpp23
1 files changed, 13 insertions, 10 deletions
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp
index 96e6df1..f740336 100644
--- a/camera/CameraHal.cpp
+++ b/camera/CameraHal.cpp
@@ -409,16 +409,6 @@ int CameraHal::setParameters(const android::CameraParameters& params)
updateRequired = true;
}
- if ((valstr = params.get(TICameraParameters::KEY_IPP)) != NULL) {
- if (isParameterValid(valstr,mCameraProperties->get(CameraProperties::SUPPORTED_IPP_MODES))) {
- CAMHAL_LOGDB("IPP mode set %s", valstr);
- mParameters.set(TICameraParameters::KEY_IPP, valstr);
- } else {
- CAMHAL_LOGEB("ERROR: Invalid IPP mode: %s", valstr);
- return BAD_VALUE;
- }
- }
-
#ifdef OMAP_ENHANCEMENT_VTC
if ((valstr = params.get(TICameraParameters::KEY_VTC_HINT)) != NULL ) {
mParameters.set(TICameraParameters::KEY_VTC_HINT, valstr);
@@ -440,7 +430,20 @@ int CameraHal::setParameters(const android::CameraParameters& params)
}
}
#endif
+ }
+
+ if ((valstr = params.get(TICameraParameters::KEY_IPP)) != NULL) {
+ if (isParameterValid(valstr,mCameraProperties->get(CameraProperties::SUPPORTED_IPP_MODES))) {
+ if (strcmp(valstr, mParameters.get(TICameraParameters::KEY_IPP))) {
+ CAMHAL_LOGDB("IPP mode set %s", params.get(TICameraParameters::KEY_IPP));
+ mParameters.set(TICameraParameters::KEY_IPP, valstr);
+ restartPreviewRequired = true;
+ }
+ } else {
+ CAMHAL_LOGEB("ERROR: Invalid IPP mode: %s", valstr);
+ return BAD_VALUE;
}
+ }
if ( (valstr = params.get(TICameraParameters::KEY_S3D_PRV_FRAME_LAYOUT)) != NULL )
{