Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7af7fcbe authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Improve documentation for 3A regions" into tm-dev

parents 082d5f3a 9393a69a

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

+24 −0
Original line number Diff line number Diff line
@@ -1387,6 +1387,14 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * region and output only the intersection rectangle as the metering region in the result

     * metadata.  If the region is entirely outside the crop region, it will be ignored and

     * not reported in the result metadata.</p>

     * <p>When setting the AE metering regions, the application must consider the additional

     * crop resulted from the aspect ratio differences between the preview stream and

     * {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}. For example, if the {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} is the full

     * active array size with 4:3 aspect ratio, and the preview stream is 16:9,

     * the boundary of AE regions will be [0, y_crop] and

     * [active_width, active_height - 2 * y_crop] rather than [0, 0] and

     * [active_width, active_height], where y_crop is the additional crop due to aspect ratio

     * mismatch.</p>

     * <p>Starting from API level 30, the coordinate system of activeArraySize or

     * preCorrectionActiveArraySize is used to represent post-zoomRatio field of view, not

     * pre-zoom field of view. This means that the same aeRegions values at different
@@ -1609,6 +1617,14 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * region and output only the intersection rectangle as the metering region in the result

     * metadata. If the region is entirely outside the crop region, it will be ignored and

     * not reported in the result metadata.</p>

     * <p>When setting the AF metering regions, the application must consider the additional

     * crop resulted from the aspect ratio differences between the preview stream and

     * {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}. For example, if the {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} is the full

     * active array size with 4:3 aspect ratio, and the preview stream is 16:9,

     * the boundary of AF regions will be [0, y_crop] and

     * [active_width, active_height - 2 * y_crop] rather than [0, 0] and

     * [active_width, active_height], where y_crop is the additional crop due to aspect ratio

     * mismatch.</p>

     * <p>Starting from API level 30, the coordinate system of activeArraySize or

     * preCorrectionActiveArraySize is used to represent post-zoomRatio field of view, not

     * pre-zoom field of view. This means that the same afRegions values at different
@@ -1823,6 +1839,14 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * region and output only the intersection rectangle as the metering region in the result

     * metadata.  If the region is entirely outside the crop region, it will be ignored and

     * not reported in the result metadata.</p>

     * <p>When setting the AWB metering regions, the application must consider the additional

     * crop resulted from the aspect ratio differences between the preview stream and

     * {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}. For example, if the {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} is the full

     * active array size with 4:3 aspect ratio, and the preview stream is 16:9,

     * the boundary of AWB regions will be [0, y_crop] and

     * [active_width, active_height - 2 * y_crop] rather than [0, 0] and

     * [active_width, active_height], where y_crop is the additional crop due to aspect ratio

     * mismatch.</p>

     * <p>Starting from API level 30, the coordinate system of activeArraySize or

     * preCorrectionActiveArraySize is used to represent post-zoomRatio field of view, not

     * pre-zoom field of view. This means that the same awbRegions values at different

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

+24 −0
Original line number Diff line number Diff line
@@ -829,6 +829,14 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * region and output only the intersection rectangle as the metering region in the result

     * metadata.  If the region is entirely outside the crop region, it will be ignored and

     * not reported in the result metadata.</p>

     * <p>When setting the AE metering regions, the application must consider the additional

     * crop resulted from the aspect ratio differences between the preview stream and

     * {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}. For example, if the {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} is the full

     * active array size with 4:3 aspect ratio, and the preview stream is 16:9,

     * the boundary of AE regions will be [0, y_crop] and

     * [active_width, active_height - 2 * y_crop] rather than [0, 0] and

     * [active_width, active_height], where y_crop is the additional crop due to aspect ratio

     * mismatch.</p>

     * <p>Starting from API level 30, the coordinate system of activeArraySize or

     * preCorrectionActiveArraySize is used to represent post-zoomRatio field of view, not

     * pre-zoom field of view. This means that the same aeRegions values at different
@@ -1301,6 +1309,14 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * region and output only the intersection rectangle as the metering region in the result

     * metadata. If the region is entirely outside the crop region, it will be ignored and

     * not reported in the result metadata.</p>

     * <p>When setting the AF metering regions, the application must consider the additional

     * crop resulted from the aspect ratio differences between the preview stream and

     * {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}. For example, if the {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} is the full

     * active array size with 4:3 aspect ratio, and the preview stream is 16:9,

     * the boundary of AF regions will be [0, y_crop] and

     * [active_width, active_height - 2 * y_crop] rather than [0, 0] and

     * [active_width, active_height], where y_crop is the additional crop due to aspect ratio

     * mismatch.</p>

     * <p>Starting from API level 30, the coordinate system of activeArraySize or

     * preCorrectionActiveArraySize is used to represent post-zoomRatio field of view, not

     * pre-zoom field of view. This means that the same afRegions values at different
@@ -1926,6 +1942,14 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * region and output only the intersection rectangle as the metering region in the result

     * metadata.  If the region is entirely outside the crop region, it will be ignored and

     * not reported in the result metadata.</p>

     * <p>When setting the AWB metering regions, the application must consider the additional

     * crop resulted from the aspect ratio differences between the preview stream and

     * {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}. For example, if the {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} is the full

     * active array size with 4:3 aspect ratio, and the preview stream is 16:9,

     * the boundary of AWB regions will be [0, y_crop] and

     * [active_width, active_height - 2 * y_crop] rather than [0, 0] and

     * [active_width, active_height], where y_crop is the additional crop due to aspect ratio

     * mismatch.</p>

     * <p>Starting from API level 30, the coordinate system of activeArraySize or

     * preCorrectionActiveArraySize is used to represent post-zoomRatio field of view, not

     * pre-zoom field of view. This means that the same awbRegions values at different