Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "camera: Update AF scene change key"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-12-08 00:44:48 +00:00
committed by Android (Google) Code Review
parent ded89de871 2adc8ec68e
commit cdf3bd037d
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/hardware/camera2/CameraMetadata.java
View File

@@ -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;

14
core/java/android/hardware/camera2/CaptureResult.java
View File

@@ -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>