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

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

Merge "Camera2: Add MANUAL capture intent"

parents 7e6fe14f e30adb76

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -11727,6 +11727,7 @@ package android.hardware.camera2 { 
    field public static final int CONTROL_AWB_STATE_LOCKED = 3; // 0x3

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

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

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

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

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

    field public static final int CONTROL_CAPTURE_INTENT_MANUAL = 6; // 0x6

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

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

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

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

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

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

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

+11 −0
Original line number Original line Diff line number Diff line
@@ -940,6 +940,17 @@ public abstract class CameraMetadata { 
     */

     */

    public static final int CONTROL_CAPTURE_INTENT_ZERO_SHUTTER_LAG = 5;

    public static final int CONTROL_CAPTURE_INTENT_ZERO_SHUTTER_LAG = 5;





    /**

     * <p>This request is for manual capture use case where

     * the applications want to directly control the capture parameters

     * (e.g. {@link CaptureRequest#SENSOR_EXPOSURE_TIME android.sensor.exposureTime}, {@link CaptureRequest#SENSOR_SENSITIVITY android.sensor.sensitivity} etc.).</p>

     *

     * @see CaptureRequest#SENSOR_EXPOSURE_TIME

     * @see CaptureRequest#SENSOR_SENSITIVITY

     * @see CaptureRequest#CONTROL_CAPTURE_INTENT

     */

    public static final int CONTROL_CAPTURE_INTENT_MANUAL = 6;



    //

    //

    // Enumeration values for CaptureRequest#CONTROL_EFFECT_MODE

    // Enumeration values for CaptureRequest#CONTROL_EFFECT_MODE

    //

    //

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

+7 −2
Original line number Original line Diff line number Diff line
@@ -714,16 +714,21 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 
     * auto-focus, auto-white balance) routines about the purpose

     * auto-focus, auto-white balance) routines about the purpose

     * of this capture, to help the camera device to decide optimal 3A

     * of this capture, to help the camera device to decide optimal 3A

     * strategy.</p>

     * strategy.</p>

     * <p>This control is only effective if <code>{@link CaptureRequest#CONTROL_MODE android.control.mode} != OFF</code>

     * <p>This control (except for MANUAL) is only effective if

     * and any 3A routine is active.</p>

     * <code>{@link CaptureRequest#CONTROL_MODE android.control.mode} != OFF</code> and any 3A routine is active.</p>

     * <p>ZERO_SHUTTER_LAG must be supported if {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities}

     * contains ZSL. MANUAL must be supported if {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities}

     * contains MANUAL_SENSOR.</p>

     *

     *

     * @see CaptureRequest#CONTROL_MODE

     * @see CaptureRequest#CONTROL_MODE

     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES

     * @see #CONTROL_CAPTURE_INTENT_CUSTOM

     * @see #CONTROL_CAPTURE_INTENT_CUSTOM

     * @see #CONTROL_CAPTURE_INTENT_PREVIEW

     * @see #CONTROL_CAPTURE_INTENT_PREVIEW

     * @see #CONTROL_CAPTURE_INTENT_STILL_CAPTURE

     * @see #CONTROL_CAPTURE_INTENT_STILL_CAPTURE

     * @see #CONTROL_CAPTURE_INTENT_VIDEO_RECORD

     * @see #CONTROL_CAPTURE_INTENT_VIDEO_RECORD

     * @see #CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT

     * @see #CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT

     * @see #CONTROL_CAPTURE_INTENT_ZERO_SHUTTER_LAG

     * @see #CONTROL_CAPTURE_INTENT_ZERO_SHUTTER_LAG

     * @see #CONTROL_CAPTURE_INTENT_MANUAL

     */

     */

    public static final Key<Integer> CONTROL_CAPTURE_INTENT =

    public static final Key<Integer> CONTROL_CAPTURE_INTENT =

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

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