From af2645a679a61c8e8199d43d29b8b5ead5723b25 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Fri, 5 Dec 2014 11:23:55 -0800 Subject: Camera: Add support for SCENE_MODE_HDR for newer HALs Bug: 18640480 Change-Id: I7b772d10b2bd136c78395fd2816114b27bb48d00 --- services/camera/libcameraservice/api1/client2/Parameters.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'services/camera') diff --git a/services/camera/libcameraservice/api1/client2/Parameters.cpp b/services/camera/libcameraservice/api1/client2/Parameters.cpp index 234247b..4f4cfb0 100644 --- a/services/camera/libcameraservice/api1/client2/Parameters.cpp +++ b/services/camera/libcameraservice/api1/client2/Parameters.cpp @@ -596,6 +596,10 @@ status_t Parameters::initialize(const CameraMetadata *info, int deviceVersion) { supportedSceneModes += CameraParameters::SCENE_MODE_BARCODE; break; + case ANDROID_CONTROL_SCENE_MODE_HDR: + supportedSceneModes += + CameraParameters::SCENE_MODE_HDR; + break; default: ALOGW("%s: Camera %d: Unknown scene mode value: %d", __FUNCTION__, cameraId, @@ -2386,6 +2390,8 @@ int Parameters::sceneModeStringToEnum(const char *sceneMode) { ANDROID_CONTROL_SCENE_MODE_CANDLELIGHT : !strcmp(sceneMode, CameraParameters::SCENE_MODE_BARCODE) ? ANDROID_CONTROL_SCENE_MODE_BARCODE: + !strcmp(sceneMode, CameraParameters::SCENE_MODE_HDR) ? + ANDROID_CONTROL_SCENE_MODE_HDR: -1; } -- cgit v1.1