From f59521d3b182de217b12e6d4ea31bd32e2418564 Mon Sep 17 00:00:00 2001
From: Ruben Brunk List of areas to use for
- * metering
Each area is a rectangle plus weight: xmin, ymin, - * xmax, ymax, weight. The rectangle is defined inclusive of the + * xmax, ymax, weight. The rectangle is defined to be inclusive of the * specified coordinates.
*The coordinate system is based on the active pixel array, * with (0,0) being the top-left pixel in the active pixel array, and @@ -524,7 +524,7 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { * needs to be used by the HAL. If the metering region is * outside the current {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}, the HAL * should ignore the sections outside the region and output the - * used sections in the frame metadata
+ * used sections in the frame metadata. * * @see CaptureRequest#SCALER_CROP_REGION * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE @@ -582,9 +582,9 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { /** *List of areas to use for focus - * estimation
+ * estimation. *Each area is a rectangle plus weight: xmin, ymin, - * xmax, ymax, weight. The rectangle is defined inclusive of the + * xmax, ymax, weight. The rectangle is defined to be inclusive of the * specified coordinates.
*The coordinate system is based on the active pixel array, * with (0,0) being the top-left pixel in the active pixel array, and @@ -596,7 +596,7 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { * needs to be used by the HAL. If the focusing region is * outside the current {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}, the HAL * should ignore the sections outside the region and output the - * used sections in the frame metadata
+ * used sections in the frame metadata. * * @see CaptureRequest#SCALER_CROP_REGION * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE @@ -668,10 +668,10 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { /** *List of areas to use for illuminant - * estimation
+ * estimation. *Only used in AUTO mode.
*Each area is a rectangle plus weight: xmin, ymin, - * xmax, ymax, weight. The rectangle is defined inclusive of the + * xmax, ymax, weight. The rectangle is defined to be inclusive of the * specified coordinates.
*The coordinate system is based on the active pixel array, * with (0,0) being the top-left pixel in the active pixel array, and @@ -683,7 +683,7 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { * needs to be used by the HAL. If the metering region is * outside the current {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}, the HAL * should ignore the sections outside the region and output the - * used sections in the frame metadata
+ * used sections in the frame metadata. * * @see CaptureRequest#SCALER_CROP_REGION * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 0ded5bd..129230b 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -212,9 +212,9 @@ public final class CaptureResult extends CameraMetadata { /** *List of areas to use for - * metering
+ * metering. *Each area is a rectangle plus weight: xmin, ymin, - * xmax, ymax, weight. The rectangle is defined inclusive of the + * xmax, ymax, weight. The rectangle is defined to be inclusive of the * specified coordinates.
*The coordinate system is based on the active pixel array, * with (0,0) being the top-left pixel in the active pixel array, and @@ -226,7 +226,7 @@ public final class CaptureResult extends CameraMetadata { * needs to be used by the HAL. If the metering region is * outside the current {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}, the HAL * should ignore the sections outside the region and output the - * used sections in the frame metadata
+ * used sections in the frame metadata. * * @see CaptureRequest#SCALER_CROP_REGION * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE @@ -405,9 +405,9 @@ public final class CaptureResult extends CameraMetadata { /** *List of areas to use for focus - * estimation
+ * estimation. *Each area is a rectangle plus weight: xmin, ymin, - * xmax, ymax, weight. The rectangle is defined inclusive of the + * xmax, ymax, weight. The rectangle is defined to be inclusive of the * specified coordinates.
*The coordinate system is based on the active pixel array, * with (0,0) being the top-left pixel in the active pixel array, and @@ -419,7 +419,7 @@ public final class CaptureResult extends CameraMetadata { * needs to be used by the HAL. If the focusing region is * outside the current {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}, the HAL * should ignore the sections outside the region and output the - * used sections in the frame metadata
+ * used sections in the frame metadata. * * @see CaptureRequest#SCALER_CROP_REGION * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE @@ -794,10 +794,10 @@ public final class CaptureResult extends CameraMetadata { /** *List of areas to use for illuminant - * estimation
+ * estimation. *Only used in AUTO mode.
*Each area is a rectangle plus weight: xmin, ymin, - * xmax, ymax, weight. The rectangle is defined inclusive of the + * xmax, ymax, weight. The rectangle is defined to be inclusive of the * specified coordinates.
*The coordinate system is based on the active pixel array, * with (0,0) being the top-left pixel in the active pixel array, and @@ -809,7 +809,7 @@ public final class CaptureResult extends CameraMetadata { * needs to be used by the HAL. If the metering region is * outside the current {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}, the HAL * should ignore the sections outside the region and output the - * used sections in the frame metadata
+ * used sections in the frame metadata. * * @see CaptureRequest#SCALER_CROP_REGION * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE -- cgit v1.1