diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-08-30 00:27:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-30 00:27:43 +0000 |
| commit | 6293217929466892a70bd5bb4b8cd9af17e05bf2 (patch) | |
| tree | 0712b61a1f1b35a61800f017865e2473d471c226 /core/java/android/hardware/camera2 | |
| parent | be50bd76a993b8575828df2fafab4bc5ec9de99b (diff) | |
| parent | ff99a0add9700b423a0da3e332840e3907ae96a5 (diff) | |
| download | frameworks_base-6293217929466892a70bd5bb4b8cd9af17e05bf2.zip frameworks_base-6293217929466892a70bd5bb4b8cd9af17e05bf2.tar.gz frameworks_base-6293217929466892a70bd5bb4b8cd9af17e05bf2.tar.bz2 | |
Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev
Diffstat (limited to 'core/java/android/hardware/camera2')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraMetadata.java | 7 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index 3c9b7b3..a57b361 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -1575,6 +1575,13 @@ public abstract class CameraMetadata<TKey> { */ public static final int CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO = 17; + /** + * <p>Turn on custom high dynamic range (HDR) mode.</p> + * @see CaptureRequest#CONTROL_SCENE_MODE + * @hide + */ + public static final int CONTROL_SCENE_MODE_HDR = 18; + // // Enumeration values for CaptureRequest#CONTROL_VIDEO_STABILIZATION_MODE // diff --git a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java index ee0ca9c..a8d1018 100644 --- a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java +++ b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java @@ -882,6 +882,7 @@ public class LegacyMetadataMapper { Parameters.SCENE_MODE_PARTY, Parameters.SCENE_MODE_CANDLELIGHT, Parameters.SCENE_MODE_BARCODE, + Parameters.SCENE_MODE_HDR, }; private final static int[] sSceneModes = { @@ -901,6 +902,7 @@ public class LegacyMetadataMapper { CameraCharacteristics.CONTROL_SCENE_MODE_PARTY, CameraCharacteristics.CONTROL_SCENE_MODE_CANDLELIGHT, CameraCharacteristics.CONTROL_SCENE_MODE_BARCODE, + CameraCharacteristics.CONTROL_SCENE_MODE_HDR, }; static int convertSceneModeFromLegacy(String mode) { |