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

Commit 915f5041 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

Camera2: Deprecate LENS_RADIAL_DISTORTION, add LENS_DISTORTION 

LENS_RADIAL_DISTORTION is inconsistently defined: in some places, it
is documented to operate on the range [-1...1], and in others, on a
range dependent on the camera lens's intrinsic calibration and focal
length.

Since fixing just the definition will not fix any existing devices
that define this value, deprecate the old key and add a new consistent
one to make sure applications only reference the consistent
definition.

Test: Adjusted camera CTS passes
Bug: 74641761
Change-Id: Ica7bcd0bc54baa0bdb1d388c4947431556643393
parent 9e56800b

api/current.txt

+4 −2
Original line number Diff line number Diff line
@@ -15793,6 +15793,7 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> INFO_SUPPORTED_HARDWARE_LEVEL;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.String> INFO_VERSION;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Size[]> JPEG_AVAILABLE_THUMBNAIL_SIZES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_DISTORTION;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> LENS_FACING;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_INFO_AVAILABLE_APERTURES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_INFO_AVAILABLE_FILTER_DENSITIES;
@@ -15805,7 +15806,7 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> LENS_POSE_REFERENCE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_POSE_ROTATION;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_POSE_TRANSLATION;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_RADIAL_DISTORTION;

    field public static final deprecated android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_RADIAL_DISTORTION;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REPROCESS_MAX_CAPTURE_STALL;
@@ -16263,6 +16264,7 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Byte> JPEG_THUMBNAIL_QUALITY;

    field public static final android.hardware.camera2.CaptureResult.Key<android.util.Size> JPEG_THUMBNAIL_SIZE;

    field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> LENS_APERTURE;

    field public static final android.hardware.camera2.CaptureResult.Key<float[]> LENS_DISTORTION;

    field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> LENS_FILTER_DENSITY;

    field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> LENS_FOCAL_LENGTH;

    field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> LENS_FOCUS_DISTANCE;
@@ -16271,7 +16273,7 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> LENS_OPTICAL_STABILIZATION_MODE;

    field public static final android.hardware.camera2.CaptureResult.Key<float[]> LENS_POSE_ROTATION;

    field public static final android.hardware.camera2.CaptureResult.Key<float[]> LENS_POSE_TRANSLATION;

    field public static final android.hardware.camera2.CaptureResult.Key<float[]> LENS_RADIAL_DISTORTION;

    field public static final deprecated android.hardware.camera2.CaptureResult.Key<float[]> LENS_RADIAL_DISTORTION;

    field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> LENS_STATE;

    field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> NOISE_REDUCTION_MODE;

    field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> REPROCESS_EFFECTIVE_EXPOSURE_FACTOR;

core/java/android/hardware/camera2/CameraCharacteristics.java

