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

Commit 2d5e8977 authored by Zhijun He's avatar Zhijun He
Browse files

Camera2: Add OFF_KEEP_STATE mode 

Change-Id: I8802339a6b6d8a009f3ba790ffad23c0fcbbfa94
parent 12b805bb

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11427,6 +11427,7 @@ package android.hardware.camera2 { 
    field public static final int CONTROL_EFFECT_MODE_WHITEBOARD = 6; // 0x6

    field public static final int CONTROL_MODE_AUTO = 1; // 0x1

    field public static final int CONTROL_MODE_OFF = 0; // 0x0

    field public static final int CONTROL_MODE_OFF_KEEP_STATE = 3; // 0x3

    field public static final int CONTROL_MODE_USE_SCENE_MODE = 2; // 0x2

    field public static final int CONTROL_SCENE_MODE_ACTION = 2; // 0x2

    field public static final int CONTROL_SCENE_MODE_BARCODE = 16; // 0x10

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

+8 −0
Original line number Diff line number Diff line
@@ -841,6 +841,14 @@ public abstract class CameraMetadata { 
     */

    public static final int CONTROL_MODE_USE_SCENE_MODE = 2;



    /**

     * <p>Same as OFF mode, except that this capture will not be

     * used by camera device background auto-exposure, auto-white balance and

     * auto-focus algorithms to update their statistics.</p>

     * @see CaptureRequest#CONTROL_MODE

     */

    public static final int CONTROL_MODE_OFF_KEEP_STATE = 3;



    //

    // Enumeration values for CaptureRequest#CONTROL_SCENE_MODE

    //

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

+8 −2
Original line number Diff line number Diff line
@@ -639,10 +639,10 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 


    /**

     * <p>Whether AWB is currently locked to its

     * latest calculated values</p>

     * latest calculated values.</p>

     * <p>Note that AWB lock is only meaningful for AUTO

     * mode; in other modes, AWB is already fixed to a specific

     * setting</p>

     * setting.</p>

     */

    public static final Key<Boolean> CONTROL_AWB_LOCK =

            new Key<Boolean>("android.control.awbLock", boolean.class);
@@ -763,11 +763,17 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 
     * one of the scene mode settings (such as ACTION, SUNSET, or PARTY)

     * as it wishes. The camera device scene mode 3A settings are provided by

     * android.control.sceneModeOverrides.</p>

     * <p>When set to OFF_KEEP_STATE, it is similar to OFF mode, the only difference

     * is that this frame will not be used by camera device background 3A statistics

     * update, as if this frame is never captured. This mode can be used in the scenario

     * where the application doesn't want a 3A manual control capture to affect

     * the subsequent auto 3A capture results.</p>

     *

     * @see CaptureRequest#CONTROL_AF_MODE

     * @see #CONTROL_MODE_OFF

     * @see #CONTROL_MODE_AUTO

     * @see #CONTROL_MODE_USE_SCENE_MODE

     * @see #CONTROL_MODE_OFF_KEEP_STATE

     */

    public static final Key<Integer> CONTROL_MODE =

            new Key<Integer>("android.control.mode", int.class);

core/java/android/hardware/camera2/CaptureResult.java

+6 −0
Original line number Diff line number Diff line
@@ -938,11 +938,17 @@ public final class CaptureResult extends CameraMetadata { 
     * one of the scene mode settings (such as ACTION, SUNSET, or PARTY)

     * as it wishes. The camera device scene mode 3A settings are provided by

     * android.control.sceneModeOverrides.</p>

     * <p>When set to OFF_KEEP_STATE, it is similar to OFF mode, the only difference

     * is that this frame will not be used by camera device background 3A statistics

     * update, as if this frame is never captured. This mode can be used in the scenario

     * where the application doesn't want a 3A manual control capture to affect

     * the subsequent auto 3A capture results.</p>

     *

     * @see CaptureRequest#CONTROL_AF_MODE

     * @see #CONTROL_MODE_OFF

     * @see #CONTROL_MODE_AUTO

     * @see #CONTROL_MODE_USE_SCENE_MODE

     * @see #CONTROL_MODE_OFF_KEEP_STATE

     */

    public static final Key<Integer> CONTROL_MODE =

            new Key<Integer>("android.control.mode", int.class);