Merge "Camera2: framework updates for HAL3.3 keys" (31fdd458) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -12704,11 +12704,14 @@ package android.hardware.camera2 {
		field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Integer>[]> CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Integer>> CONTROL_AE_COMPENSATION_RANGE;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Rational> CONTROL_AE_COMPENSATION_STEP;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> CONTROL_AE_LOCK_AVAILABLE;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AF_AVAILABLE_MODES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AVAILABLE_EFFECTS;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AVAILABLE_MODES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AVAILABLE_SCENE_MODES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AWB_AVAILABLE_MODES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> CONTROL_AWB_LOCK_AVAILABLE;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AE;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AF;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AWB;

api/system-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -12972,11 +12972,14 @@ package android.hardware.camera2 {
		field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Integer>[]> CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Integer>> CONTROL_AE_COMPENSATION_RANGE;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Rational> CONTROL_AE_COMPENSATION_STEP;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> CONTROL_AE_LOCK_AVAILABLE;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AF_AVAILABLE_MODES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AVAILABLE_EFFECTS;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AVAILABLE_MODES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AVAILABLE_SCENE_MODES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AWB_AVAILABLE_MODES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> CONTROL_AWB_LOCK_AVAILABLE;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AE;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AF;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AWB;

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

+38 −0

Original line number	Diff line number	Diff line
		@@ -421,6 +421,17 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		public static final Key<Rational> CONTROL_AE_COMPENSATION_STEP =
		new Key<Rational>("android.control.aeCompensationStep", Rational.class);

		/**
		* <p>Whether the camera device supports {@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock}</p>
		* <p>LIMITED or FULL devices will always list <code>true</code></p>
		* <p>This key is available on all devices.</p>
		*
		* @see CaptureRequest#CONTROL_AE_LOCK
		*/
		@PublicKey
		public static final Key<Boolean> CONTROL_AE_LOCK_AVAILABLE =
		new Key<Boolean>("android.control.aeLockAvailable", boolean.class);

		/**
		* <p>List of auto-focus (AF) modes for {@link CaptureRequest#CONTROL_AF_MODE android.control.afMode} that are
		* supported by this camera device.</p>
		@@ -468,6 +479,22 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		public static final Key<int[]> CONTROL_AVAILABLE_EFFECTS =
		new Key<int[]>("android.control.availableEffects", int[].class);

		/**
		* <p>List of control modes for {@link CaptureRequest#CONTROL_MODE android.control.mode} that are supported by this camera
		* device.</p>
		* <p>This list contains control modes that can be set for the camera device.
		* LEGACY mode devices will always support AUTO mode. LIMITED and FULL
		* devices will always support OFF, AUTO modes.</p>
		* <p><b>Range of valid values:</b><br>
		* Any value listed in {@link CaptureRequest#CONTROL_MODE android.control.mode}</p>
		* <p>This key is available on all devices.</p>
		*
		* @see CaptureRequest#CONTROL_MODE
		*/
		@PublicKey
		public static final Key<int[]> CONTROL_AVAILABLE_MODES =
		new Key<int[]>("android.control.availableModes", int[].class);

		/**
		* <p>List of scene modes for {@link CaptureRequest#CONTROL_SCENE_MODE android.control.sceneMode} that are supported by this camera
		* device.</p>
		@@ -529,6 +556,17 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		public static final Key<int[]> CONTROL_AWB_AVAILABLE_MODES =
		new Key<int[]>("android.control.awbAvailableModes", int[].class);

		/**
		* <p>Whether the camera device supports {@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock}</p>
		* <p>LIMITED or FULL devices will always list <code>true</code></p>
		* <p>This key is available on all devices.</p>
		*
		* @see CaptureRequest#CONTROL_AWB_LOCK
		*/
		@PublicKey
		public static final Key<Boolean> CONTROL_AWB_LOCK_AVAILABLE =
		new Key<Boolean>("android.control.awbLockAvailable", boolean.class);

		/**
		* <p>List of the maximum number of regions that can be used for metering in
		* auto-exposure (AE), auto-white balance (AWB), and auto-focus (AF);

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -552,6 +552,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		* in this matrix result metadata. The transform should keep the magnitude
		* of the output color values within <code>[0, 1.0]</code> (assuming input color
		* values is within the normalized range <code>[0, 1.0]</code>), or clipping may occur.</p>
		* <p>The valid range of each matrix element varies on different devices, but
		* values within [-1.5, 3.0] are guaranteed not to be clipped.</p>
		* <p><b>Units</b>: Unitless scale factors</p>
		* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
		* <p><b>Full capability</b> -
		@@ -575,6 +577,10 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		* TRANSFORM_MATRIX.</p>
		* <p>The gains in the result metadata are the gains actually
		* applied by the camera device to the current frame.</p>
		* <p>The valid range of gains varies on different devices, but gains
		* between [1.0, 3.0] are guaranteed not to be clipped. Even if a given
		* device allows gains below 1.0, this is usually not recommended because
		* this can create color artifacts.</p>
		* <p><b>Units</b>: Unitless gain factors</p>
		* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
		* <p><b>Full capability</b> -
		@@ -1239,10 +1245,6 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		* update, as if this frame is never captured. This mode can be used in the scenario
		* where the application doesn't want a 3A manual control capture to affect
		* the subsequent auto 3A capture results.</p>
		* <p>LEGACY mode devices will only support AUTO and USE_SCENE_MODE modes.
		* LIMITED mode devices will only support OFF and OFF_KEEP_STATE if they
		* support the MANUAL_SENSOR and MANUAL_POST_PROCSESING capabilities.
		* FULL mode devices will always support OFF and OFF_KEEP_STATE.</p>
		* <p><b>Possible values:</b>
		* <ul>
		* <li>{@link #CONTROL_MODE_OFF OFF}</li>
		@@ -1250,9 +1252,12 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		* <li>{@link #CONTROL_MODE_USE_SCENE_MODE USE_SCENE_MODE}</li>
		* <li>{@link #CONTROL_MODE_OFF_KEEP_STATE OFF_KEEP_STATE}</li>
		* </ul></p>
		* <p><b>Available values for this device:</b><br>
		* {@link CameraCharacteristics#CONTROL_AVAILABLE_MODES android.control.availableModes}</p>
		* <p>This key is available on all devices.</p>
		*
		* @see CaptureRequest#CONTROL_AF_MODE
		* @see CameraCharacteristics#CONTROL_AVAILABLE_MODES
		* @see #CONTROL_MODE_OFF
		* @see #CONTROL_MODE_AUTO
		* @see #CONTROL_MODE_USE_SCENE_MODE

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -403,6 +403,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		* in this matrix result metadata. The transform should keep the magnitude
		* of the output color values within <code>[0, 1.0]</code> (assuming input color
		* values is within the normalized range <code>[0, 1.0]</code>), or clipping may occur.</p>
		* <p>The valid range of each matrix element varies on different devices, but
		* values within [-1.5, 3.0] are guaranteed not to be clipped.</p>
		* <p><b>Units</b>: Unitless scale factors</p>
		* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
		* <p><b>Full capability</b> -
		@@ -426,6 +428,10 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		* TRANSFORM_MATRIX.</p>
		* <p>The gains in the result metadata are the gains actually
		* applied by the camera device to the current frame.</p>
		* <p>The valid range of gains varies on different devices, but gains
		* between [1.0, 3.0] are guaranteed not to be clipped. Even if a given
		* device allows gains below 1.0, this is usually not recommended because
		* this can create color artifacts.</p>
		* <p><b>Units</b>: Unitless gain factors</p>
		* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
		* <p><b>Full capability</b> -
		@@ -1855,10 +1861,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		* update, as if this frame is never captured. This mode can be used in the scenario
		* where the application doesn't want a 3A manual control capture to affect
		* the subsequent auto 3A capture results.</p>
		* <p>LEGACY mode devices will only support AUTO and USE_SCENE_MODE modes.
		* LIMITED mode devices will only support OFF and OFF_KEEP_STATE if they
		* support the MANUAL_SENSOR and MANUAL_POST_PROCSESING capabilities.
		* FULL mode devices will always support OFF and OFF_KEEP_STATE.</p>
		* <p><b>Possible values:</b>
		* <ul>
		* <li>{@link #CONTROL_MODE_OFF OFF}</li>
		@@ -1866,9 +1868,12 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		* <li>{@link #CONTROL_MODE_USE_SCENE_MODE USE_SCENE_MODE}</li>
		* <li>{@link #CONTROL_MODE_OFF_KEEP_STATE OFF_KEEP_STATE}</li>
		* </ul></p>
		* <p><b>Available values for this device:</b><br>
		* {@link CameraCharacteristics#CONTROL_AVAILABLE_MODES android.control.availableModes}</p>
		* <p>This key is available on all devices.</p>
		*
		* @see CaptureRequest#CONTROL_AF_MODE
		* @see CameraCharacteristics#CONTROL_AVAILABLE_MODES
		* @see #CONTROL_MODE_OFF
		* @see #CONTROL_MODE_AUTO
		* @see #CONTROL_MODE_USE_SCENE_MODE