+65 −6
Original line number Diff line number Diff line
@@ -1243,7 +1243,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * from the main sensor along the +X axis (to the right from the user's perspective) will

     * report <code>(0.03, 0, 0)</code>.</p>

     * <p>To transform a pixel coordinates between two cameras facing the same direction, first

     * the source camera {@link CameraCharacteristics#LENS_RADIAL_DISTORTION android.lens.radialDistortion} must be corrected for.  Then the source

     * the source camera {@link CameraCharacteristics#LENS_DISTORTION android.lens.distortion} must be corrected for.  Then the source

     * camera {@link CameraCharacteristics#LENS_INTRINSIC_CALIBRATION android.lens.intrinsicCalibration} needs to be applied, followed by the

     * {@link CameraCharacteristics#LENS_POSE_ROTATION android.lens.poseRotation} of the source camera, the translation of the source camera

     * relative to the destination camera, the {@link CameraCharacteristics#LENS_POSE_ROTATION android.lens.poseRotation} of the destination
@@ -1257,10 +1257,10 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <p><b>Units</b>: Meters</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     *

     * @see CameraCharacteristics#LENS_DISTORTION

     * @see CameraCharacteristics#LENS_INTRINSIC_CALIBRATION

     * @see CameraCharacteristics#LENS_POSE_REFERENCE

     * @see CameraCharacteristics#LENS_POSE_ROTATION

     * @see CameraCharacteristics#LENS_RADIAL_DISTORTION

     */

    @PublicKey

    public static final Key<float[]> LENS_POSE_TRANSLATION =
@@ -1306,7 +1306,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * where <code>(0,0)</code> is the top-left of the

     * preCorrectionActiveArraySize rectangle. Once the pose and

     * intrinsic calibration transforms have been applied to a

     * world point, then the {@link CameraCharacteristics#LENS_RADIAL_DISTORTION android.lens.radialDistortion}

     * world point, then the {@link CameraCharacteristics#LENS_DISTORTION android.lens.distortion}

     * transform needs to be applied, and the result adjusted to

     * be in the {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} coordinate

     * system (where <code>(0, 0)</code> is the top-left of the
@@ -1319,9 +1319,9 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * coordinate system.</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     *

     * @see CameraCharacteristics#LENS_DISTORTION

     * @see CameraCharacteristics#LENS_POSE_ROTATION

     * @see CameraCharacteristics#LENS_POSE_TRANSLATION

     * @see CameraCharacteristics#LENS_RADIAL_DISTORTION

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE

     */
@@ -1363,7 +1363,14 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     *

     * @see CameraCharacteristics#LENS_INTRINSIC_CALIBRATION

     * @deprecated

     * <p>This field was inconsistently defined in terms of its

     * normalization. Use {@link CameraCharacteristics#LENS_DISTORTION android.lens.distortion} instead.</p>

     *

     * @see CameraCharacteristics#LENS_DISTORTION



     */

    @Deprecated

    @PublicKey

    public static final Key<float[]> LENS_RADIAL_DISTORTION =

            new Key<float[]>("android.lens.radialDistortion", float[].class);
@@ -1387,6 +1394,46 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
    public static final Key<Integer> LENS_POSE_REFERENCE =

            new Key<Integer>("android.lens.poseReference", int.class);



    /**

     * <p>The correction coefficients to correct for this camera device's

     * radial and tangential lens distortion.</p>

     * <p>Replaces the deprecated {@link CameraCharacteristics#LENS_RADIAL_DISTORTION android.lens.radialDistortion} field, which was

     * inconsistently defined.</p>

     * <p>Three radial distortion coefficients <code>[kappa_1, kappa_2,

     * kappa_3]</code> and two tangential distortion coefficients

     * <code>[kappa_4, kappa_5]</code> that can be used to correct the

     * lens's geometric distortion with the mapping equations:</p>

     * <pre><code> x_c = x_i * ( 1 + kappa_1 * r^2 + kappa_2 * r^4 + kappa_3 * r^6 ) +

     *        kappa_4 * (2 * x_i * y_i) + kappa_5 * ( r^2 + 2 * x_i^2 )

     *  y_c = y_i * ( 1 + kappa_1 * r^2 + kappa_2 * r^4 + kappa_3 * r^6 ) +

     *        kappa_5 * (2 * x_i * y_i) + kappa_4 * ( r^2 + 2 * y_i^2 )

     * </code></pre>

     * <p>Here, <code>[x_c, y_c]</code> are the coordinates to sample in the

     * input image that correspond to the pixel values in the

     * corrected image at the coordinate <code>[x_i, y_i]</code>:</p>

     * <pre><code> correctedImage(x_i, y_i) = sample_at(x_c, y_c, inputImage)

     * </code></pre>

     * <p>The pixel coordinates are defined in a coordinate system

     * related to the {@link CameraCharacteristics#LENS_INTRINSIC_CALIBRATION android.lens.intrinsicCalibration}

     * calibration fields; see that entry for details of the mapping stages.

     * Both <code>[x_i, y_i]</code> and <code>[x_c, y_c]</code>

     * have <code>(0,0)</code> at the lens optical center <code>[c_x, c_y]</code>, and

     * the range of the coordinates depends on the focal length

     * terms of the intrinsic calibration.</p>

     * <p>Finally, <code>r</code> represents the radial distance from the

     * optical center, <code>r^2 = x_i^2 + y_i^2</code>.</p>

     * <p>The distortion model used is the Brown-Conrady model.</p>

     * <p><b>Units</b>:

     * Unitless coefficients.</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     *

     * @see CameraCharacteristics#LENS_INTRINSIC_CALIBRATION

     * @see CameraCharacteristics#LENS_RADIAL_DISTORTION

     */

    @PublicKey

    public static final Key<float[]> LENS_DISTORTION =

            new Key<float[]>("android.lens.distortion", float[].class);



    /**

     * <p>List of noise reduction modes for {@link CaptureRequest#NOISE_REDUCTION_MODE android.noiseReduction.mode} that are supported

     * by this camera device.</p>
@@ -1419,6 +1466,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * consideration of future support.</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     * @deprecated

     * <p>Not used in HALv3 or newer; replaced by better partials mechanism</p>



     * @hide

     */

    @Deprecated
@@ -1809,6 +1858,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <p>When set to YUV_420_888, application can access the YUV420 data directly.</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     * @deprecated

     * <p>Not used in HALv3 or newer</p>



     * @hide

     */

    @Deprecated
@@ -1829,6 +1880,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * TODO: Remove property.</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     * @deprecated

     * <p>Not used in HALv3 or newer</p>



     * @hide

     */

    @Deprecated
@@ -1845,6 +1898,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     *

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     * @deprecated

     * <p>Not used in HALv3 or newer</p>



     * @hide

     */

    @Deprecated
@@ -1884,6 +1939,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <p><b>Units</b>: Nanoseconds</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     * @deprecated

     * <p>Not used in HALv3 or newer</p>



     * @hide

     */

    @Deprecated
@@ -1906,6 +1963,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * check if it limits the maximum size for image data.</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     * @deprecated

     * <p>Not used in HALv3 or newer</p>



     * @hide

     */

    @Deprecated
@@ -2545,7 +2604,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.</p>

     * <p>The currently supported fields that correct for geometric distortion are:</p>

     * <ol>

     * <li>{@link CameraCharacteristics#LENS_RADIAL_DISTORTION android.lens.radialDistortion}.</li>

     * <li>{@link CameraCharacteristics#LENS_DISTORTION android.lens.distortion}.</li>

     * </ol>

     * <p>If all of the geometric distortion fields are no-ops, this rectangle will be the same

     * as the post-distortion-corrected rectangle given in
@@ -2558,7 +2617,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <p><b>Units</b>: Pixel coordinates on the image sensor</p>

     * <p>This key is available on all devices.</p>

     *

     * @see CameraCharacteristics#LENS_RADIAL_DISTORTION

     * @see CameraCharacteristics#LENS_DISTORTION

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     * @see CameraCharacteristics#SENSOR_INFO_PIXEL_ARRAY_SIZE

     * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE

core/java/android/hardware/camera2/CameraMetadata.java

+4 −4
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ public abstract class CameraMetadata<TKey> { 
     * <li>{@link CameraCharacteristics#LENS_POSE_TRANSLATION android.lens.poseTranslation}</li>

     * <li>{@link CameraCharacteristics#LENS_POSE_ROTATION android.lens.poseRotation}</li>

     * <li>{@link CameraCharacteristics#LENS_INTRINSIC_CALIBRATION android.lens.intrinsicCalibration}</li>

     * <li>{@link CameraCharacteristics#LENS_RADIAL_DISTORTION android.lens.radialDistortion}</li>

     * <li>{@link CameraCharacteristics#LENS_DISTORTION android.lens.distortion}</li>

     * </ul>

     * </li>

     * <li>The {@link CameraCharacteristics#DEPTH_DEPTH_IS_EXCLUSIVE android.depth.depthIsExclusive} entry is listed by this device.</li>
@@ -702,12 +702,12 @@ public abstract class CameraMetadata<TKey> { 
     * rate, including depth stall time.</p>

     *

     * @see CameraCharacteristics#DEPTH_DEPTH_IS_EXCLUSIVE

     * @see CameraCharacteristics#LENS_DISTORTION

     * @see CameraCharacteristics#LENS_FACING

     * @see CameraCharacteristics#LENS_INTRINSIC_CALIBRATION

     * @see CameraCharacteristics#LENS_POSE_REFERENCE

     * @see CameraCharacteristics#LENS_POSE_ROTATION

     * @see CameraCharacteristics#LENS_POSE_TRANSLATION

     * @see CameraCharacteristics#LENS_RADIAL_DISTORTION

     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES

     */

    public static final int REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT = 8;
@@ -826,7 +826,7 @@ public abstract class CameraMetadata<TKey> { 
     * <li>{@link CameraCharacteristics#LENS_POSE_ROTATION android.lens.poseRotation}</li>

     * <li>{@link CameraCharacteristics#LENS_POSE_TRANSLATION android.lens.poseTranslation}</li>

     * <li>{@link CameraCharacteristics#LENS_INTRINSIC_CALIBRATION android.lens.intrinsicCalibration}</li>

     * <li>{@link CameraCharacteristics#LENS_RADIAL_DISTORTION android.lens.radialDistortion}</li>

     * <li>{@link CameraCharacteristics#LENS_DISTORTION android.lens.distortion}</li>

     * </ul>

     * </li>

     * <li>The SENSOR_INFO_TIMESTAMP_SOURCE of the logical device and physical devices must be
@@ -852,11 +852,11 @@ public abstract class CameraMetadata<TKey> { 
     * not slow down the frame rate of the capture, as long as the minimum frame duration

     * of the physical and logical streams are the same.</p>

     *

     * @see CameraCharacteristics#LENS_DISTORTION

     * @see CameraCharacteristics#LENS_INTRINSIC_CALIBRATION

     * @see CameraCharacteristics#LENS_POSE_REFERENCE

     * @see CameraCharacteristics#LENS_POSE_ROTATION

     * @see CameraCharacteristics#LENS_POSE_TRANSLATION

     * @see CameraCharacteristics#LENS_RADIAL_DISTORTION

     * @see CameraCharacteristics#LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE

     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES

     */

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

+3 −1
Original line number Diff line number Diff line
@@ -2791,8 +2791,10 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     *   <li>{@link #STATISTICS_OIS_DATA_MODE_ON ON}</li>

     * </ul></p>

     * <p><b>Available values for this device:</b><br>

     * android.Statistics.info.availableOisDataModes</p>

     * {@link CameraCharacteristics#STATISTICS_INFO_AVAILABLE_OIS_DATA_MODES android.statistics.info.availableOisDataModes}</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     *

     * @see CameraCharacteristics#STATISTICS_INFO_AVAILABLE_OIS_DATA_MODES

     * @see #STATISTICS_OIS_DATA_MODE_OFF

     * @see #STATISTICS_OIS_DATA_MODE_ON

     */

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

+62 −5
Original line number Diff line number Diff line
@@ -2782,7 +2782,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * from the main sensor along the +X axis (to the right from the user's perspective) will

     * report <code>(0.03, 0, 0)</code>.</p>

     * <p>To transform a pixel coordinates between two cameras facing the same direction, first

     * the source camera {@link CameraCharacteristics#LENS_RADIAL_DISTORTION android.lens.radialDistortion} must be corrected for.  Then the source

     * the source camera {@link CameraCharacteristics#LENS_DISTORTION android.lens.distortion} must be corrected for.  Then the source

     * camera {@link CameraCharacteristics#LENS_INTRINSIC_CALIBRATION android.lens.intrinsicCalibration} needs to be applied, followed by the

     * {@link CameraCharacteristics#LENS_POSE_ROTATION android.lens.poseRotation} of the source camera, the translation of the source camera

     * relative to the destination camera, the {@link CameraCharacteristics#LENS_POSE_ROTATION android.lens.poseRotation} of the destination
@@ -2796,10 +2796,10 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * <p><b>Units</b>: Meters</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     *

     * @see CameraCharacteristics#LENS_DISTORTION

     * @see CameraCharacteristics#LENS_INTRINSIC_CALIBRATION

     * @see CameraCharacteristics#LENS_POSE_REFERENCE

     * @see CameraCharacteristics#LENS_POSE_ROTATION

     * @see CameraCharacteristics#LENS_RADIAL_DISTORTION

     */

    @PublicKey

    public static final Key<float[]> LENS_POSE_TRANSLATION =
@@ -2845,7 +2845,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * where <code>(0,0)</code> is the top-left of the

     * preCorrectionActiveArraySize rectangle. Once the pose and

     * intrinsic calibration transforms have been applied to a

     * world point, then the {@link CameraCharacteristics#LENS_RADIAL_DISTORTION android.lens.radialDistortion}

     * world point, then the {@link CameraCharacteristics#LENS_DISTORTION android.lens.distortion}

     * transform needs to be applied, and the result adjusted to

     * be in the {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} coordinate

     * system (where <code>(0, 0)</code> is the top-left of the
@@ -2858,9 +2858,9 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * coordinate system.</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     *

     * @see CameraCharacteristics#LENS_DISTORTION

     * @see CameraCharacteristics#LENS_POSE_ROTATION

     * @see CameraCharacteristics#LENS_POSE_TRANSLATION

     * @see CameraCharacteristics#LENS_RADIAL_DISTORTION

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE

     */
@@ -2902,11 +2902,58 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     *

     * @see CameraCharacteristics#LENS_INTRINSIC_CALIBRATION

     * @deprecated

     * <p>This field was inconsistently defined in terms of its

     * normalization. Use {@link CameraCharacteristics#LENS_DISTORTION android.lens.distortion} instead.</p>

     *

     * @see CameraCharacteristics#LENS_DISTORTION



     */

    @Deprecated

    @PublicKey

    public static final Key<float[]> LENS_RADIAL_DISTORTION =

            new Key<float[]>("android.lens.radialDistortion", float[].class);



    /**

     * <p>The correction coefficients to correct for this camera device's

     * radial and tangential lens distortion.</p>

     * <p>Replaces the deprecated {@link CameraCharacteristics#LENS_RADIAL_DISTORTION android.lens.radialDistortion} field, which was

     * inconsistently defined.</p>

     * <p>Three radial distortion coefficients <code>[kappa_1, kappa_2,

     * kappa_3]</code> and two tangential distortion coefficients

     * <code>[kappa_4, kappa_5]</code> that can be used to correct the

     * lens's geometric distortion with the mapping equations:</p>

     * <pre><code> x_c = x_i * ( 1 + kappa_1 * r^2 + kappa_2 * r^4 + kappa_3 * r^6 ) +

     *        kappa_4 * (2 * x_i * y_i) + kappa_5 * ( r^2 + 2 * x_i^2 )

     *  y_c = y_i * ( 1 + kappa_1 * r^2 + kappa_2 * r^4 + kappa_3 * r^6 ) +

     *        kappa_5 * (2 * x_i * y_i) + kappa_4 * ( r^2 + 2 * y_i^2 )

     * </code></pre>

     * <p>Here, <code>[x_c, y_c]</code> are the coordinates to sample in the

     * input image that correspond to the pixel values in the

     * corrected image at the coordinate <code>[x_i, y_i]</code>:</p>

     * <pre><code> correctedImage(x_i, y_i) = sample_at(x_c, y_c, inputImage)

     * </code></pre>

     * <p>The pixel coordinates are defined in a coordinate system

     * related to the {@link CameraCharacteristics#LENS_INTRINSIC_CALIBRATION android.lens.intrinsicCalibration}

     * calibration fields; see that entry for details of the mapping stages.

     * Both <code>[x_i, y_i]</code> and <code>[x_c, y_c]</code>

     * have <code>(0,0)</code> at the lens optical center <code>[c_x, c_y]</code>, and

     * the range of the coordinates depends on the focal length

     * terms of the intrinsic calibration.</p>

     * <p>Finally, <code>r</code> represents the radial distance from the

     * optical center, <code>r^2 = x_i^2 + y_i^2</code>.</p>

     * <p>The distortion model used is the Brown-Conrady model.</p>

     * <p><b>Units</b>:

     * Unitless coefficients.</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     *

     * @see CameraCharacteristics#LENS_INTRINSIC_CALIBRATION

     * @see CameraCharacteristics#LENS_RADIAL_DISTORTION

     */

    @PublicKey

    public static final Key<float[]> LENS_DISTORTION =

            new Key<float[]>("android.lens.distortion", float[].class);



    /**

     * <p>Mode of operation for the noise reduction algorithm.</p>

     * <p>The noise reduction algorithm attempts to improve image quality by removing
@@ -2980,6 +3027,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * Optional. Default value is FINAL.</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     * @deprecated

     * <p>Not used in HALv3 or newer</p>



     * @hide

     */

    @Deprecated
@@ -2996,6 +3045,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * &gt; 0</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     * @deprecated

     * <p>Not used in HALv3 or newer</p>



     * @hide

     */

    @Deprecated
@@ -3776,6 +3827,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     *

     * @see CaptureRequest#COLOR_CORRECTION_GAINS

     * @deprecated

     * <p>Never fully implemented or specified; do not use</p>



     * @hide

     */

    @Deprecated
@@ -3800,6 +3853,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * regardless of the android.control.* current values.</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     * @deprecated

     * <p>Never fully implemented or specified; do not use</p>



     * @hide

     */

    @Deprecated
@@ -3918,8 +3973,10 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     *   <li>{@link #STATISTICS_OIS_DATA_MODE_ON ON}</li>

     * </ul></p>

     * <p><b>Available values for this device:</b><br>

     * android.Statistics.info.availableOisDataModes</p>

     * {@link CameraCharacteristics#STATISTICS_INFO_AVAILABLE_OIS_DATA_MODES android.statistics.info.availableOisDataModes}</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     *

     * @see CameraCharacteristics#STATISTICS_INFO_AVAILABLE_OIS_DATA_MODES

     * @see #STATISTICS_OIS_DATA_MODE_OFF

     * @see #STATISTICS_OIS_DATA_MODE_ON

     */