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

Commit e00df1dc authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android Git Automerger
Browse files

am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev 

* commit 'ef773e35':
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
parents d11cf9cf ef773e35

core/java/android/hardware/camera2/CameraCharacteristics.java

+577 −157

File changed.

Preview size limit exceeded, changes collapsed.

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

+17 −18
Original line number Diff line number Diff line
@@ -807,6 +807,8 @@ public abstract class CameraMetadata<TKey> { 
     * {@link CaptureRequest#SENSOR_FRAME_DURATION android.sensor.frameDuration} are used by the camera

     * device, along with android.flash.* fields, if there's

     * a flash unit for this camera device.</p>

     * <p>LEGACY devices do not support the OFF mode and will

     * override attempts to use this value to ON.</p>

     *

     * @see CaptureRequest#SENSOR_EXPOSURE_TIME

     * @see CaptureRequest#SENSOR_FRAME_DURATION
@@ -1213,8 +1215,7 @@ public abstract class CameraMetadata<TKey> { 
     * image while recording video) use case.</p>

     * <p>The camera device should take the highest-quality image

     * possible (given the other settings) without disrupting the

     * frame rate of video recording.<br />

     * </p>

     * frame rate of video recording.  </p>

     * @see CaptureRequest#CONTROL_CAPTURE_INTENT

     */

    public static final int CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT = 4;
@@ -1577,6 +1578,8 @@ public abstract class CameraMetadata<TKey> { 


    /**

     * <p>Turn on custom high dynamic range (HDR) mode.</p>

     * <p>This is intended for LEGACY mode devices only;

     * HAL3+ camera devices should not implement this mode.</p>

     * @see CaptureRequest#CONTROL_SCENE_MODE

     * @hide

     */
@@ -1862,8 +1865,6 @@ public abstract class CameraMetadata<TKey> { 


    /**

     * <p>Return face rectangle and confidence values only.</p>

     * <p>In this mode, only android.statistics.faceRectangles and

     * android.statistics.faceScores outputs are valid.</p>

     * @see CaptureRequest#STATISTICS_FACE_DETECT_MODE

     */

    public static final int STATISTICS_FACE_DETECT_MODE_SIMPLE = 1;
@@ -1871,11 +1872,7 @@ public abstract class CameraMetadata<TKey> { 
    /**

     * <p>Return all face

     * metadata.</p>

     * <p>In this mode,

     * android.statistics.faceRectangles,

     * android.statistics.faceScores,

     * android.statistics.faceIds, and

     * android.statistics.faceLandmarks outputs are valid.</p>

     * <p>In this mode, face rectangles, scores, landmarks, and face IDs are all valid.</p>

     * @see CaptureRequest#STATISTICS_FACE_DETECT_MODE

     */

    public static final int STATISTICS_FACE_DETECT_MODE_FULL = 2;
@@ -2064,6 +2061,8 @@ public abstract class CameraMetadata<TKey> { 
     * and may restart scanning at any time.</p>

     * <p>Only used by CONTINUOUS_* AF modes. This is a transient state, the camera

     * device may skip reporting this state in capture result.</p>

     * <p>LEGACY camera devices do not support this state. When a passive

     * scan has finished, it will always go to PASSIVE_FOCUSED.</p>

     * @see CaptureResult#CONTROL_AF_STATE

     */

    public static final int CONTROL_AF_STATE_PASSIVE_UNFOCUSED = 6;

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

+662 −145

File changed.

Preview size limit exceeded, changes collapsed.

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

+830 −164

File changed.

Preview size limit exceeded, changes collapsed.