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

Commit cdf3bd03 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "camera: Update AF scene change key"

parents ded89de8 2adc8ec6

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

+2 −2
Original line number Diff line number Diff line
@@ -2729,13 +2729,13 @@ public abstract class CameraMetadata<TKey> { 
    //



    /**

     * <p>Scene change is not detected within AF regions.</p>

     * <p>Scene change is not detected within the AF region(s).</p>

     * @see CaptureResult#CONTROL_AF_SCENE_CHANGE

     */

    public static final int CONTROL_AF_SCENE_CHANGE_NOT_DETECTED = 0;



    /**

     * <p>Scene change is detected within AF regions.</p>

     * <p>Scene change is detected within the AF region(s).</p>

     * @see CaptureResult#CONTROL_AF_SCENE_CHANGE

     */

    public static final int CONTROL_AF_SCENE_CHANGE_DETECTED = 1;

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

+10 −4
Original line number Diff line number Diff line
@@ -2185,10 +2185,16 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
            new Key<Boolean>("android.control.enableZsl", boolean.class);



    /**

     * <p>Whether scene change is detected within AF regions.</p>

     * <p>When AF detects a scene change within current AF regions, it will be set to DETECTED. Otherwise,

     * it will be set to NOT_DETECTED. This value will remain NOT_DETECTED if afMode is AF_MODE_OFF or

     * AF_MODE_EDOF.</p>

     * <p>Whether a significant scene change is detected within the currently-set AF

     * region(s).</p>

     * <p>When the camera focus routine detects a change in the scene it is looking at,

     * such as a large shift in camera viewpoint, significant motion in the scene, or a

     * significant illumination change, this value will be set to DETECTED for a single capture

     * result. Otherwise the value will be NOT_DETECTED. The threshold for detection is similar

     * to what would trigger a new passive focus scan to begin in CONTINUOUS autofocus modes.</p>

     * <p>afSceneChange may be DETECTED only if afMode is AF_MODE_CONTINUOUS_VIDEO or

     * AF_MODE_CONTINUOUS_PICTURE. In other AF modes, afSceneChange must be NOT_DETECTED.</p>

     * <p>This key will be available if the camera device advertises this key via {@link android.hardware.camera2.CameraCharacteristics#getAvailableCaptureResultKeys }.</p>

     * <p><b>Possible values:</b>

     * <ul>

     *   <li>{@link #CONTROL_AF_SCENE_CHANGE_NOT_DETECTED NOT_DETECTED}</li>