Snap for 10353861 from 4d6d9fb4f2252681dd05ab44460f6aead91e70a1 to udc-release (5f3b6aa6) · Commits · e / os / android_frameworks_av

camera/ndk/include/camera/NdkCameraMetadataTags.h

+16 −9

Original line number	Original line	Diff line number	Diff line
	@@ -4487,8 +4487,8 @@ typedef enum acamera_metadata_tag {
	* <p>The guaranteed stream combinations related to stream use case for a camera device with		* <p>The guaranteed stream combinations related to stream use case for a camera device with
	* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE">CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE</a>		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE">CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE</a>
	* capability is documented in the camera device		* capability is documented in the camera device
	* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#createCaptureSession">guideline</a>. The		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#stream-use-case-capability-additional-guaranteed-configurations">guideline</a>. The application is strongly recommended to use one of the guaranteed stream
	* application is strongly recommended to use one of the guaranteed stream combinations.		* combinations.
	* If the application creates a session with a stream combination not in the guaranteed		* If the application creates a session with a stream combination not in the guaranteed
	* list, or with mixed DEFAULT and non-DEFAULT use cases within the same session,		* list, or with mixed DEFAULT and non-DEFAULT use cases within the same session,
	* the camera device may ignore some stream use cases due to hardware constraints		* the camera device may ignore some stream use cases due to hardware constraints
	@@ -9866,9 +9866,10 @@ typedef enum acamera_metadata_enum_acamera_request_available_capabilities {
	* </ul>		* </ul>
	* <p><a href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#SCALER_AVAILABLE_STREAM_USE_CASES">CameraCharacteristics#SCALER_AVAILABLE_STREAM_USE_CASES</a>		* <p><a href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#SCALER_AVAILABLE_STREAM_USE_CASES">CameraCharacteristics#SCALER_AVAILABLE_STREAM_USE_CASES</a>
	* lists all of the supported stream use cases.</p>		* lists all of the supported stream use cases.</p>
	* <p>Refer to <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#createCaptureSession">CameraDevice#createCaptureSession</a> for the		* <p>Refer to
	* mandatory stream combinations involving stream use cases, which can also be queried		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#stream-use-case-capability-additional-guaranteed-configurations">CameraDevice#stream-use-case-capability-additional-guaranteed-configurations</a>
	* via <a href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.html">MandatoryStreamCombination</a>.</p>		* for the mandatory stream combinations involving stream use cases, which can also be
			* queried via <a href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.html">MandatoryStreamCombination</a>.</p>
	*/		*/
	ACAMERA_REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE = 19,		ACAMERA_REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE = 19,

	@@ -10728,7 +10729,8 @@ typedef enum acamera_metadata_enum_acamera_info_supported_hardware_level {
	* <p>This camera device does not have enough capabilities to qualify as a <code>FULL</code> device or		* <p>This camera device does not have enough capabilities to qualify as a <code>FULL</code> device or
	* better.</p>		* better.</p>
	* <p>Only the stream configurations listed in the <code>LEGACY</code> and <code>LIMITED</code> tables in the		* <p>Only the stream configurations listed in the <code>LEGACY</code> and <code>LIMITED</code> tables in the
	* {@link ACameraDevice_createCaptureSession createCaptureSession} documentation are guaranteed to be supported.</p>		* {@link ACameraDevice_createCaptureSession }
			* documentation are guaranteed to be supported.</p>
	* <p>All <code>LIMITED</code> devices support the <code>BACKWARDS_COMPATIBLE</code> capability, indicating basic		* <p>All <code>LIMITED</code> devices support the <code>BACKWARDS_COMPATIBLE</code> capability, indicating basic
	* support for color image capture. The only exception is that the device may		* support for color image capture. The only exception is that the device may
	* alternatively support only the <code>DEPTH_OUTPUT</code> capability, if it can only output depth		* alternatively support only the <code>DEPTH_OUTPUT</code> capability, if it can only output depth
	@@ -10754,7 +10756,8 @@ typedef enum acamera_metadata_enum_acamera_info_supported_hardware_level {
	/**		/**
	* <p>This camera device is capable of supporting advanced imaging applications.</p>		* <p>This camera device is capable of supporting advanced imaging applications.</p>
	* <p>The stream configurations listed in the <code>FULL</code>, <code>LEGACY</code> and <code>LIMITED</code> tables in the		* <p>The stream configurations listed in the <code>FULL</code>, <code>LEGACY</code> and <code>LIMITED</code> tables in the
	* {@link ACameraDevice_createCaptureSession createCaptureSession} documentation are guaranteed to be supported.</p>		* {@link ACameraDevice_createCaptureSession }
			* documentation are guaranteed to be supported.</p>
	* <p>A <code>FULL</code> device will support below capabilities:</p>		* <p>A <code>FULL</code> device will support below capabilities:</p>
	* <ul>		* <ul>
	* <li><code>BURST_CAPTURE</code> capability (ACAMERA_REQUEST_AVAILABLE_CAPABILITIES contains		* <li><code>BURST_CAPTURE</code> capability (ACAMERA_REQUEST_AVAILABLE_CAPABILITIES contains
	@@ -10781,7 +10784,9 @@ typedef enum acamera_metadata_enum_acamera_info_supported_hardware_level {

	/**		/**
	* <p>This camera device is running in backward compatibility mode.</p>		* <p>This camera device is running in backward compatibility mode.</p>
	* <p>Only the stream configurations listed in the <code>LEGACY</code> table in the {@link ACameraDevice_createCaptureSession createCaptureSession} documentation are supported.</p>		* <p>Only the stream configurations listed in the <code>LEGACY</code> table in the
			* {@link ACameraDevice_createCaptureSession }
			* documentation are supported.</p>
	* <p>A <code>LEGACY</code> device does not support per-frame control, manual sensor control, manual		* <p>A <code>LEGACY</code> device does not support per-frame control, manual sensor control, manual
	* post-processing, arbitrary cropping regions, and has relaxed performance constraints.		* post-processing, arbitrary cropping regions, and has relaxed performance constraints.
	* No additional capabilities beyond <code>BACKWARD_COMPATIBLE</code> will ever be listed by a		* No additional capabilities beyond <code>BACKWARD_COMPATIBLE</code> will ever be listed by a
	@@ -10803,7 +10808,9 @@ typedef enum acamera_metadata_enum_acamera_info_supported_hardware_level {
	* <p>This camera device is capable of YUV reprocessing and RAW data capture, in addition to		* <p>This camera device is capable of YUV reprocessing and RAW data capture, in addition to
	* FULL-level capabilities.</p>		* FULL-level capabilities.</p>
	* <p>The stream configurations listed in the <code>LEVEL_3</code>, <code>RAW</code>, <code>FULL</code>, <code>LEGACY</code> and		* <p>The stream configurations listed in the <code>LEVEL_3</code>, <code>RAW</code>, <code>FULL</code>, <code>LEGACY</code> and
	* <code>LIMITED</code> tables in the {@link ACameraDevice_createCaptureSession createCaptureSession} documentation are guaranteed to be supported.</p>		* <code>LIMITED</code> tables in the
			* {@link ACameraDevice_createCaptureSession }
			* documentation are guaranteed to be supported.</p>
	* <p>The following additional capabilities are guaranteed to be supported:</p>		* <p>The following additional capabilities are guaranteed to be supported:</p>
	* <ul>		* <ul>
	* <li><code>YUV_REPROCESSING</code> capability (ACAMERA_REQUEST_AVAILABLE_CAPABILITIES contains		* <li><code>YUV_REPROCESSING</code> capability (ACAMERA_REQUEST_AVAILABLE_CAPABILITIES contains