diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-12-08 19:17:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-08 19:17:47 +0000 |
| commit | f3376bdbcb48daad6889d28ee2c98b174f12028e (patch) | |
| tree | 0aa7b28766494121b782ef6996e4e04f012e7fd3 /services | |
| parent | e9011c22e000cc0c1e8080b687893fbbe3c17278 (diff) | |
| parent | 668b055081bb9d0d61775acf67bb27ce66b214f6 (diff) | |
| download | frameworks_av-f3376bdbcb48daad6889d28ee2c98b174f12028e.zip frameworks_av-f3376bdbcb48daad6889d28ee2c98b174f12028e.tar.gz frameworks_av-f3376bdbcb48daad6889d28ee2c98b174f12028e.tar.bz2 | |
am 668b0550: am 597ce69a: Merge "Camera: Add support for SCENE_MODE_HDR for newer HALs" into lmp-mr1-dev
* commit '668b055081bb9d0d61775acf67bb27ce66b214f6':
Camera: Add support for SCENE_MODE_HDR for newer HALs
Diffstat (limited to 'services')
| -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; } |