From 82c7742f2e36f49f139245c3c96fefb14d1a6559 Mon Sep 17 00:00:00 2001
From: Shuzhen Wang Refer to {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} and
- * {@link android.hardware.camera2.CameraDevice#legacy-level-guaranteed-configurations }
+ * the table
* for additional mandatory stream configurations on a per-capability basis. *1: For JPEG format, the sizes may be restricted by below conditions:
@@ -3322,11 +3322,12 @@ public final class CameraCharacteristics extends CameraMetadata
The array of
* {@link android.hardware.camera2.params.MandatoryStreamCombination combinations} is
* generated according to the documented
- * {@link android.hardware.camera2.CameraDevice#legacy-level-guaranteed-configurations guideline} based on specific device level and capabilities.
+ * guideline.
+ * based on specific device level and capabilities.
* Clients can use the array as a quick reference to find an appropriate camera stream
* combination.
* As per documentation, the stream combinations with given PREVIEW, RECORD and
@@ -3355,11 +3356,12 @@ public final class CameraCharacteristics extends CameraMetadata
The array of
* {@link android.hardware.camera2.params.MandatoryStreamCombination combinations} is
* generated according to the documented
- * {@link android.hardware.camera2.CameraDevice#concurrent-stream-guaranteed-configurations guideline} for each device which has its Id present in the set returned by
+ * guideline
+ * for each device which has its Id present in the set returned by
* {@link android.hardware.camera2.CameraManager#getConcurrentCameraIds }.
* Clients can use the array as a quick reference to find an appropriate camera stream
* combination.
@@ -3464,7 +3466,7 @@ public final class CameraCharacteristics extends CameraMetadata
To use multi-resolution input streams, the supported formats can be queried by {@link android.hardware.camera2.params.MultiResolutionStreamConfigurationMap#getInputFormats }.
* A reprocessable CameraCaptureSession can then be created using an {@link android.hardware.camera2.params.InputConfiguration InputConfiguration} constructed with
@@ -3473,7 +3475,7 @@ public final class CameraCharacteristics extends CameraMetadata
Optional - The value for this key may be {@code null} on some devices.
*/ @@ -3586,11 +3588,12 @@ public final class CameraCharacteristics extends CameraMetadataThe array of
* {@link android.hardware.camera2.params.MandatoryStreamCombination combinations} is
* generated according to the documented
- * {@link android.hardware.camera2.CameraDevice#additional-guaranteed-combinations-for-ultra-high-resolution-sensors guideline} for each device which has the
+ * guideline
+ * for each device which has the
* {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR }
* capability.
* Clients can use the array as a quick reference to find an appropriate camera stream
@@ -3613,11 +3616,12 @@ public final class CameraCharacteristics extends CameraMetadata
The array of
* {@link android.hardware.camera2.params.MandatoryStreamCombination combinations} is
* generated according to the documented
- * {@link android.hardware.camera2.CameraDevice#10-bit-output-additional-guaranteed-configurations guideline} for each device which has the
+ * guideline
+ * for each device which has the
* {@link android.hardware.camera2.CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT }
* capability.
* Clients can use the array as a quick reference to find an appropriate camera stream
@@ -3638,11 +3642,12 @@ public final class CameraCharacteristics extends CameraMetadata
The array of
* {@link android.hardware.camera2.params.MandatoryStreamCombination combinations} is
* generated according to the documented
- * {@link android.hardware.camera2.CameraDevice#preview-stabilization-guaranteed-stream-configurations guideline} for each device which supports {@code PREVIEW_STABILIZATION}
+ * guideline
+ * for each device which supports {@code PREVIEW_STABILIZATION}
* Clients can use the array as a quick reference to find an appropriate camera stream
* combination.
* The mandatory stream combination array will be {@code null} in case the device does not
@@ -3715,8 +3720,8 @@ public final class CameraCharacteristics extends CameraMetadata
The array of
* {@link android.hardware.camera2.params.MandatoryStreamCombination combinations} is
* generated according to the documented
- * {@link android.hardware.camera2.CameraDevice#stream-use-case-capability-additional-guaranteed-configurations guideline} for a camera device with
+ * guildeline
+ * for a camera device with
* {@link android.hardware.camera2.CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE }
* capability.
* The mandatory stream combination array will be {@code null} in case the device doesn't
diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java
index dfc27caa362c..a34248885cc9 100644
--- a/core/java/android/hardware/camera2/CameraMetadata.java
+++ b/core/java/android/hardware/camera2/CameraMetadata.java
@@ -1213,8 +1213,7 @@ public abstract class CameraMetadata {@link android.hardware.camera2.CameraCharacteristics#SCALER_AVAILABLE_STREAM_USE_CASES }
* lists all of the supported stream use cases. Refer to
- * {@link android.hardware.camera2.CameraDevice#stream-use-case-capability-additional-guaranteed-configurations }
+ * Refer to the
+ * guideline
* for the mandatory stream combinations involving stream use cases, which can also be
* queried via {@link android.hardware.camera2.params.MandatoryStreamCombination }. This camera device does not have enough capabilities to qualify as a Only the stream configurations listed in the Only the stream configurations listed in the All This camera device is capable of supporting advanced imaging applications. The stream configurations listed in the The stream configurations listed in the A This camera device is running in backward compatibility mode. Only the stream configurations listed in the Only the stream configurations listed in the A This camera device is capable of YUV reprocessing and RAW data capture, in addition to
* FULL-level capabilities. The stream configurations listed in the The following additional capabilities are guaranteed to be supported:
*
* FULL device or
* better.LEGACY and LIMITED tables in the
- * {@link android.hardware.camera2.CameraDevice#limited-level-additional-guaranteed-configurations }
- * documentation are guaranteed to be supported.LEGACY and LIMITED
+ * tables
+ * in the documentation are guaranteed to be supported.LIMITED devices support the BACKWARDS_COMPATIBLE capability, indicating basic
* support for color image capture. The only exception is that the device may
* alternatively support only the DEPTH_OUTPUT capability, if it can only output depth
@@ -1781,9 +1780,9 @@ public abstract class CameraMetadataFULL, LEGACY and LIMITED tables in the
- * {@link android.hardware.camera2.CameraDevice#full-level-additional-guaranteed-configurations }
- * documentation are guaranteed to be supported.FULL, LEGACY and LIMITED
+ * tables
+ * in the documentation are guaranteed to be supported.FULL device will support below capabilities:
*
BURST_CAPTURE capability ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} contains
@@ -1811,9 +1810,9 @@ public abstract class CameraMetadataLEGACY table in the
- * {@link android.hardware.camera2.CameraDevice#legacy-level-guaranteed-configurations }
- * documentation are supported.LEGACY
+ * table
+ * in the documentation are supported.LEGACY device does not support per-frame control, manual sensor control, manual
* post-processing, arbitrary cropping regions, and has relaxed performance constraints.
* No additional capabilities beyond BACKWARD_COMPATIBLE will ever be listed by a
@@ -1836,9 +1835,9 @@ public abstract class CameraMetadataLEVEL_3, RAW, FULL, LEGACY and
- * LIMITED tables in the
- * {@link android.hardware.camera2.CameraDevice#level-3-additional-guaranteed-configurations }
- * documentation are guaranteed to be supported.LIMITED
+ * tables
+ * in the documentation are guaranteed to be supported.
*
YUV_REPROCESSING capability ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} contains
--
cgit v1.2.3-59-g8ed1b