am 228f4f92: Camera2: Update 3A state doc (6d637fc3) · Commits · e / os / android_frameworks_base

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

+19 −21

Original line number	Diff line number	Diff line
		@@ -393,10 +393,9 @@ public abstract class CameraMetadata {
		public static final int CONTROL_AE_PRECAPTURE_TRIGGER_IDLE = 0;

		/**
		* <p>The precapture metering sequence
		* must be started. The exact effect of the precapture
		* trigger depends on the current AE mode and
		* state.</p>
		* <p>The precapture metering sequence will be started
		* by the camera device. The exact effect of the precapture
		* trigger depends on the current AE mode and state.</p>
		* @see CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER
		*/
		public static final int CONTROL_AE_PRECAPTURE_TRIGGER_START = 1;
		@@ -504,14 +503,14 @@ public abstract class CameraMetadata {
		public static final int CONTROL_AF_TRIGGER_IDLE = 0;

		/**
		* <p>Autofocus must trigger now.</p>
		* <p>Autofocus will trigger now.</p>
		* @see CaptureRequest#CONTROL_AF_TRIGGER
		*/
		public static final int CONTROL_AF_TRIGGER_START = 1;

		/**
		* <p>Autofocus must return to initial
		* state, and cancel any active trigger.</p>
		* <p>Autofocus will return to its initial
		* state, and cancel any currently active trigger.</p>
		* @see CaptureRequest#CONTROL_AF_TRIGGER
		*/
		public static final int CONTROL_AF_TRIGGER_CANCEL = 2;
		@@ -993,7 +992,7 @@ public abstract class CameraMetadata {
		//

		/**
		* <p>AE is off. When a camera device is opened, it starts in
		* <p>AE is off or recently reset. When a camera device is opened, it starts in
		* this state.</p>
		* @see CaptureResult#CONTROL_AE_STATE
		*/
		@@ -1001,21 +1000,20 @@ public abstract class CameraMetadata {

		/**
		* <p>AE doesn't yet have a good set of control values
		* for the current scene</p>
		* for the current scene.</p>
		* @see CaptureResult#CONTROL_AE_STATE
		*/
		public static final int CONTROL_AE_STATE_SEARCHING = 1;

		/**
		* <p>AE has a good set of control values for the
		* current scene</p>
		* current scene.</p>
		* @see CaptureResult#CONTROL_AE_STATE
		*/
		public static final int CONTROL_AE_STATE_CONVERGED = 2;

		/**
		* <p>AE has been locked (aeMode =
		* LOCKED)</p>
		* <p>AE has been locked.</p>
		* @see CaptureResult#CONTROL_AE_STATE
		*/
		public static final int CONTROL_AE_STATE_LOCKED = 3;
		@@ -1023,18 +1021,19 @@ public abstract class CameraMetadata {
		/**
		* <p>AE has a good set of control values, but flash
		* needs to be fired for good quality still
		* capture</p>
		* capture.</p>
		* @see CaptureResult#CONTROL_AE_STATE
		*/
		public static final int CONTROL_AE_STATE_FLASH_REQUIRED = 4;

		/**
		* <p>AE has been asked to do a precapture sequence
		* (through the
		* trigger_action(CAMERA2_TRIGGER_PRECAPTURE_METERING)
		* call), and is currently executing it. Once PRECAPTURE
		* (through the {@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER android.control.aePrecaptureTrigger} START),
		* and is currently executing it. Once PRECAPTURE
		* completes, AE will transition to CONVERGED or
		* FLASH_REQUIRED as appropriate</p>
		* FLASH_REQUIRED as appropriate.</p>
		*
		* @see CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER
		* @see CaptureResult#CONTROL_AE_STATE
		*/
		public static final int CONTROL_AE_STATE_PRECAPTURE = 5;
		@@ -1112,21 +1111,20 @@ public abstract class CameraMetadata {

		/**
		* <p>AWB doesn't yet have a good set of control
		* values for the current scene</p>
		* values for the current scene.</p>
		* @see CaptureResult#CONTROL_AWB_STATE
		*/
		public static final int CONTROL_AWB_STATE_SEARCHING = 1;

		/**
		* <p>AWB has a good set of control values for the
		* current scene</p>
		* current scene.</p>
		* @see CaptureResult#CONTROL_AWB_STATE
		*/
		public static final int CONTROL_AWB_STATE_CONVERGED = 2;

		/**
		* <p>AE has been locked (aeMode =
		* LOCKED)</p>
		* <p>AWB has been locked.</p>
		* @see CaptureResult#CONTROL_AWB_STATE
		*/
		public static final int CONTROL_AWB_STATE_LOCKED = 3;

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

+15 −11

Original line number	Diff line number	Diff line
		@@ -504,15 +504,17 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable {
		new Key<int[]>("android.control.aeTargetFpsRange", int[].class);

		/**
		* <p>Whether the HAL must trigger precapture
		* metering.</p>
		* <p>Whether the camera device will trigger a precapture
		* metering sequence when it processes this request.</p>
		* <p>This entry is normally set to IDLE, or is not
		* included at all in the request settings. When included and
		* set to START, the HAL must trigger the autoexposure
		* set to START, the camera device will trigger the autoexposure
		* precapture metering sequence.</p>
		* <p>The effect of AE precapture trigger depends on the current
		* AE mode and state; see the camera HAL device v3 header for
		* details.</p>
		* AE mode and state; see {@link CaptureResult#CONTROL_AE_STATE android.control.aeState} for AE precapture
		* state transition details.</p>
		*
		* @see CaptureResult#CONTROL_AE_STATE
		* @see #CONTROL_AE_PRECAPTURE_TRIGGER_IDLE
		* @see #CONTROL_AE_PRECAPTURE_TRIGGER_START
		*/
		@@ -563,14 +565,16 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable {
		new Key<int[]>("android.control.afRegions", int[].class);

		/**
		* <p>Whether the HAL must trigger autofocus.</p>
		* <p>Whether the camera device will trigger autofocus for this request.</p>
		* <p>This entry is normally set to IDLE, or is not
		* included at all in the request settings.</p>
		* <p>When included and set to START, the HAL must trigger the
		* autofocus algorithm. The effect of AF trigger depends on the
		* current AF mode and state; see the camera HAL device v3
		* header for details. When set to CANCEL, the HAL must cancel
		* any active trigger, and return to initial AF state.</p>
		* <p>When included and set to START, the camera device will trigger the
		* autofocus algorithm. If autofocus is disabled, this trigger has no effect.</p>
		* <p>When set to CANCEL, the camera device will cancel any active trigger,
		* and return to its initial AF state.</p>
		* <p>See {@link CaptureResult#CONTROL_AF_STATE android.control.afState} for what that means for each AF mode.</p>
		*
		* @see CaptureResult#CONTROL_AF_STATE
		* @see #CONTROL_AF_TRIGGER_IDLE
		* @see #CONTROL_AF_TRIGGER_START
		* @see #CONTROL_AF_TRIGGER_CANCEL

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

+541 −9

File changed.

Preview size limit exceeded, changes collapsed.