From bc01db42d5768539d349935f58890f71dd56f521 Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Wed, 7 May 2014 10:03:27 -0700 Subject: Camera: remove some DNG tags Change-Id: I878e26414dcf5cedbcfd8c505b0c507f4548c035 --- api/current.txt | 3 --- .../hardware/camera2/CameraCharacteristics.java | 14 ---------- .../android/hardware/camera2/CaptureResult.java | 30 ---------------------- 3 files changed, 47 deletions(-) diff --git a/api/current.txt b/api/current.txt index 24c83c1..2015d00 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11853,7 +11853,6 @@ package android.hardware.camera2 { field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_INFO_WHITE_LEVEL; field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_MAX_ANALOG_SENSITIVITY; field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_ORIENTATION; - field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_PROFILE_HUE_SAT_MAP_DIMENSIONS; field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_REFERENCE_ILLUMINANT1; field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_REFERENCE_ILLUMINANT2; field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES; @@ -12235,8 +12234,6 @@ package android.hardware.camera2 { field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_FRAME_DURATION; field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_GREEN_SPLIT; field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_NEUTRAL_COLOR_POINT; - field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_PROFILE_HUE_SAT_MAP; - field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_PROFILE_TONE_CURVE; field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_SENSITIVITY; field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_TEMPERATURE; field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_TEST_PATTERN_DATA; diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 28309d7..5f2af8c 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -1277,20 +1277,6 @@ public final class CameraCharacteristics extends CameraMetadata { new Key("android.sensor.orientation", int.class); /** - *

The number of input samples for each dimension of - * {@link CaptureResult#SENSOR_PROFILE_HUE_SAT_MAP android.sensor.profileHueSatMap}.

- *

The number of input samples for the hue, saturation, and value - * dimension of {@link CaptureResult#SENSOR_PROFILE_HUE_SAT_MAP android.sensor.profileHueSatMap}. The order of the - * dimensions given is hue, saturation, value; where hue is the 0th - * element.

- *

Optional - This value may be {@code null} on some devices.

- * - * @see CaptureResult#SENSOR_PROFILE_HUE_SAT_MAP - */ - public static final Key SENSOR_PROFILE_HUE_SAT_MAP_DIMENSIONS = - new Key("android.sensor.profileHueSatMapDimensions", int[].class); - - /** *

Optional. Defaults to [OFF]. Lists the supported test * pattern modes for {@link CaptureRequest#SENSOR_TEST_PATTERN_MODE android.sensor.testPatternMode}.

*

Optional - This value may be {@code null} on some devices.

diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 1d2d0e9..51ea447 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -1906,36 +1906,6 @@ public final class CaptureResult extends CameraMetadata { new Key("android.sensor.neutralColorPoint", Rational[].class); /** - *

A mapping containing a hue shift, saturation scale, and value scale - * for each pixel.

- *

hue_samples, saturation_samples, and value_samples are given in - * {@link CameraCharacteristics#SENSOR_PROFILE_HUE_SAT_MAP_DIMENSIONS android.sensor.profileHueSatMapDimensions}.

- *

Each entry of this map contains three floats corresponding to the - * hue shift, saturation scale, and value scale, respectively; where the - * hue shift has the lowest index. The map entries are stored in the tag - * in nested loop order, with the value divisions in the outer loop, the - * hue divisions in the middle loop, and the saturation divisions in the - * inner loop. All zero input saturation entries are required to have a - * value scale factor of 1.0.

- *

Optional - This value may be {@code null} on some devices.

- * - * @see CameraCharacteristics#SENSOR_PROFILE_HUE_SAT_MAP_DIMENSIONS - */ - public static final Key SENSOR_PROFILE_HUE_SAT_MAP = - new Key("android.sensor.profileHueSatMap", float[].class); - - /** - *

A list of x,y samples defining a tone-mapping curve for gamma adjustment.

- *

This tag contains a default tone curve that can be applied while - * processing the image as a starting point for user adjustments. - * The curve is specified as a list of value pairs in linear gamma. - * The curve is interpolated using a cubic spline.

- *

Optional - This value may be {@code null} on some devices.

- */ - public static final Key SENSOR_PROFILE_TONE_CURVE = - new Key("android.sensor.profileToneCurve", float[].class); - - /** *

The worst-case divergence between Bayer green channels.

*

This value is an estimate of the worst case split between the * Bayer green channels in the red and blue rows in the sensor color -- cgit v1.1