Camera: add post RAW sensitivity keys (1ee1a0ae) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -13454,6 +13454,7 @@ package android.hardware.camera2 {
		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;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Integer>> CONTROL_POST_RAW_SENSITIVITY_BOOST_RANGE;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> DEPTH_DEPTH_IS_EXCLUSIVE;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> EDGE_AVAILABLE_EDGE_MODES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> FLASH_INFO_AVAILABLE;
		@@ -13813,6 +13814,7 @@ package android.hardware.camera2 {
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_CAPTURE_INTENT;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_EFFECT_MODE;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_MODE;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_POST_RAW_SENSITIVITY_BOOST;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_SCENE_MODE;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_VIDEO_STABILIZATION_MODE;
		field public static final android.os.Parcelable.Creator<android.hardware.camera2.CaptureRequest> CREATOR;
		@@ -13891,6 +13893,7 @@ package android.hardware.camera2 {
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_CAPTURE_INTENT;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_EFFECT_MODE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_MODE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_POST_RAW_SENSITIVITY_BOOST;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_SCENE_MODE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_VIDEO_STABILIZATION_MODE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> EDGE_MODE;

api/system-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -13802,6 +13802,7 @@ package android.hardware.camera2 {
		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;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Integer>> CONTROL_POST_RAW_SENSITIVITY_BOOST_RANGE;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> DEPTH_DEPTH_IS_EXCLUSIVE;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> EDGE_AVAILABLE_EDGE_MODES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> FLASH_INFO_AVAILABLE;
		@@ -14161,6 +14162,7 @@ package android.hardware.camera2 {
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_CAPTURE_INTENT;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_EFFECT_MODE;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_MODE;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_POST_RAW_SENSITIVITY_BOOST;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_SCENE_MODE;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_VIDEO_STABILIZATION_MODE;
		field public static final android.os.Parcelable.Creator<android.hardware.camera2.CaptureRequest> CREATOR;
		@@ -14239,6 +14241,7 @@ package android.hardware.camera2 {
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_CAPTURE_INTENT;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_EFFECT_MODE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_MODE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_POST_RAW_SENSITIVITY_BOOST;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_SCENE_MODE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_VIDEO_STABILIZATION_MODE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> EDGE_MODE;

api/test-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -13454,6 +13454,7 @@ package android.hardware.camera2 {
		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;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Integer>> CONTROL_POST_RAW_SENSITIVITY_BOOST_RANGE;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> DEPTH_DEPTH_IS_EXCLUSIVE;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> EDGE_AVAILABLE_EDGE_MODES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> FLASH_INFO_AVAILABLE;
		@@ -13813,6 +13814,7 @@ package android.hardware.camera2 {
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_CAPTURE_INTENT;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_EFFECT_MODE;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_MODE;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_POST_RAW_SENSITIVITY_BOOST;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_SCENE_MODE;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_VIDEO_STABILIZATION_MODE;
		field public static final android.os.Parcelable.Creator<android.hardware.camera2.CaptureRequest> CREATOR;
		@@ -13891,6 +13893,7 @@ package android.hardware.camera2 {
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_CAPTURE_INTENT;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_EFFECT_MODE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_MODE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_POST_RAW_SENSITIVITY_BOOST;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_SCENE_MODE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_VIDEO_STABILIZATION_MODE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> EDGE_MODE;

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

+20 −0

Original line number	Diff line number	Diff line
		@@ -742,6 +742,26 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		public static final Key<int[]> CONTROL_AVAILABLE_MODES =
		new Key<int[]>("android.control.availableModes", int[].class);

		/**
		* <p>Range of boosts for {@link CaptureRequest#CONTROL_POST_RAW_SENSITIVITY_BOOST android.control.postRawSensitivityBoost} supported
		* by this camera device.</p>
		* <p>Devices support post RAW sensitivity boost will advertise
		* {@link CaptureRequest#CONTROL_POST_RAW_SENSITIVITY_BOOST android.control.postRawSensitivityBoost} key for controling
		* post RAW sensitivity boost.</p>
		* <p>This key will be <code>null</code> for devices that do not support any RAW format
		* outputs. For devices that do support RAW format outputs, this key will always
		* present, and if a device does not support post RAW sensitivity boost, it will
		* list <code>(100, 100)</code> in this key.</p>
		* <p><b>Units</b>: ISO arithmetic units, the same as {@link CaptureRequest#SENSOR_SENSITIVITY android.sensor.sensitivity}</p>
		* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
		*
		* @see CaptureRequest#CONTROL_POST_RAW_SENSITIVITY_BOOST
		* @see CaptureRequest#SENSOR_SENSITIVITY
		*/
		@PublicKey
		public static final Key<android.util.Range<Integer>> CONTROL_POST_RAW_SENSITIVITY_BOOST_RANGE =
		new Key<android.util.Range<Integer>>("android.control.postRawSensitivityBoostRange", new TypeReference<android.util.Range<Integer>>() {{ }});

		/**
		* <p>List of edge enhancement modes for {@link CaptureRequest#EDGE_MODE android.edge.mode} that are supported by this camera
		* device.</p>

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

+39 −0

Original line number	Diff line number	Diff line
		@@ -1589,6 +1589,41 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		public static final Key<Integer> CONTROL_VIDEO_STABILIZATION_MODE =
		new Key<Integer>("android.control.videoStabilizationMode", int.class);

		/**
		* <p>The amount of additional sesnsitivity boost applied to output images
		* after RAW sensor data is captured.</p>
		* <p>Some camera devices support additional digital sensitivity boosting in the
		* camera processing pipeline after sensor RAW image is captured.
		* Such a boost will be applied to YUV/JPEG format output images but will not
		* have effect on RAW output formats like RAW_SENSOR, RAW10, RAW12 or RAW_OPAQUE.</p>
		* <p>This key is optional. Applications can assume there is no boost applied
		* after RAW is captured if this key is not available.
		* When this key is available, the sensitivity boost value must be within
		* {@link CaptureRequest#CONTROL_POST_RAW_SENSITIVITY_BOOST android.control.postRawSensitivityBoost}.</p>
		* <p>If the camera device cannot apply the exact boost requested, it will reduce the
		* boost to the nearest supported value.
		* The final boost value used will be available in the output capture result.</p>
		* <p>For devices that support post RAW sensitivity boost, the YUV/JPEG output images
		* of such device will have the total sensitivity of
		* <code>{@link CaptureRequest#SENSOR_SENSITIVITY android.sensor.sensitivity} * android.control.ispSensitivity / 100</code>
		* The sensitivity of RAW format images will always be <code>{@link CaptureRequest#SENSOR_SENSITIVITY android.sensor.sensitivity}</code></p>
		* <p>This control is only effective if {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} or {@link CaptureRequest#CONTROL_MODE android.control.mode} is set to
		* OFF; otherwise the auto-exposure algorithm will override this value.</p>
		* <p><b>Units</b>: ISO arithmetic units, the same as {@link CaptureRequest#SENSOR_SENSITIVITY android.sensor.sensitivity}</p>
		* <p><b>Range of valid values:</b><br>
		* {@link CameraCharacteristics#CONTROL_POST_RAW_SENSITIVITY_BOOST_RANGE android.control.postRawSensitivityBoostRange}</p>
		* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
		*
		* @see CaptureRequest#CONTROL_AE_MODE
		* @see CaptureRequest#CONTROL_MODE
		* @see CaptureRequest#CONTROL_POST_RAW_SENSITIVITY_BOOST
		* @see CameraCharacteristics#CONTROL_POST_RAW_SENSITIVITY_BOOST_RANGE
		* @see CaptureRequest#SENSOR_SENSITIVITY
		*/
		@PublicKey
		public static final Key<Integer> CONTROL_POST_RAW_SENSITIVITY_BOOST =
		new Key<Integer>("android.control.postRawSensitivityBoost", int.class);

		/**
		* <p>Operation mode for edge
		* enhancement.</p>
		@@ -2244,6 +2279,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		* requested, it will reduce the gain to the nearest supported
		* value. The final sensitivity used will be available in the
		* output capture result.</p>
		* <p>This control is only effective if {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} or {@link CaptureRequest#CONTROL_MODE android.control.mode} is set to
		* OFF; otherwise the auto-exposure algorithm will override this value.</p>
		* <p><b>Units</b>: ISO arithmetic units</p>
		* <p><b>Range of valid values:</b><br>
		* {@link CameraCharacteristics#SENSOR_INFO_SENSITIVITY_RANGE android.sensor.info.sensitivityRange}</p>
		@@ -2252,6 +2289,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		* Present on all camera devices that report being {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_FULL HARDWARE_LEVEL_FULL} devices in the
		* {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} key</p>
		*
		* @see CaptureRequest#CONTROL_AE_MODE
		* @see CaptureRequest#CONTROL_MODE
		* @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
		* @see CameraCharacteristics#SENSOR_INFO_SENSITIVITY_RANGE
		* @see CameraCharacteristics#SENSOR_MAX_ANALOG_SENSITIVITY