diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-05-05 10:39:12 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2014-05-05 10:39:12 -0700 |
| commit | 4793af5e3577c51858719a8977d300c3aafdf881 (patch) | |
| tree | 922f67e9bcb24b8bc5b4ed85b2185137f2ceb765 /core/java/android/hardware/camera2 | |
| parent | c74b3cb6f057da60dce6e99547a668e57aa478aa (diff) | |
| download | frameworks_base-4793af5e3577c51858719a8977d300c3aafdf881.zip frameworks_base-4793af5e3577c51858719a8977d300c3aafdf881.tar.gz frameworks_base-4793af5e3577c51858719a8977d300c3aafdf881.tar.bz2 | |
Camera2: make videostabilization type consistent
Make it consistent with availableVideoStabilizationModes and its optical
stabilization relatives.
Change-Id: I6e3834af8a62d4f84fca2d305ac9574052b69db0
Diffstat (limited to 'core/java/android/hardware/camera2')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraMetadata.java | 14 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureRequest.java | 6 |
2 files changed, 18 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index ba8db3a..6e38a22 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -1295,6 +1295,20 @@ public abstract class CameraMetadata { public static final int CONTROL_SCENE_MODE_BARCODE = 16; // + // Enumeration values for CaptureRequest#CONTROL_VIDEO_STABILIZATION_MODE + // + + /** + * @see CaptureRequest#CONTROL_VIDEO_STABILIZATION_MODE + */ + public static final int CONTROL_VIDEO_STABILIZATION_MODE_OFF = 0; + + /** + * @see CaptureRequest#CONTROL_VIDEO_STABILIZATION_MODE + */ + public static final int CONTROL_VIDEO_STABILIZATION_MODE_ON = 1; + + // // Enumeration values for CaptureRequest#EDGE_MODE // diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index c4e342c..f161f3a 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -831,9 +831,11 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { * stabilized</p> * * @see CaptureRequest#SCALER_CROP_REGION + * @see #CONTROL_VIDEO_STABILIZATION_MODE_OFF + * @see #CONTROL_VIDEO_STABILIZATION_MODE_ON */ - public static final Key<Boolean> CONTROL_VIDEO_STABILIZATION_MODE = - new Key<Boolean>("android.control.videoStabilizationMode", boolean.class); + public static final Key<Integer> CONTROL_VIDEO_STABILIZATION_MODE = + new Key<Integer>("android.control.videoStabilizationMode", int.class); /** * <p>Operation mode for edge |