summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2014-07-04 10:01:02 -0700
committerZhijun He <zhijunhe@google.com>2014-07-04 10:03:53 -0700
commitea1727c9e1760bebbe894b950f94cad91da416cc (patch)
treed487b02ae121c52cbf94950b9b56399bce5fd30f
parent8740c6f37b0deafac7a8f681f982b29c5055b86b (diff)
downloadframeworks_base-ea1727c9e1760bebbe894b950f94cad91da416cc.zip
frameworks_base-ea1727c9e1760bebbe894b950f94cad91da416cc.tar.gz
frameworks_base-ea1727c9e1760bebbe894b950f94cad91da416cc.tar.bz2
Camera2: update spec for RAW10
Bug: 15989722 Change-Id: Ia94e7b3080eb0d4ac088e0d4fc297f513ab2cf3a
-rw-r--r--core/java/android/hardware/camera2/CameraCharacteristics.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java
index db08d6c..c9a88f8 100644
--- a/core/java/android/hardware/camera2/CameraCharacteristics.java
+++ b/core/java/android/hardware/camera2/CameraCharacteristics.java
@@ -692,7 +692,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
* <ul>
* <li>Processed (but stalling): any non-RAW format with a stallDurations &gt; 0.
* Typically JPEG format (ImageFormat#JPEG).</li>
- * <li>Raw formats: ImageFormat#RAW_SENSOR and ImageFormat#RAW_OPAQUE.</li>
+ * <li>Raw formats: ImageFormat#RAW_SENSOR, ImageFormat#RAW10 and ImageFormat#RAW_OPAQUE.</li>
* <li>Processed (but not-stalling): any non-RAW format without a stall duration.
* Typically ImageFormat#YUV_420_888, ImageFormat#NV21, ImageFormat#YV12.</li>
* </ul>
@@ -714,6 +714,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
* <p>In particular, a <code>RAW</code> format is typically one of:</p>
* <ul>
* <li>ImageFormat#RAW_SENSOR</li>
+ * <li>ImageFormat#RAW10</li>
* <li>Opaque <code>RAW</code></li>
* </ul>
*
@@ -1213,13 +1214,12 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
* ignored).</p>
* <p>The following formats may always have a stall duration:</p>
* <ul>
- * <li>JPEG</li>
- * <li>RAW16</li>
+ * <li>ImageFormat#JPEG</li>
+ * <li>ImageFormat#RAW_SENSOR</li>
* </ul>
* <p>The following formats will never have a stall duration:</p>
* <ul>
- * <li>YUV_420_888</li>
- * <li>IMPLEMENTATION_DEFINED</li>
+ * <li>ImageFormat#YUV_420_888</li>
* </ul>
* <p>All other formats may or may not have an allowed stall duration on
* a per-capability basis; refer to {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities}