From 03d50da3b15d0ea4675650d2510e2abc6c139fbf Mon Sep 17 00:00:00 2001 From: Yin-Chia Yeh Date: Wed, 6 May 2015 00:10:11 -0700 Subject: Camera: tonemap linkify update Change-Id: I9e1688916c70af1ffef96407117566eac7236ce4 --- core/java/android/hardware/camera2/CameraMetadata.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'core/java/android/hardware') diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index e3f1d73..8820083 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -388,8 +388,8 @@ public abstract class CameraMetadata { *
  • {@link CaptureRequest#TONEMAP_CURVE android.tonemap.curve}
  • *
  • {@link CaptureRequest#TONEMAP_MODE android.tonemap.mode}
  • *
  • {@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS android.tonemap.maxCurvePoints}
  • - *
  • android.tonemap.gamma
  • - *
  • android.tonemap.presetCurve
  • + *
  • {@link CaptureRequest#TONEMAP_GAMMA android.tonemap.gamma}
  • + *
  • {@link CaptureRequest#TONEMAP_PRESET_CURVE android.tonemap.presetCurve}
  • * * *
  • @@ -429,8 +429,10 @@ public abstract class CameraMetadata { * @see CaptureRequest#SHADING_MODE * @see CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE * @see CaptureRequest#TONEMAP_CURVE + * @see CaptureRequest#TONEMAP_GAMMA * @see CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS * @see CaptureRequest#TONEMAP_MODE + * @see CaptureRequest#TONEMAP_PRESET_CURVE * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES */ public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING = 2; @@ -2181,22 +2183,26 @@ public abstract class CameraMetadata { public static final int TONEMAP_MODE_HIGH_QUALITY = 2; /** - *

    Use the gamma value specified in android.tonemap.gamma to peform + *

    Use the gamma value specified in {@link CaptureRequest#TONEMAP_GAMMA android.tonemap.gamma} to peform * tonemapping.

    *

    All color enhancement and tonemapping must be disabled, except - * for applying the tonemapping curve specified by android.tonemap.gamma.

    + * for applying the tonemapping curve specified by {@link CaptureRequest#TONEMAP_GAMMA android.tonemap.gamma}.

    *

    Must not slow down frame rate relative to raw sensor output.

    + * + * @see CaptureRequest#TONEMAP_GAMMA * @see CaptureRequest#TONEMAP_MODE */ public static final int TONEMAP_MODE_GAMMA_VALUE = 3; /** *

    Use the preset tonemapping curve specified in - * android.tonemap.presetCurve to peform tonemapping.

    + * {@link CaptureRequest#TONEMAP_PRESET_CURVE android.tonemap.presetCurve} to peform tonemapping.

    *

    All color enhancement and tonemapping must be disabled, except * for applying the tonemapping curve specified by - * android.tonemap.presetCurve.

    + * {@link CaptureRequest#TONEMAP_PRESET_CURVE android.tonemap.presetCurve}.

    *

    Must not slow down frame rate relative to raw sensor output.

    + * + * @see CaptureRequest#TONEMAP_PRESET_CURVE * @see CaptureRequest#TONEMAP_MODE */ public static final int TONEMAP_MODE_PRESET_CURVE = 4; -- cgit v1.1