summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Zhijun He <zhijunhe@google.com> 2013-12-17 10:35:40 -0800
committer Zhijun He <zhijunhe@google.com> 2013-12-17 10:35:40 -0800
commit2807936f5dfdeff25e9ace3482100511a69dcf13 (patch)
tree9b9bea99c68fc825926846620689bfdd949ac156
parentf353742124af698098884b4172644af0851b30ca (diff)
Camera2: Update metadata java docs
Java docs for below keys are updated: - android.edge.mode - android.noiseReduction.mode Bug: 12135317 Change-Id: I950d46b90ece2f519e33719427801fc78b36b39c
-rw-r--r--core/java/android/hardware/camera2/CameraMetadata.java8
-rw-r--r--core/java/android/hardware/camera2/CaptureRequest.java14
-rw-r--r--core/java/android/hardware/camera2/CaptureResult.java14
3 files changed, 32 insertions, 4 deletions
diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java
index 67994cb60c1a..f56feaac5c8f 100644
--- a/core/java/android/hardware/camera2/CameraMetadata.java
+++ b/core/java/android/hardware/camera2/CameraMetadata.java
@@ -758,8 +758,8 @@ public abstract class CameraMetadata {
public static final int EDGE_MODE_OFF = 0;
/**
- * <p>Must not slow down frame rate relative to raw
- * bayer output</p>
+ * <p>Must not slow down frame rate relative to sensor
+ * output</p>
* @see CaptureRequest#EDGE_MODE
*/
public static final int EDGE_MODE_FAST = 1;
@@ -823,8 +823,8 @@ public abstract class CameraMetadata {
public static final int NOISE_REDUCTION_MODE_OFF = 0;
/**
- * <p>Must not slow down frame rate relative to raw
- * bayer output</p>
+ * <p>Must not slow down frame rate relative to sensor
+ * output</p>
* @see CaptureRequest#NOISE_REDUCTION_MODE
*/
public static final int NOISE_REDUCTION_MODE_FAST = 1;
diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java
index 60b2801c54ab..e47567b268ad 100644
--- a/core/java/android/hardware/camera2/CaptureRequest.java
+++ b/core/java/android/hardware/camera2/CaptureRequest.java
@@ -652,6 +652,13 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable {
/**
* <p>Operation mode for edge
* enhancement</p>
+ * <p>Edge/sharpness/detail enhancement. OFF means no
+ * enhancement will be applied by the HAL.</p>
+ * <p>FAST/HIGH_QUALITY both mean HAL-determined enhancement
+ * will be applied. HIGH_QUALITY mode indicates that the
+ * HAL should use the highest-quality enhancement algorithms,
+ * even if it slows down capture rate. FAST means the HAL should
+ * not slow down capture rate when applying edge enhancement.</p>
* @see #EDGE_MODE_OFF
* @see #EDGE_MODE_FAST
* @see #EDGE_MODE_HIGH_QUALITY
@@ -764,6 +771,13 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable {
/**
* <p>Mode of operation for the noise reduction
* algorithm</p>
+ * <p>Noise filtering control. OFF means no noise reduction
+ * will be applied by the HAL.</p>
+ * <p>FAST/HIGH_QUALITY both mean HAL-determined noise filtering
+ * will be applied. HIGH_QUALITY mode indicates that the HAL
+ * should use the highest-quality noise filtering algorithms,
+ * even if it slows down capture rate. FAST means the HAL should not
+ * slow down capture rate when applying noise filtering.</p>
* @see #NOISE_REDUCTION_MODE_OFF
* @see #NOISE_REDUCTION_MODE_FAST
* @see #NOISE_REDUCTION_MODE_HIGH_QUALITY
diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java
index 54c69ec242fb..6119fa4b2957 100644
--- a/core/java/android/hardware/camera2/CaptureResult.java
+++ b/core/java/android/hardware/camera2/CaptureResult.java
@@ -348,6 +348,13 @@ public final class CaptureResult extends CameraMetadata {
/**
* <p>Operation mode for edge
* enhancement</p>
+ * <p>Edge/sharpness/detail enhancement. OFF means no
+ * enhancement will be applied by the HAL.</p>
+ * <p>FAST/HIGH_QUALITY both mean HAL-determined enhancement
+ * will be applied. HIGH_QUALITY mode indicates that the
+ * HAL should use the highest-quality enhancement algorithms,
+ * even if it slows down capture rate. FAST means the HAL should
+ * not slow down capture rate when applying edge enhancement.</p>
* @see #EDGE_MODE_OFF
* @see #EDGE_MODE_FAST
* @see #EDGE_MODE_HIGH_QUALITY
@@ -487,6 +494,13 @@ public final class CaptureResult extends CameraMetadata {
/**
* <p>Mode of operation for the noise reduction
* algorithm</p>
+ * <p>Noise filtering control. OFF means no noise reduction
+ * will be applied by the HAL.</p>
+ * <p>FAST/HIGH_QUALITY both mean HAL-determined noise filtering
+ * will be applied. HIGH_QUALITY mode indicates that the HAL
+ * should use the highest-quality noise filtering algorithms,
+ * even if it slows down capture rate. FAST means the HAL should not
+ * slow down capture rate when applying noise filtering.</p>
* @see #NOISE_REDUCTION_MODE_OFF
* @see #NOISE_REDUCTION_MODE_FAST
* @see #NOISE_REDUCTION_MODE_HIGH_QUALITY