diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-03-31 18:27:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-31 18:27:23 +0000 |
| commit | 37ec99b19ce7a5d40d16ccc2f578aca66bd7a25d (patch) | |
| tree | c41d363a020319059c9437615c5cac0f1c0a3589 /core/java/android/hardware | |
| parent | 7744a25673a46eadf71a27e8283d7529a88fcca6 (diff) | |
| parent | 11d444f0b789ead8b10506d24956d243274c724b (diff) | |
| download | frameworks_base-37ec99b19ce7a5d40d16ccc2f578aca66bd7a25d.zip frameworks_base-37ec99b19ce7a5d40d16ccc2f578aca66bd7a25d.tar.gz frameworks_base-37ec99b19ce7a5d40d16ccc2f578aca66bd7a25d.tar.bz2 | |
Merge "Add RAW12 image format"
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index a0217c2..1503bf5 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -991,7 +991,8 @@ 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, ImageFormat#RAW10 and ImageFormat#RAW_OPAQUE.</li> + * <li>Raw formats: ImageFormat#RAW_SENSOR, ImageFormat#RAW10, ImageFormat#RAW12, + * 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> @@ -1023,6 +1024,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * <ul> * <li>ImageFormat#RAW_SENSOR</li> * <li>ImageFormat#RAW10</li> + * <li>ImageFormat#RAW12</li> * <li>Opaque <code>RAW</code></li> * </ul> * <p>LEGACY mode devices ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} <code>==</code> LEGACY) |