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

Commit 77c3c998 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Camera2: Sort metadata @see to make it stable over time"

parents 520e705b 265b34ce

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

+3 −3
Original line number Diff line number Diff line
@@ -227,10 +227,10 @@ public final class CameraCharacteristics extends CameraMetadata { 
     * which enables application control of white balance, by using

     * {@link CaptureRequest#COLOR_CORRECTION_TRANSFORM android.colorCorrection.transform} and {@link CaptureRequest#COLOR_CORRECTION_GAINS android.colorCorrection.gains}({@link CaptureRequest#COLOR_CORRECTION_MODE android.colorCorrection.mode} must be set to TRANSFORM_MATRIX).</p>

     *

     * @see CaptureRequest#COLOR_CORRECTION_TRANSFORM

     * @see CaptureRequest#COLOR_CORRECTION_GAINS

     * @see CaptureRequest#COLOR_CORRECTION_MODE

     * @see CaptureRequest#COLOR_CORRECTION_TRANSFORM

     * @see CaptureRequest#CONTROL_AWB_MODE

     * @see CaptureRequest#COLOR_CORRECTION_GAINS

     */

    public static final Key<byte[]> CONTROL_AWB_AVAILABLE_MODES =

            new Key<byte[]>("android.control.awbAvailableModes", byte[].class);
@@ -500,8 +500,8 @@ public final class CameraCharacteristics extends CameraMetadata { 
     * Present on all camera devices that report being {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_FULL HARDWARE_LEVEL_FULL} devices in the

     * {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} key</p>

     *

     * @see CaptureRequest#SENSOR_SENSITIVITY

     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL

     * @see CaptureRequest#SENSOR_SENSITIVITY

     */

    public static final Key<Integer> SENSOR_MAX_ANALOG_SENSITIVITY =

            new Key<Integer>("android.sensor.maxAnalogSensitivity", int.class);

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

+4 −4
Original line number Diff line number Diff line
@@ -252,8 +252,8 @@ public abstract class CameraMetadata { 
     * <p>Use the {@link CaptureRequest#COLOR_CORRECTION_TRANSFORM android.colorCorrection.transform} matrix

     * and {@link CaptureRequest#COLOR_CORRECTION_GAINS android.colorCorrection.gains} to do color conversion</p>

     *

     * @see CaptureRequest#COLOR_CORRECTION_TRANSFORM

     * @see CaptureRequest#COLOR_CORRECTION_GAINS

     * @see CaptureRequest#COLOR_CORRECTION_TRANSFORM

     * @see CaptureRequest#COLOR_CORRECTION_MODE

     */

    public static final int COLOR_CORRECTION_MODE_TRANSFORM_MATRIX = 0;
@@ -318,8 +318,8 @@ public abstract class CameraMetadata { 
     * device, along with android.flash.* fields, if there's

     * a flash unit for this camera device.</p>

     *

     * @see CaptureRequest#SENSOR_FRAME_DURATION

     * @see CaptureRequest#SENSOR_EXPOSURE_TIME

     * @see CaptureRequest#SENSOR_FRAME_DURATION

     * @see CaptureRequest#SENSOR_SENSITIVITY

     * @see CaptureRequest#CONTROL_AE_MODE

     */
@@ -334,8 +334,8 @@ public abstract class CameraMetadata { 
     * application has control over the various

     * android.flash.* fields.</p>

     *

     * @see CaptureRequest#SENSOR_FRAME_DURATION

     * @see CaptureRequest#SENSOR_EXPOSURE_TIME

     * @see CaptureRequest#SENSOR_FRAME_DURATION

     * @see CaptureRequest#SENSOR_SENSITIVITY

     * @see CaptureRequest#CONTROL_AE_MODE

     */
@@ -527,8 +527,8 @@ public abstract class CameraMetadata { 
     * ({@link CaptureRequest#COLOR_CORRECTION_GAINS android.colorCorrection.gains}) are used by the camera

     * device for manual white balance control.</p>

     *

     * @see CaptureRequest#COLOR_CORRECTION_TRANSFORM

     * @see CaptureRequest#COLOR_CORRECTION_GAINS

     * @see CaptureRequest#COLOR_CORRECTION_TRANSFORM

     * @see CaptureRequest#CONTROL_AWB_MODE

     */

    public static final int CONTROL_AWB_MODE_OFF = 0;

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

+12 −12
Original line number Diff line number Diff line
@@ -399,10 +399,10 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 
     * issues. The {@link CaptureResult#STATISTICS_SCENE_FLICKER android.statistics.sceneFlicker} key can assist

     * the application in this.</p>

     *

     * @see CaptureRequest#CONTROL_MODE

     * @see CaptureResult#STATISTICS_SCENE_FLICKER

     * @see CameraCharacteristics#CONTROL_AE_AVAILABLE_ANTIBANDING_MODES

     * @see CaptureRequest#CONTROL_AE_MODE

     * @see CaptureRequest#CONTROL_MODE

     * @see CaptureResult#STATISTICS_SCENE_FLICKER

     * @see #CONTROL_AE_ANTIBANDING_MODE_OFF

     * @see #CONTROL_AE_ANTIBANDING_MODE_50HZ

     * @see #CONTROL_AE_ANTIBANDING_MODE_60HZ
@@ -454,11 +454,11 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 
     * CaptureResult.</p>

     *

     * @see CaptureRequest#CONTROL_MODE

     * @see CameraCharacteristics#FLASH_INFO_AVAILABLE

     * @see CaptureRequest#FLASH_MODE

     * @see CaptureRequest#SENSOR_EXPOSURE_TIME

     * @see CaptureRequest#SENSOR_FRAME_DURATION

     * @see CaptureRequest#SENSOR_SENSITIVITY

     * @see CaptureRequest#FLASH_MODE

     * @see CameraCharacteristics#FLASH_INFO_AVAILABLE

     * @see #CONTROL_AE_MODE_OFF

     * @see #CONTROL_AE_MODE_ON

     * @see #CONTROL_AE_MODE_ON_AUTO_FLASH
@@ -486,8 +486,8 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 
     * should ignore the sections outside the region and output the

     * used sections in the frame metadata</p>

     *

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     * @see CaptureRequest#SCALER_CROP_REGION

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     */

    public static final Key<int[]> CONTROL_AE_REGIONS =

            new Key<int[]>("android.control.aeRegions", int[].class);
@@ -556,8 +556,8 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 
     * should ignore the sections outside the region and output the

     * used sections in the frame metadata</p>

     *

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     * @see CaptureRequest#SCALER_CROP_REGION

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     */

    public static final Key<int[]> CONTROL_AF_REGIONS =

            new Key<int[]>("android.control.afRegions", int[].class);
@@ -605,10 +605,10 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 
     * routine is disabled. The camera device uses each particular illumination

     * target for white balance adjustment.</p>

     *

     * @see CaptureRequest#CONTROL_MODE

     * @see CaptureRequest#COLOR_CORRECTION_GAINS

     * @see CaptureRequest#COLOR_CORRECTION_MODE

     * @see CaptureRequest#COLOR_CORRECTION_TRANSFORM

     * @see CaptureRequest#COLOR_CORRECTION_GAINS

     * @see CaptureRequest#CONTROL_MODE

     * @see #CONTROL_AWB_MODE_OFF

     * @see #CONTROL_AWB_MODE_AUTO

     * @see #CONTROL_AWB_MODE_INCANDESCENT
@@ -641,8 +641,8 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 
     * should ignore the sections outside the region and output the

     * used sections in the frame metadata</p>

     *

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     * @see CaptureRequest#SCALER_CROP_REGION

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     */

    public static final Key<int[]> CONTROL_AWB_REGIONS =

            new Key<int[]>("android.control.awbRegions", int[].class);
@@ -839,10 +839,10 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 
     * auto-exposure algorithm, the overridden values are then provided

     * back to the user in the corresponding result.</p>

     *

     * @see CaptureRequest#SENSOR_SENSITIVITY

     * @see CaptureRequest#SENSOR_EXPOSURE_TIME

     * @see CameraCharacteristics#LENS_INFO_AVAILABLE_APERTURES

     * @see CaptureRequest#CONTROL_AE_MODE

     * @see CameraCharacteristics#LENS_INFO_AVAILABLE_APERTURES

     * @see CaptureRequest#SENSOR_EXPOSURE_TIME

     * @see CaptureRequest#SENSOR_SENSITIVITY

     */

    public static final Key<Float> LENS_APERTURE =

            new Key<Float>("android.lens.aperture", float.class);

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

+11 −11
Original line number Diff line number Diff line
@@ -196,11 +196,11 @@ public final class CaptureResult extends CameraMetadata { 
     * CaptureResult.</p>

     *

     * @see CaptureRequest#CONTROL_MODE

     * @see CameraCharacteristics#FLASH_INFO_AVAILABLE

     * @see CaptureRequest#FLASH_MODE

     * @see CaptureRequest#SENSOR_EXPOSURE_TIME

     * @see CaptureRequest#SENSOR_FRAME_DURATION

     * @see CaptureRequest#SENSOR_SENSITIVITY

     * @see CaptureRequest#FLASH_MODE

     * @see CameraCharacteristics#FLASH_INFO_AVAILABLE

     * @see #CONTROL_AE_MODE_OFF

     * @see #CONTROL_AE_MODE_ON

     * @see #CONTROL_AE_MODE_ON_AUTO_FLASH
@@ -228,8 +228,8 @@ public final class CaptureResult extends CameraMetadata { 
     * should ignore the sections outside the region and output the

     * used sections in the frame metadata</p>

     *

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     * @see CaptureRequest#SCALER_CROP_REGION

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     */

    public static final Key<int[]> CONTROL_AE_REGIONS =

            new Key<int[]>("android.control.aeRegions", int[].class);
@@ -286,8 +286,8 @@ public final class CaptureResult extends CameraMetadata { 
     * should ignore the sections outside the region and output the

     * used sections in the frame metadata</p>

     *

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     * @see CaptureRequest#SCALER_CROP_REGION

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     */

    public static final Key<int[]> CONTROL_AF_REGIONS =

            new Key<int[]>("android.control.afRegions", int[].class);
@@ -336,10 +336,10 @@ public final class CaptureResult extends CameraMetadata { 
     * routine is disabled. The camera device uses each particular illumination

     * target for white balance adjustment.</p>

     *

     * @see CaptureRequest#CONTROL_MODE

     * @see CaptureRequest#COLOR_CORRECTION_GAINS

     * @see CaptureRequest#COLOR_CORRECTION_MODE

     * @see CaptureRequest#COLOR_CORRECTION_TRANSFORM

     * @see CaptureRequest#COLOR_CORRECTION_GAINS

     * @see CaptureRequest#CONTROL_MODE

     * @see #CONTROL_AWB_MODE_OFF

     * @see #CONTROL_AWB_MODE_AUTO

     * @see #CONTROL_AWB_MODE_INCANDESCENT
@@ -372,8 +372,8 @@ public final class CaptureResult extends CameraMetadata { 
     * should ignore the sections outside the region and output the

     * used sections in the frame metadata</p>

     *

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     * @see CaptureRequest#SCALER_CROP_REGION

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     */

    public static final Key<int[]> CONTROL_AWB_REGIONS =

            new Key<int[]>("android.control.awbRegions", int[].class);
@@ -521,10 +521,10 @@ public final class CaptureResult extends CameraMetadata { 
     * auto-exposure algorithm, the overridden values are then provided

     * back to the user in the corresponding result.</p>

     *

     * @see CaptureRequest#SENSOR_SENSITIVITY

     * @see CaptureRequest#SENSOR_EXPOSURE_TIME

     * @see CameraCharacteristics#LENS_INFO_AVAILABLE_APERTURES

     * @see CaptureRequest#CONTROL_AE_MODE

     * @see CameraCharacteristics#LENS_INFO_AVAILABLE_APERTURES

     * @see CaptureRequest#SENSOR_EXPOSURE_TIME

     * @see CaptureRequest#SENSOR_SENSITIVITY

     */

    public static final Key<Float> LENS_APERTURE =

            new Key<Float>("android.lens.aperture", float.class);
@@ -818,9 +818,9 @@ public final class CaptureResult extends CameraMetadata { 
     * image of a gray wall (using bicubic interpolation for visual quality) as captured by the sensor gives:</p>

     * <p><img alt="Image of a uniform white wall (inverse shading map)" src="../../../../images/camera2/metadata/android.statistics.lensShadingMap/inv_shading.png" /></p>

     *

     * @see CaptureResult#STATISTICS_LENS_SHADING_MAP

     * @see CaptureRequest#COLOR_CORRECTION_MODE

     * @see CameraCharacteristics#LENS_INFO_SHADING_MAP_SIZE

     * @see CaptureResult#STATISTICS_LENS_SHADING_MAP

     */

    public static final Key<float[]> STATISTICS_LENS_SHADING_MAP =

            new Key<float[]>("android.statistics.lensShadingMap", float[].class);