Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera: Improve documentation for 3A regions" into tm-dev am: 7af7fcbeb0 am: 9d5ab9660b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17450512

Change-Id: I3442b9a003a61adaee812bce33323fc6685498cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-13 01:13:58 +00:00
committed by Automerger Merge Worker
parent 85cf4e7d6b 9d5ab9660b
commit e693b1bb1d
2 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/hardware/camera2/CaptureRequest.java
View File

@@ -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

24
core/java/android/hardware/camera2/CaptureResult.java
View File

@@ -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