Merge "Camera: Add HEIC format output" (ebd10b8f) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -14172,6 +14172,7 @@ package android.graphics {
		field public static final int DEPTH_POINT_CLOUD = 257; // 0x101
		field public static final int FLEX_RGBA_8888 = 42; // 0x2a
		field public static final int FLEX_RGB_888 = 41; // 0x29
		field public static final int HEIC = 1212500294; // 0x48454946
		field public static final int JPEG = 256; // 0x100
		field public static final int NV16 = 16; // 0x10
		field public static final int NV21 = 17; // 0x11

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

+71 −2

Original line number	Diff line number	Diff line
		@@ -1159,9 +1159,10 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* <li>Each output JPEG size in android.scaler.availableStreamConfigurations will have at least
		* one corresponding size that has the same aspect ratio in availableThumbnailSizes,
		* and vice versa.</li>
		* <li>All non-<code>(0, 0)</code> sizes will have non-zero widths and heights.
		* This key is available on all devices.</li>
		* <li>All non-<code>(0, 0)</code> sizes will have non-zero widths and heights.</li>
		* </ul>
		* <p>This list is also used as supported thumbnail sizes for HEIC image format capture.</p>
		* <p>This key is available on all devices.</p>
		*
		* @see CaptureRequest#JPEG_THUMBNAIL_SIZE
		*/
		@@ -3838,6 +3839,74 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		public static final Key<int[]> DISTORTION_CORRECTION_AVAILABLE_MODES =
		new Key<int[]>("android.distortionCorrection.availableModes", int[].class);

		/**
		* <p>The available HEIC (ISO/IEC 23008-12) stream
		* configurations that this camera device supports
		* (i.e. format, width, height, output/input stream).</p>
		* <p>The configurations are listed as <code>(format, width, height, input?)</code> tuples.</p>
		* <p>If the camera device supports HEIC image format, it will support identical set of stream
		* combinations involving HEIC image format, compared to the combinations involving JPEG
		* image format as required by the device's hardware level and capabilities.</p>
		* <p>All the static, control, and dynamic metadata tags related to JPEG apply to HEIC formats.
		* Configuring JPEG and HEIC streams at the same time is not supported.</p>
		* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
		* <p><b>Limited capability</b> -
		* Present on all camera devices that report being at least {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED HARDWARE_LEVEL_LIMITED} devices in the
		* {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} key</p>
		*
		* @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
		* @hide
		*/
		public static final Key<android.hardware.camera2.params.StreamConfiguration[]> HEIC_AVAILABLE_HEIC_STREAM_CONFIGURATIONS =
		new Key<android.hardware.camera2.params.StreamConfiguration[]>("android.heic.availableHeicStreamConfigurations", android.hardware.camera2.params.StreamConfiguration[].class);

		/**
		* <p>This lists the minimum frame duration for each
		* format/size combination for HEIC output formats.</p>
		* <p>This should correspond to the frame duration when only that
		* stream is active, with all processing (typically in android.*.mode)
		* set to either OFF or FAST.</p>
		* <p>When multiple streams are used in a request, the minimum frame
		* duration will be max(individual stream min durations).</p>
		* <p>See {@link CaptureRequest#SENSOR_FRAME_DURATION android.sensor.frameDuration} and
		* android.scaler.availableStallDurations for more details about
		* calculating the max frame rate.</p>
		* <p><b>Units</b>: (format, width, height, ns) x n</p>
		* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
		* <p><b>Limited capability</b> -
		* Present on all camera devices that report being at least {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED HARDWARE_LEVEL_LIMITED} devices in the
		* {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} key</p>
		*
		* @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
		* @see CaptureRequest#SENSOR_FRAME_DURATION
		* @hide
		*/
		public static final Key<android.hardware.camera2.params.StreamConfigurationDuration[]> HEIC_AVAILABLE_HEIC_MIN_FRAME_DURATIONS =
		new Key<android.hardware.camera2.params.StreamConfigurationDuration[]>("android.heic.availableHeicMinFrameDurations", android.hardware.camera2.params.StreamConfigurationDuration[].class);

		/**
		* <p>This lists the maximum stall duration for each
		* output format/size combination for HEIC streams.</p>
		* <p>A stall duration is how much extra time would get added
		* to the normal minimum frame duration for a repeating request
		* that has streams with non-zero stall.</p>
		* <p>This functions similarly to
		* android.scaler.availableStallDurations for HEIC
		* streams.</p>
		* <p>All HEIC output stream formats may have a nonzero stall
		* duration.</p>
		* <p><b>Units</b>: (format, width, height, ns) x n</p>
		* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
		* <p><b>Limited capability</b> -
		* Present on all camera devices that report being at least {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED HARDWARE_LEVEL_LIMITED} devices in the
		* {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} key</p>
		*
		* @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
		* @hide
		*/
		public static final Key<android.hardware.camera2.params.StreamConfigurationDuration[]> HEIC_AVAILABLE_HEIC_STALL_DURATIONS =
		new Key<android.hardware.camera2.params.StreamConfigurationDuration[]>("android.heic.availableHeicStallDurations", android.hardware.camera2.params.StreamConfigurationDuration[].class);

		/*~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~
		* End generated code
		~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~O@/

core/java/android/hardware/camera2/CameraDevice.java

+12 −6

Original line number	Diff line number	Diff line
		@@ -356,12 +356,6 @@ public abstract class CameraDevice implements AutoCloseable {
		* </table><br>
		* </p>
		*
		* <p>MONOCHROME-capability ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES}
		* includes {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_MONOCHROME MONOCHROME}) devices
		* supporting {@link android.graphics.ImageFormat#Y8 Y8} support substituting {@code YUV}
		* streams with {@code Y8} in all guaranteed stream combinations for the device's hardware level
		* and capabilities.</p>
		*
		* <p>FULL-level ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL}
		* {@code == }{@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_FULL FULL}) devices
		* support at least the following stream combinations in addition to those for
		@@ -435,6 +429,18 @@ public abstract class CameraDevice implements AutoCloseable {
		* </table><br>
		* </p>
		*
		* <p>MONOCHROME-capability ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES}
		* includes {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_MONOCHROME MONOCHROME}) devices
		* supporting {@link android.graphics.ImageFormat#Y8 Y8} support substituting {@code YUV}
		* streams with {@code Y8} in all guaranteed stream combinations for the device's hardware level
		* and capabilities.</p>
		*
		* <p>Devices capable of outputting HEIC formats ({@link StreamConfigurationMap#getOutputFormats}
		* contains {@link android.graphics.ImageFormat#HEIC}) will support substituting {@code JPEG}
		* streams with {@code HEIC} in all guaranteed stream combinations for the device's hardware
		* level and capabilities. Calling createCaptureSession with both JPEG and HEIC outputs is not
		* supported.</p>
		*
		* <p>Clients can access the above mandatory stream combination tables via
		* {@link android.hardware.camera2.params.MandatoryStreamCombination}.</p>
		*

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

+15 −1

Original line number	Diff line number	Diff line
		@@ -2126,6 +2126,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		* <p>Setting a location object in a request will include the GPS coordinates of the location
		* into any JPEG images captured based on the request. These coordinates can then be
		* viewed by anyone who receives the JPEG image.</p>
		* <p>This tag is also used for HEIC image capture.</p>
		* <p>This key is available on all devices.</p>
		*/
		@PublicKey
		@@ -2136,6 +2137,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		/**
		* <p>GPS coordinates to include in output JPEG
		* EXIF.</p>
		* <p>This tag is also used for HEIC image capture.</p>
		* <p><b>Range of valid values:</b><br>
		* (-180 - 180], [-90,90], [-inf, inf]</p>
		* <p>This key is available on all devices.</p>
		@@ -2147,6 +2149,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		/**
		* <p>32 characters describing GPS algorithm to
		* include in EXIF.</p>
		* <p>This tag is also used for HEIC image capture.</p>
		* <p>This key is available on all devices.</p>
		* @hide
		*/
		@@ -2156,6 +2159,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		/**
		* <p>Time GPS fix was made to include in
		* EXIF.</p>
		* <p>This tag is also used for HEIC image capture.</p>
		* <p><b>Units</b>: UTC in seconds since January 1, 1970</p>
		* <p>This key is available on all devices.</p>
		* @hide
		@@ -2195,6 +2199,10 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		* </code></pre>
		* <p>For EXTERNAL cameras the sensor orientation will always be set to 0 and the facing will
		* also be set to EXTERNAL. The above code is not relevant in such case.</p>
		* <p>This tag is also used to describe the orientation of the HEIC image capture, in which
		* case the rotation is reflected by
		* {@link android.media.ExifInterface#TAG_ORIENTATION EXIF orientation flag}, and not by
		* rotating the image data itself.</p>
		* <p><b>Units</b>: Degrees in multiples of 90</p>
		* <p><b>Range of valid values:</b><br>
		* 0, 90, 180, 270</p>
		@@ -2209,7 +2217,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		/**
		* <p>Compression quality of the final JPEG
		* image.</p>
		* <p>85-95 is typical usage range.</p>
		* <p>85-95 is typical usage range. This tag is also used to describe the quality
		* of the HEIC image capture.</p>
		* <p><b>Range of valid values:</b><br>
		* 1-100; larger is higher quality</p>
		* <p>This key is available on all devices.</p>
		@@ -2221,6 +2230,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		/**
		* <p>Compression quality of JPEG
		* thumbnail.</p>
		* <p>This tag is also used to describe the quality of the HEIC image capture.</p>
		* <p><b>Range of valid values:</b><br>
		* 1-100; larger is higher quality</p>
		* <p>This key is available on all devices.</p>
		@@ -2253,6 +2263,10 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		* orientation is requested. LEGACY device will always report unrotated thumbnail
		* size.</li>
		* </ul>
		* <p>The tag is also used as thumbnail size for HEIC image format capture, in which case the
		* the thumbnail rotation is reflected by
		* {@link android.media.ExifInterface#TAG_ORIENTATION EXIF orientation flag}, and not by
		* rotating the thumbnail data itself.</p>
		* <p><b>Range of valid values:</b><br>
		* {@link CameraCharacteristics#JPEG_AVAILABLE_THUMBNAIL_SIZES android.jpeg.availableThumbnailSizes}</p>
		* <p>This key is available on all devices.</p>

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

+15 −1

Original line number	Diff line number	Diff line
		@@ -2450,6 +2450,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		* <p>Setting a location object in a request will include the GPS coordinates of the location
		* into any JPEG images captured based on the request. These coordinates can then be
		* viewed by anyone who receives the JPEG image.</p>
		* <p>This tag is also used for HEIC image capture.</p>
		* <p>This key is available on all devices.</p>
		*/
		@PublicKey
		@@ -2460,6 +2461,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		/**
		* <p>GPS coordinates to include in output JPEG
		* EXIF.</p>
		* <p>This tag is also used for HEIC image capture.</p>
		* <p><b>Range of valid values:</b><br>
		* (-180 - 180], [-90,90], [-inf, inf]</p>
		* <p>This key is available on all devices.</p>
		@@ -2471,6 +2473,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		/**
		* <p>32 characters describing GPS algorithm to
		* include in EXIF.</p>
		* <p>This tag is also used for HEIC image capture.</p>
		* <p>This key is available on all devices.</p>
		* @hide
		*/
		@@ -2480,6 +2483,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		/**
		* <p>Time GPS fix was made to include in
		* EXIF.</p>
		* <p>This tag is also used for HEIC image capture.</p>
		* <p><b>Units</b>: UTC in seconds since January 1, 1970</p>
		* <p>This key is available on all devices.</p>
		* @hide
		@@ -2519,6 +2523,10 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		* </code></pre>
		* <p>For EXTERNAL cameras the sensor orientation will always be set to 0 and the facing will
		* also be set to EXTERNAL. The above code is not relevant in such case.</p>
		* <p>This tag is also used to describe the orientation of the HEIC image capture, in which
		* case the rotation is reflected by
		* {@link android.media.ExifInterface#TAG_ORIENTATION EXIF orientation flag}, and not by
		* rotating the image data itself.</p>
		* <p><b>Units</b>: Degrees in multiples of 90</p>
		* <p><b>Range of valid values:</b><br>
		* 0, 90, 180, 270</p>
		@@ -2533,7 +2541,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		/**
		* <p>Compression quality of the final JPEG
		* image.</p>
		* <p>85-95 is typical usage range.</p>
		* <p>85-95 is typical usage range. This tag is also used to describe the quality
		* of the HEIC image capture.</p>
		* <p><b>Range of valid values:</b><br>
		* 1-100; larger is higher quality</p>
		* <p>This key is available on all devices.</p>
		@@ -2545,6 +2554,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		/**
		* <p>Compression quality of JPEG
		* thumbnail.</p>
		* <p>This tag is also used to describe the quality of the HEIC image capture.</p>
		* <p><b>Range of valid values:</b><br>
		* 1-100; larger is higher quality</p>
		* <p>This key is available on all devices.</p>
		@@ -2577,6 +2587,10 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		* orientation is requested. LEGACY device will always report unrotated thumbnail
		* size.</li>
		* </ul>
		* <p>The tag is also used as thumbnail size for HEIC image format capture, in which case the
		* the thumbnail rotation is reflected by
		* {@link android.media.ExifInterface#TAG_ORIENTATION EXIF orientation flag}, and not by
		* rotating the thumbnail data itself.</p>
		* <p><b>Range of valid values:</b><br>
		* {@link CameraCharacteristics#JPEG_AVAILABLE_THUMBNAIL_SIZES android.jpeg.availableThumbnailSizes}</p>
		* <p>This key is available on all devices.</p>