summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2014-06-01 06:45:36 +0100
committerSteve Kondik <steve@cyngn.com>2015-11-05 02:39:45 -0800
commita1f4fae05db0af7c1ab17d9566e6786f4bdcf7ff (patch)
tree509adb66f7f4e6c277f3bd5fc38f10f2bd20eea2 /camera
parent08ede3865a126c5958c73dd3e52f74a2b450d923 (diff)
downloadframeworks_av-a1f4fae05db0af7c1ab17d9566e6786f4bdcf7ff.zip
frameworks_av-a1f4fae05db0af7c1ab17d9566e6786f4bdcf7ff.tar.gz
frameworks_av-a1f4fae05db0af7c1ab17d9566e6786f4bdcf7ff.tar.bz2
camera: Disable extra HDR frame on QCOM_HARDWARE
Qualcomm camera HALs default to adding an extra zero-exposure frame to HDR snapshots; this is breaking third-party apps, and we don't use it in system-bundled apps, so disable it unless explicitly requested by the client Change-Id: Iecb868c5c344d972de7f36dc1bd9cc9fdbabaf4e
Diffstat (limited to 'camera')
-rw-r--r--camera/CameraParameters.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index d35519d..42b0884 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -257,6 +257,14 @@ void CameraParameters::set(const char *key, const char *value)
//XXX ALOGE("Value \"%s\"contains invalid character (= or ;)", value);
return;
}
+#ifdef QCOM_HARDWARE
+ // qcom cameras default to delivering an extra zero-exposure frame on HDR.
+ // The android SDK only wants one frame, so disable this unless the app
+ // explicitly asks for it
+ if (!get("hdr-need-1x")) {
+ mMap.replaceValueFor(String8("hdr-need-1x"), String8("false"));
+ }
+#endif
mMap.replaceValueFor(String8(key), String8(value));
}