diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-07-17 19:34:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-17 02:40:09 +0000 |
| commit | 7040e9f7fe3e5c9fbd0084eff01b4ce8ae1a16b1 (patch) | |
| tree | c0c9a98e5a23a3873c93418b0782658e79949489 /core/java/android/hardware | |
| parent | 2f906e94c857403b77a96f8dde009002c2371139 (diff) | |
| parent | 611fecec08eb9efeb4393b986d590369df5c812f (diff) | |
| download | frameworks_base-7040e9f7fe3e5c9fbd0084eff01b4ce8ae1a16b1.zip frameworks_base-7040e9f7fe3e5c9fbd0084eff01b4ce8ae1a16b1.tar.gz frameworks_base-7040e9f7fe3e5c9fbd0084eff01b4ce8ae1a16b1.tar.bz2 | |
Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 8 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CameraMetadata.java | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 4976a48..ff86120 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -887,7 +887,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see #REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE * @see #REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR * @see #REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING - * @see #REQUEST_AVAILABLE_CAPABILITIES_DNG + * @see #REQUEST_AVAILABLE_CAPABILITIES_RAW */ public static final Key<int[]> REQUEST_AVAILABLE_CAPABILITIES = new Key<int[]>("android.request.availableCapabilities", int[].class); @@ -1068,17 +1068,17 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * <tr> * <td align="left">RAW_OPAQUE</td> * <td align="left">RAW16</td> - * <td align="left">DNG</td> + * <td align="left">RAW</td> * </tr> * <tr> * <td align="left">RAW16</td> * <td align="left">YUV_420_888</td> - * <td align="left">DNG</td> + * <td align="left">RAW</td> * </tr> * <tr> * <td align="left">RAW16</td> * <td align="left">JPEG</td> - * <td align="left">DNG</td> + * <td align="left">RAW</td> * </tr> * </tbody> * </table> diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index 36b1089..63130a7 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -387,8 +387,11 @@ public abstract class CameraMetadata<TKey> { public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING = 2; /** - * <p>The camera device supports outputting RAW buffers that can be - * saved offline into a DNG format.</p> + * <p>The camera device supports outputting RAW buffers and + * metadata for interpreting them.</p> + * <p>Devices supporting the RAW capability allow both for + * saving DNG files, and for direct application processing of + * raw sensor images.</p> * <ul> * <li>RAW_SENSOR is supported as an output format.</li> * <li>The maximum available resolution for RAW_SENSOR streams @@ -403,7 +406,7 @@ public abstract class CameraMetadata<TKey> { * @see CameraCharacteristics#SENSOR_INFO_PIXEL_ARRAY_SIZE * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES */ - public static final int REQUEST_AVAILABLE_CAPABILITIES_DNG = 3; + public static final int REQUEST_AVAILABLE_CAPABILITIES_RAW = 3; /** * <p>The camera device supports the Zero Shutter Lag use case.</p> @@ -1186,8 +1189,7 @@ public abstract class CameraMetadata<TKey> { * image while recording video) use case.</p> * <p>The camera device should take the highest-quality image * possible (given the other settings) without disrupting the - * frame rate of video recording.<br /> - * </p> + * frame rate of video recording. </p> * @see CaptureRequest#CONTROL_CAPTURE_INTENT */ public static final int CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT = 4; |