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

Commit 48bd2376 authored by Timothy Knight's avatar Timothy Knight Committed by Android Git Automerger
Browse files

am 73b0bdf1: am 2629f273: Camera2: Clarified docs for 3A regions. 

* commit '73b0bdf1':
  Camera2: Clarified docs for 3A regions.
parents 953da2b1 73b0bdf1

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

+21 −16
Original line number Diff line number Diff line
@@ -303,13 +303,14 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 
     * </p>

     * <p>

     * Each area is a rectangle plus weight: xmin, ymin,

     * xmax, ymax, weight.

     * xmax, ymax, weight. The rectangle is defined inclusive of the

     * specified coordinates.

     * </p><p>

     * The coordinate system is based on the active pixel array,

     * with (0,0) being the top-left of the active pixel array, and

     * (android.sensor.info.activeArraySize.width,

     * android.sensor.info.activeArraySize.height) being the

     * bottom-right point of the active pixel array. The weight

     * with (0,0) being the top-left pixel in the active pixel array, and

     * (android.sensor.info.activeArraySize.width - 1,

     * android.sensor.info.activeArraySize.height - 1) being the

     * bottom-right pixel in the active pixel array. The weight

     * should be nonnegative.

     * </p><p>

     * If all regions have 0 weight, then no specific metering area
@@ -378,13 +379,14 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 
     * </p>

     * <p>

     * Each area is a rectangle plus weight: xmin, ymin,

     * xmax, ymax, weight.

     * xmax, ymax, weight. The rectangle is defined inclusive of the

     * specified coordinates.

     * </p><p>

     * The coordinate system is based on the active pixel array,

     * with (0,0) being the top-left of the active pixel array, and

     * (android.sensor.info.activeArraySize.width,

     * android.sensor.info.activeArraySize.height) being the

     * bottom-right point of the active pixel array. The weight

     * with (0,0) being the top-left pixel in the active pixel array, and

     * (android.sensor.info.activeArraySize.width - 1,

     * android.sensor.info.activeArraySize.height - 1) being the

     * bottom-right pixel in the active pixel array. The weight

     * should be nonnegative.

     * </p><p>

     * If all regions have 0 weight, then no specific focus area
@@ -462,12 +464,15 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 
     * <p>

     * Only used in AUTO mode.

     * </p><p>

     * Each area is a rectangle plus weight: xmin, ymin, xmax,

     * ymax, weight. The coordinate system is based on the active

     * pixel array, with (0,0) being the top-left of the active

     * pixel array, and (android.sensor.info.activeArraySize.width,

     * android.sensor.info.activeArraySize.height) being the

     * bottom-right point of the active pixel array. The weight

     * Each area is a rectangle plus weight: xmin, ymin,

     * xmax, ymax, weight. The rectangle is defined inclusive of the

     * specified coordinates.

     * </p><p>

     * The coordinate system is based on the active pixel array,

     * with (0,0) being the top-left pixel in the active pixel array, and

     * (android.sensor.info.activeArraySize.width - 1,

     * android.sensor.info.activeArraySize.height - 1) being the

     * bottom-right pixel in the active pixel array. The weight

     * should be nonnegative.

     * </p><p>

     * If all regions have 0 weight, then no specific metering area

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

+21 −16
Original line number Diff line number Diff line
@@ -198,13 +198,14 @@ public final class CaptureResult extends CameraMetadata { 
     * </p>

     * <p>

     * Each area is a rectangle plus weight: xmin, ymin,

     * xmax, ymax, weight.

     * xmax, ymax, weight. The rectangle is defined inclusive of the

     * specified coordinates.

     * </p><p>

     * The coordinate system is based on the active pixel array,

     * with (0,0) being the top-left of the active pixel array, and

     * (android.sensor.info.activeArraySize.width,

     * android.sensor.info.activeArraySize.height) being the

     * bottom-right point of the active pixel array. The weight

     * with (0,0) being the top-left pixel in the active pixel array, and

     * (android.sensor.info.activeArraySize.width - 1,

     * android.sensor.info.activeArraySize.height - 1) being the

     * bottom-right pixel in the active pixel array. The weight

     * should be nonnegative.

     * </p><p>

     * If all regions have 0 weight, then no specific metering area
@@ -258,13 +259,14 @@ public final class CaptureResult extends CameraMetadata { 
     * </p>

     * <p>

     * Each area is a rectangle plus weight: xmin, ymin,

     * xmax, ymax, weight.

     * xmax, ymax, weight. The rectangle is defined inclusive of the

     * specified coordinates.

     * </p><p>

     * The coordinate system is based on the active pixel array,

     * with (0,0) being the top-left of the active pixel array, and

     * (android.sensor.info.activeArraySize.width,

     * android.sensor.info.activeArraySize.height) being the

     * bottom-right point of the active pixel array. The weight

     * with (0,0) being the top-left pixel in the active pixel array, and

     * (android.sensor.info.activeArraySize.width - 1,

     * android.sensor.info.activeArraySize.height - 1) being the

     * bottom-right pixel in the active pixel array. The weight

     * should be nonnegative.

     * </p><p>

     * If all regions have 0 weight, then no specific focus area
@@ -342,12 +344,15 @@ public final class CaptureResult extends CameraMetadata { 
     * <p>

     * Only used in AUTO mode.

     * </p><p>

     * Each area is a rectangle plus weight: xmin, ymin, xmax,

     * ymax, weight. The coordinate system is based on the active

     * pixel array, with (0,0) being the top-left of the active

     * pixel array, and (android.sensor.info.activeArraySize.width,

     * android.sensor.info.activeArraySize.height) being the

     * bottom-right point of the active pixel array. The weight

     * Each area is a rectangle plus weight: xmin, ymin,

     * xmax, ymax, weight. The rectangle is defined inclusive of the

     * specified coordinates.

     * </p><p>

     * The coordinate system is based on the active pixel array,

     * with (0,0) being the top-left pixel in the active pixel array, and

     * (android.sensor.info.activeArraySize.width - 1,

     * android.sensor.info.activeArraySize.height - 1) being the

     * bottom-right pixel in the active pixel array. The weight

     * should be nonnegative.

     * </p><p>

     * If all regions have 0 weight, then no specific metering area