Merge "camera2: Update hotpixel tags." (ad0aa838) · Commits · e / os / android_frameworks_base

api/current.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -11295,6 +11295,7 @@ package android.hardware.camera2 {
		field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_INFO_EXPOSURE_TIME_RANGE;
		field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_INFO_MAX_FRAME_DURATION;
		field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_INFO_PHYSICAL_SIZE;
		field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_INFO_PIXEL_ARRAY_SIZE;
		field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_INFO_SENSITIVITY_RANGE;
		field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_MAX_ANALOG_SENSITIVITY;
		field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_ORIENTATION;
		@@ -11459,6 +11460,9 @@ package android.hardware.camera2 {
		field public static final int FLASH_STATE_FIRED = 3; // 0x3
		field public static final int FLASH_STATE_READY = 2; // 0x2
		field public static final int FLASH_STATE_UNAVAILABLE = 0; // 0x0
		field public static final int HOT_PIXEL_MODE_FAST = 1; // 0x1
		field public static final int HOT_PIXEL_MODE_HIGH_QUALITY = 2; // 0x2
		field public static final int HOT_PIXEL_MODE_OFF = 0; // 0x0
		field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_FULL = 1; // 0x1
		field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED = 0; // 0x0
		field public static final int LENS_FACING_BACK = 1; // 0x1
		@@ -11543,6 +11547,7 @@ package android.hardware.camera2 {
		field public static final android.os.Parcelable.Creator CREATOR;
		field public static final android.hardware.camera2.CameraMetadata.Key EDGE_MODE;
		field public static final android.hardware.camera2.CameraMetadata.Key FLASH_MODE;
		field public static final android.hardware.camera2.CameraMetadata.Key HOT_PIXEL_MODE;
		field public static final android.hardware.camera2.CameraMetadata.Key JPEG_GPS_COORDINATES;
		field public static final android.hardware.camera2.CameraMetadata.Key JPEG_GPS_PROCESSING_METHOD;
		field public static final android.hardware.camera2.CameraMetadata.Key JPEG_GPS_TIMESTAMP;
		@@ -11600,6 +11605,8 @@ package android.hardware.camera2 {
		field public static final android.hardware.camera2.CameraMetadata.Key EDGE_MODE;
		field public static final android.hardware.camera2.CameraMetadata.Key FLASH_MODE;
		field public static final android.hardware.camera2.CameraMetadata.Key FLASH_STATE;
		field public static final android.hardware.camera2.CameraMetadata.Key HOT_PIXEL_MAP;
		field public static final android.hardware.camera2.CameraMetadata.Key HOT_PIXEL_MODE;
		field public static final android.hardware.camera2.CameraMetadata.Key JPEG_GPS_COORDINATES;
		field public static final android.hardware.camera2.CameraMetadata.Key JPEG_GPS_PROCESSING_METHOD;
		field public static final android.hardware.camera2.CameraMetadata.Key JPEG_GPS_TIMESTAMP;

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -767,6 +767,16 @@ public final class CameraCharacteristics extends CameraMetadata {
		public static final Key<float[]> SENSOR_INFO_PHYSICAL_SIZE =
		new Key<float[]>("android.sensor.info.physicalSize", float[].class);

		/**
		* <p>Dimensions of full pixel array, possibly
		* including black calibration pixels.</p>
		* <p>Maximum output resolution for raw format must
		* match this in
		* android.scaler.info.availableSizesPerFormat.</p>
		*/
		public static final Key<android.hardware.camera2.Size> SENSOR_INFO_PIXEL_ARRAY_SIZE =
		new Key<android.hardware.camera2.Size>("android.sensor.info.pixelArraySize", android.hardware.camera2.Size.class);

		/**
		* <p>Gain factor from electrons to raw units when
		* ISO=100</p>

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

+28 −0

Original line number	Diff line number	Diff line
		@@ -1174,6 +1174,34 @@ public abstract class CameraMetadata {
		*/
		public static final int FLASH_MODE_TORCH = 2;

		//
		// Enumeration values for CaptureRequest#HOT_PIXEL_MODE
		//

		/**
		* <p>The frame rate must not be reduced relative to sensor raw output
		* for this option.</p>
		* <p>No hot pixel correction is applied.</p>
		* @see CaptureRequest#HOT_PIXEL_MODE
		*/
		public static final int HOT_PIXEL_MODE_OFF = 0;

		/**
		* <p>The frame rate must not be reduced relative to sensor raw output
		* for this option.</p>
		* <p>Hot pixel correction is applied.</p>
		* @see CaptureRequest#HOT_PIXEL_MODE
		*/
		public static final int HOT_PIXEL_MODE_FAST = 1;

		/**
		* <p>The frame rate may be reduced relative to sensor raw output
		* for this option.</p>
		* <p>A high-quality hot pixel correction is applied.</p>
		* @see CaptureRequest#HOT_PIXEL_MODE
		*/
		public static final int HOT_PIXEL_MODE_HIGH_QUALITY = 2;

		//
		// Enumeration values for CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE
		//

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -871,6 +871,18 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable {
		public static final Key<Integer> FLASH_MODE =
		new Key<Integer>("android.flash.mode", int.class);

		/**
		* <p>Set operational mode for hot pixel correction.</p>
		* <p>Hotpixel correction interpolates out, or otherwise removes, pixels
		* that do not accurately encode the incoming light (i.e. pixels that
		* are stuck at an arbitrary value).</p>
		* @see #HOT_PIXEL_MODE_OFF
		* @see #HOT_PIXEL_MODE_FAST
		* @see #HOT_PIXEL_MODE_HIGH_QUALITY
		*/
		public static final Key<Integer> HOT_PIXEL_MODE =
		new Key<Integer>("android.hotPixel.mode", int.class);

		/**
		* <p>GPS coordinates to include in output JPEG
		* EXIF</p>

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

+25 −0

Original line number	Diff line number	Diff line
		@@ -1013,6 +1013,31 @@ public final class CaptureResult extends CameraMetadata {
		public static final Key<Integer> FLASH_STATE =
		new Key<Integer>("android.flash.state", int.class);

		/**
		* <p>List of <code>(x, y)</code> coordinates of hot/defective pixels on the
		* sensor, where <code>(x, y)</code> lies between <code>(0, 0)</code>, which is the top-left
		* of the pixel array, and the width,height of the pixel array given in
		* {@link CameraCharacteristics#SENSOR_INFO_PIXEL_ARRAY_SIZE android.sensor.info.pixelArraySize}. This may include hot pixels
		* that lie outside of the active array bounds given by
		* android.sensor.activeArraySize.</p>
		*
		* @see CameraCharacteristics#SENSOR_INFO_PIXEL_ARRAY_SIZE
		*/
		public static final Key<int[]> HOT_PIXEL_MAP =
		new Key<int[]>("android.hotPixel.map", int[].class);

		/**
		* <p>Set operational mode for hot pixel correction.</p>
		* <p>Hotpixel correction interpolates out, or otherwise removes, pixels
		* that do not accurately encode the incoming light (i.e. pixels that
		* are stuck at an arbitrary value).</p>
		* @see #HOT_PIXEL_MODE_OFF
		* @see #HOT_PIXEL_MODE_FAST
		* @see #HOT_PIXEL_MODE_HIGH_QUALITY
		*/
		public static final Key<Integer> HOT_PIXEL_MODE =
		new Key<Integer>("android.hotPixel.mode", int.class);

		/**
		* <p>GPS coordinates to include in output JPEG
		* EXIF</p>