Merge "camera2: Fix links in SENSOR_PIXEL_MODE docs" into udc-dev (7a34be90) · Commits · e / os / android_frameworks_av

camera/ndk/include/camera/NdkCameraMetadataTags.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -5384,7 +5384,7 @@ typedef enum acamera_metadata_tag {
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_DEFAULT">CameraMetadata#SENSOR_PIXEL_MODE_DEFAULT</a> mode.
		* They can be queried through
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#get">CameraCharacteristics#get</a> with
		* <a href="https://developer.android.com/reference/CameraCharacteristics.html#SCALER_STREAM_CONFIGURATION_MAP_MAXIMUM_RESOLUTION)">CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP_MAXIMUM_RESOLUTION)</a>.
		* <a href="https://developer.android.com/reference/CameraCharacteristics.html#SCALER_STREAM_CONFIGURATION_MAP_MAXIMUM_RESOLUTION">CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP_MAXIMUM_RESOLUTION</a>.
		* Unless reported by both
		* <a href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap.html">StreamConfigurationMap</a>s, the outputs from
		* <code>android.scaler.streamConfigurationMapMaximumResolution</code> and
		@@ -5399,13 +5399,12 @@ typedef enum acamera_metadata_tag {
		* <ul>
		* <li>
		* <p>The mandatory stream combinations listed in
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics/mandatoryMaximumResolutionStreamCombinations.html">mandatoryMaximumResolutionStreamCombinations</a>
		* would not apply.</p>
		* android.scaler.mandatoryMaximumResolutionStreamCombinations would not apply.</p>
		* </li>
		* <li>
		* <p>The bayer pattern of {@code RAW} streams when
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION">CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION</a>
		* is selected will be the one listed in <a href="https://developer.android.com/reference/android/sensor/info/binningFactor.html">binningFactor</a>.</p>
		* is selected will be the one listed in ACAMERA_SENSOR_INFO_BINNING_FACTOR.</p>
		* </li>
		* <li>
		* <p>The following keys will always be present:</p>
		@@ -5419,6 +5418,7 @@ typedef enum acamera_metadata_tag {
		* </ul>
		*
		* @see ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION
		* @see ACAMERA_SENSOR_INFO_BINNING_FACTOR
		* @see ACAMERA_SENSOR_INFO_PIXEL_ARRAY_SIZE_MAXIMUM_RESOLUTION
		* @see ACAMERA_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION
		*/