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

Commit eee850d3 authored by Zhijun He's avatar Zhijun He Committed by Android (Google) Code Review
Browse files

Merge "Camera2: update aberration correction related tag name" into lmp-dev

parents edaece1f 9e4e439a

api/current.txt

+6 −6
Original line number Diff line number Diff line
@@ -12682,7 +12682,7 @@ package android.hardware.camera2 { 
    method public T get(android.hardware.camera2.CameraCharacteristics.Key<T>);

    method public java.util.List<android.hardware.camera2.CaptureRequest.Key<?>> getAvailableCaptureRequestKeys();

    method public java.util.List<android.hardware.camera2.CaptureResult.Key<?>> getAvailableCaptureResultKeys();

    field public static final android.hardware.camera2.CameraCharacteristics.Key COLOR_CORRECTION_AVAILABLE_ABERRATION_CORRECTION_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key CONTROL_AE_AVAILABLE_ANTIBANDING_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key CONTROL_AE_AVAILABLE_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES;
@@ -12796,9 +12796,9 @@ package android.hardware.camera2 { 














  public abstract class CameraMetadata {















    method public java.util.List<TKey> getKeys();













    field public static final int COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_FAST = 1; // 0x1













    field public static final int COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_HIGH_QUALITY = 2; // 0x2













    field public static final int COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_OFF = 0; // 0x0













    field public static final int COLOR_CORRECTION_ABERRATION_MODE_FAST = 1; // 0x1













    field public static final int COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY = 2; // 0x2













    field public static final int COLOR_CORRECTION_ABERRATION_MODE_OFF = 0; // 0x0















    field public static final int COLOR_CORRECTION_MODE_FAST = 1; // 0x1















    field public static final int COLOR_CORRECTION_MODE_HIGH_QUALITY = 2; // 0x2















    field public static final int COLOR_CORRECTION_MODE_TRANSFORM_MATRIX = 0; // 0x0










@@ -12989,7 +12989,7 @@ package android.hardware.camera2 {













    method public java.lang.Object getTag();















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.hardware.camera2.CaptureRequest.Key BLACK_LEVEL_LOCK;













    field public static final android.hardware.camera2.CaptureRequest.Key COLOR_CORRECTION_ABERRATION_CORRECTION_MODE;













    field public static final android.hardware.camera2.CaptureRequest.Key COLOR_CORRECTION_ABERRATION_MODE;















    field public static final android.hardware.camera2.CaptureRequest.Key COLOR_CORRECTION_GAINS;















    field public static final android.hardware.camera2.CaptureRequest.Key COLOR_CORRECTION_MODE;















    field public static final android.hardware.camera2.CaptureRequest.Key COLOR_CORRECTION_TRANSFORM;










@@ -13061,7 +13061,7 @@ package android.hardware.camera2 {













    method public android.hardware.camera2.CaptureRequest getRequest();















    method public int getSequenceId();















    field public static final android.hardware.camera2.CaptureResult.Key BLACK_LEVEL_LOCK;













    field public static final android.hardware.camera2.CaptureResult.Key COLOR_CORRECTION_ABERRATION_CORRECTION_MODE;













    field public static final android.hardware.camera2.CaptureResult.Key COLOR_CORRECTION_ABERRATION_MODE;















    field public static final android.hardware.camera2.CaptureResult.Key COLOR_CORRECTION_GAINS;















    field public static final android.hardware.camera2.CaptureResult.Key COLOR_CORRECTION_MODE;















    field public static final android.hardware.camera2.CaptureResult.Key COLOR_CORRECTION_TRANSFORM;

























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



+4
−4




























Original line number
Diff line number
Diff line








@@ -313,18 +313,18 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri





























    /**















     * <p>The set of aberration correction modes supported by this camera device.</p>













     * <p>This metadata lists the valid modes for {@link CaptureRequest#COLOR_CORRECTION_ABERRATION_CORRECTION_MODE android.colorCorrection.aberrationCorrectionMode}.













     * <p>This metadata lists the valid modes for {@link CaptureRequest#COLOR_CORRECTION_ABERRATION_MODE android.colorCorrection.aberrationMode}.















     * If no aberration correction modes are available for a device, this list will solely include















     * OFF mode.</p>















     * <p>For FULL capability device ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} <code>==</code> FULL), OFF must be















     * included.</p>















     *













     * @see CaptureRequest#COLOR_CORRECTION_ABERRATION_CORRECTION_MODE













     * @see CaptureRequest#COLOR_CORRECTION_ABERRATION_MODE















     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL















     */















    @PublicKey













    public static final Key<int[]> COLOR_CORRECTION_AVAILABLE_ABERRATION_CORRECTION_MODES =













            new Key<int[]>("android.colorCorrection.availableAberrationCorrectionModes", int[].class);













    public static final Key<int[]> COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES =













            new Key<int[]>("android.colorCorrection.availableAberrationModes", int[].class);































    /**















     * <p>The set of auto-exposure antibanding modes that are

































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



+13
−12




























Original line number
Diff line number
Diff line








@@ -386,8 +386,8 @@ public abstract class CameraMetadata<TKey> {













     * </ul>















     * </li>















     * <li>Manual aberration correction control (if aberration correction is supported)<ul>













     * <li>{@link CaptureRequest#COLOR_CORRECTION_ABERRATION_CORRECTION_MODE android.colorCorrection.aberrationCorrectionMode}</li>













     * <li>{@link CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_CORRECTION_MODES android.colorCorrection.availableAberrationCorrectionModes}</li>













     * <li>{@link CaptureRequest#COLOR_CORRECTION_ABERRATION_MODE android.colorCorrection.aberrationMode}</li>













     * <li>{@link CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES android.colorCorrection.availableAberrationModes}</li>















     * </ul>















     * </li>















     * </ul>









@@ -396,8 +396,8 @@ public abstract class CameraMetadata<TKey> {













     * <p>A given camera device may also support additional post-processing















     * controls, but this capability only covers the above list of controls.</p>















     *













     * @see CaptureRequest#COLOR_CORRECTION_ABERRATION_CORRECTION_MODE













     * @see CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_CORRECTION_MODES













     * @see CaptureRequest#COLOR_CORRECTION_ABERRATION_MODE













     * @see CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES















     * @see CaptureRequest#COLOR_CORRECTION_GAINS















     * @see CaptureRequest#COLOR_CORRECTION_TRANSFORM















     * @see CaptureRequest#SHADING_MODE










@@ -739,28 +739,28 @@ public abstract class CameraMetadata<TKey> {













    public static final int COLOR_CORRECTION_MODE_HIGH_QUALITY = 2;































    //













    // Enumeration values for CaptureRequest#COLOR_CORRECTION_ABERRATION_CORRECTION_MODE













    // Enumeration values for CaptureRequest#COLOR_CORRECTION_ABERRATION_MODE















    //































    /**















     * <p>No aberration correction is applied.</p>













     * @see CaptureRequest#COLOR_CORRECTION_ABERRATION_CORRECTION_MODE













     * @see CaptureRequest#COLOR_CORRECTION_ABERRATION_MODE















     */













    public static final int COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_OFF = 0;













    public static final int COLOR_CORRECTION_ABERRATION_MODE_OFF = 0;































    /**















     * <p>Aberration correction will not slow down capture rate















     * relative to sensor raw output.</p>













     * @see CaptureRequest#COLOR_CORRECTION_ABERRATION_CORRECTION_MODE













     * @see CaptureRequest#COLOR_CORRECTION_ABERRATION_MODE















     */













    public static final int COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_FAST = 1;













    public static final int COLOR_CORRECTION_ABERRATION_MODE_FAST = 1;































    /**















     * <p>Aberration correction operates at improved quality but reduced















     * capture rate (relative to sensor raw output).</p>













     * @see CaptureRequest#COLOR_CORRECTION_ABERRATION_CORRECTION_MODE













     * @see CaptureRequest#COLOR_CORRECTION_ABERRATION_MODE















     */













    public static final int COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_HIGH_QUALITY = 2;













    public static final int COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY = 2;































    //















    // Enumeration values for CaptureRequest#CONTROL_AE_ANTIBANDING_MODE










@@ -1213,7 +1213,8 @@ public abstract class CameraMetadata<TKey> {













     * image while recording video) use case.</p>















     * <p>The camera device should take the highest-quality image















     * possible (given the other settings) without disrupting the













     * frame rate of video recording.  </p>













     * frame rate of video recording.<br />













     * </p>















     * @see CaptureRequest#CONTROL_CAPTURE_INTENT















     */















    public static final int CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT = 4;

































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



+7
−7




























Original line number
Diff line number
Diff line








@@ -569,7 +569,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













    /**















     * <p>Mode of operation for the chromatic aberration correction algorithm.</p>















     * <p>This must be set to a valid mode from













     * {@link CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_CORRECTION_MODES android.colorCorrection.availableAberrationCorrectionModes}.</p>













     * {@link CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES android.colorCorrection.availableAberrationModes}.</p>















     * <p>Chromatic (color) aberration is caused by the fact that different wavelengths of light















     * can not focus on the same point after exiting from the lens. This metadata defines















     * the high level control of chromatic aberration correction algorithm, which aims to









@@ -581,14 +581,14 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













     * capture rate. FAST means the camera device will not slow down capture rate when















     * applying aberration correction.</p>















     *













     * @see CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_CORRECTION_MODES













     * @see #COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_OFF













     * @see #COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_FAST













     * @see #COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_HIGH_QUALITY













     * @see CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES













     * @see #COLOR_CORRECTION_ABERRATION_MODE_OFF













     * @see #COLOR_CORRECTION_ABERRATION_MODE_FAST













     * @see #COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY















     */















    @PublicKey













    public static final Key<Integer> COLOR_CORRECTION_ABERRATION_CORRECTION_MODE =













            new Key<Integer>("android.colorCorrection.aberrationCorrectionMode", int.class);













    public static final Key<Integer> COLOR_CORRECTION_ABERRATION_MODE =













            new Key<Integer>("android.colorCorrection.aberrationMode", int.class);































    /**















     * <p>The desired setting for the camera device's auto-exposure

































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



+7
−7




























Original line number
Diff line number
Diff line








@@ -420,7 +420,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {













    /**















     * <p>Mode of operation for the chromatic aberration correction algorithm.</p>















     * <p>This must be set to a valid mode from













     * {@link CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_CORRECTION_MODES android.colorCorrection.availableAberrationCorrectionModes}.</p>













     * {@link CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES android.colorCorrection.availableAberrationModes}.</p>















     * <p>Chromatic (color) aberration is caused by the fact that different wavelengths of light















     * can not focus on the same point after exiting from the lens. This metadata defines















     * the high level control of chromatic aberration correction algorithm, which aims to









@@ -432,14 +432,14 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {













     * capture rate. FAST means the camera device will not slow down capture rate when















     * applying aberration correction.</p>















     *













     * @see CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_CORRECTION_MODES













     * @see #COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_OFF













     * @see #COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_FAST













     * @see #COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_HIGH_QUALITY













     * @see CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES













     * @see #COLOR_CORRECTION_ABERRATION_MODE_OFF













     * @see #COLOR_CORRECTION_ABERRATION_MODE_FAST













     * @see #COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY















     */















    @PublicKey













    public static final Key<Integer> COLOR_CORRECTION_ABERRATION_CORRECTION_MODE =













            new Key<Integer>("android.colorCorrection.aberrationCorrectionMode", int.class);













    public static final Key<Integer> COLOR_CORRECTION_ABERRATION_MODE =













            new Key<Integer>("android.colorCorrection.aberrationMode", int.class);































    /**















     * <p>The desired setting for the camera device's auto-exposure