Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e126be2c authored by Zhijun He's avatar Zhijun He Committed by Android (Google) Code Review
Browse files

Merge "Camera2: make videostabilization type consistent"

parents 98596c92 4793af5e

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -12006,6 +12006,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

core/java/android/hardware/camera2/CameraMetadata.java

+14 −0
Original line number Diff line number Diff line
@@ -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

    //

core/java/android/hardware/camera2/CaptureRequest.java

+4 −2
Original line number Diff line number Diff line
@@ -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