diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-12-05 11:23:55 -0800 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2014-12-05 11:42:43 -0800 |
| commit | af2645a679a61c8e8199d43d29b8b5ead5723b25 (patch) | |
| tree | e40230f2b33a9cb44f204b98c42465dc68a70244 /services/camera | |
| parent | d6e7f1e1f8b1dfa6a87c7c0b1a5c68d435096b01 (diff) | |
| download | frameworks_av-af2645a679a61c8e8199d43d29b8b5ead5723b25.zip frameworks_av-af2645a679a61c8e8199d43d29b8b5ead5723b25.tar.gz frameworks_av-af2645a679a61c8e8199d43d29b8b5ead5723b25.tar.bz2 | |
Camera: Add support for SCENE_MODE_HDR for newer HALs
Bug: 18640480
Change-Id: I7b772d10b2bd136c78395fd2816114b27bb48d00
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/api1/client2/Parameters.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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; } |