From 4793af5e3577c51858719a8977d300c3aafdf881 Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Mon, 5 May 2014 10:39:12 -0700 Subject: [PATCH] Camera2: make videostabilization type consistent Make it consistent with availableVideoStabilizationModes and its optical stabilization relatives. Change-Id: I6e3834af8a62d4f84fca2d305ac9574052b69db0 --- api/current.txt | 2 ++ .../android/hardware/camera2/CameraMetadata.java | 14 ++++++++++++++ .../android/hardware/camera2/CaptureRequest.java | 6 ++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index c64156f3e547b..2bd7a45ca243b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12002,6 +12002,8 @@ package android.hardware.camera2 { field public static final int CONTROL_SCENE_MODE_STEADYPHOTO = 11; // 0xb field public static final int CONTROL_SCENE_MODE_SUNSET = 10; // 0xa field public static final int CONTROL_SCENE_MODE_THEATRE = 7; // 0x7 + field public static final int CONTROL_VIDEO_STABILIZATION_MODE_OFF = 0; // 0x0 + field public static final int CONTROL_VIDEO_STABILIZATION_MODE_ON = 1; // 0x1 field public static final int EDGE_MODE_FAST = 1; // 0x1 field public static final int EDGE_MODE_HIGH_QUALITY = 2; // 0x2 field public static final int EDGE_MODE_OFF = 0; // 0x0 diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index ba8db3ab6fd6d..6e38a22feb4a5 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -1294,6 +1294,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 c4e342c6e9bb9..f161f3af37ccd 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

* * @see CaptureRequest#SCALER_CROP_REGION + * @see #CONTROL_VIDEO_STABILIZATION_MODE_OFF + * @see #CONTROL_VIDEO_STABILIZATION_MODE_ON */ - public static final Key CONTROL_VIDEO_STABILIZATION_MODE = - new Key("android.control.videoStabilizationMode", boolean.class); + public static final Key CONTROL_VIDEO_STABILIZATION_MODE = + new Key("android.control.videoStabilizationMode", int.class); /** *

Operation mode for edge