diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-07-04 17:06:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-02 18:22:50 +0000 |
| commit | 9810f39717f3625222af9d710f7d8f5acca28449 (patch) | |
| tree | 481046e879717a06148761968810da84ca91e4f8 | |
| parent | 0bc5a6b6b34d009a571687cb6c958611290ecb75 (diff) | |
| parent | ea1727c9e1760bebbe894b950f94cad91da416cc (diff) | |
| download | frameworks_base-9810f39717f3625222af9d710f7d8f5acca28449.zip frameworks_base-9810f39717f3625222af9d710f7d8f5acca28449.tar.gz frameworks_base-9810f39717f3625222af9d710f7d8f5acca28449.tar.bz2 | |
Merge "Camera2: update spec for RAW10"
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 10 |
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 > 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} |