From 9e4e439a688f1859cd895f2ff7ecad75cddb116b Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Mon, 18 Aug 2014 11:12:32 -0700 Subject: Camera2: update aberration correction related tag name This is for API review update. Bug: 17008587 Change-Id: I67c2cffed8fcc106008b0fde6f01cd81f4ce6db0 --- api/current.txt | 12 +++++------ .../hardware/camera2/CameraCharacteristics.java | 8 +++---- .../android/hardware/camera2/CameraMetadata.java | 25 +++++++++++----------- .../android/hardware/camera2/CaptureRequest.java | 14 ++++++------ .../android/hardware/camera2/CaptureResult.java | 14 ++++++------ 5 files changed, 37 insertions(+), 36 deletions(-) diff --git a/api/current.txt b/api/current.txt index 5b8ba4d21930..e0a6b037991a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12677,7 +12677,7 @@ package android.hardware.camera2 { method public T get(android.hardware.camera2.CameraCharacteristics.Key); method public java.util.List> getAvailableCaptureRequestKeys(); method public java.util.List> 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; @@ -12791,9 +12791,9 @@ package android.hardware.camera2 { public abstract class CameraMetadata { method public java.util.List 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 @@ -12984,7 +12984,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; @@ -13056,7 +13056,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; diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 4e7f9ddd1fcd..c52534823ad6 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -313,18 +313,18 @@ public final class CameraCharacteristics extends CameraMetadataThe set of aberration correction modes supported by this camera device.

- *

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

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.

*

For FULL capability device ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} == FULL), OFF must be * included.

* - * @see CaptureRequest#COLOR_CORRECTION_ABERRATION_CORRECTION_MODE + * @see CaptureRequest#COLOR_CORRECTION_ABERRATION_MODE * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL */ @PublicKey - public static final Key COLOR_CORRECTION_AVAILABLE_ABERRATION_CORRECTION_MODES = - new Key("android.colorCorrection.availableAberrationCorrectionModes", int[].class); + public static final Key COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES = + new Key("android.colorCorrection.availableAberrationModes", int[].class); /** *

The set of auto-exposure antibanding modes that are diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index 9bdfe8baeb58..3c9b7b39cffd 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -386,8 +386,8 @@ public abstract class CameraMetadata { * * *

  • Manual aberration correction control (if aberration correction is supported)
      - *
    • {@link CaptureRequest#COLOR_CORRECTION_ABERRATION_CORRECTION_MODE android.colorCorrection.aberrationCorrectionMode}
      • - *
    • {@link CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_CORRECTION_MODES android.colorCorrection.availableAberrationCorrectionModes}
      • + *
    • {@link CaptureRequest#COLOR_CORRECTION_ABERRATION_MODE android.colorCorrection.aberrationMode}
      • + *
    • {@link CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES android.colorCorrection.availableAberrationModes}
      • *
    *
    • * @@ -396,8 +396,8 @@ public abstract class CameraMetadata { *

    A given camera device may also support additional post-processing * controls, but this capability only covers the above list of controls.

    * - * @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 { 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 // /** *

    No aberration correction is applied.

    - * @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; /** *

    Aberration correction will not slow down capture rate * relative to sensor raw output.

    - * @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; /** *

    Aberration correction operates at improved quality but reduced * capture rate (relative to sensor raw output).

    - * @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 { * image while recording video) use case.

    *

    The camera device should take the highest-quality image * possible (given the other settings) without disrupting the - * frame rate of video recording.

    + * frame rate of video recording.
    + *

    * @see CaptureRequest#CONTROL_CAPTURE_INTENT */ public static final int CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT = 4; diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index 97077e60e2a9..bcdcd627eec9 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -569,7 +569,7 @@ public final class CaptureRequest extends CameraMetadata> /** *

    Mode of operation for the chromatic aberration correction algorithm.

    *

    This must be set to a valid mode from - * {@link CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_CORRECTION_MODES android.colorCorrection.availableAberrationCorrectionModes}.

    + * {@link CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES android.colorCorrection.availableAberrationModes}.

    *

    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> * capture rate. FAST means the camera device will not slow down capture rate when * applying aberration correction.

    * - * @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 COLOR_CORRECTION_ABERRATION_CORRECTION_MODE = - new Key("android.colorCorrection.aberrationCorrectionMode", int.class); + public static final Key COLOR_CORRECTION_ABERRATION_MODE = + new Key("android.colorCorrection.aberrationMode", int.class); /** *

    The desired setting for the camera device's auto-exposure diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 63dff559086f..f9c4df4a5b63 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -420,7 +420,7 @@ public class CaptureResult extends CameraMetadata> { /** *

    Mode of operation for the chromatic aberration correction algorithm.

    *

    This must be set to a valid mode from - * {@link CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_CORRECTION_MODES android.colorCorrection.availableAberrationCorrectionModes}.

    + * {@link CameraCharacteristics#COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES android.colorCorrection.availableAberrationModes}.

    *

    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> { * capture rate. FAST means the camera device will not slow down capture rate when * applying aberration correction.

    * - * @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 COLOR_CORRECTION_ABERRATION_CORRECTION_MODE = - new Key("android.colorCorrection.aberrationCorrectionMode", int.class); + public static final Key COLOR_CORRECTION_ABERRATION_MODE = + new Key("android.colorCorrection.aberrationMode", int.class); /** *

    The desired setting for the camera device's auto-exposure -- cgit v1.2.3-59-g8ed1b