diff options
| author | 2017-08-02 22:59:25 +0000 | |
|---|---|---|
| committer | 2017-08-02 22:59:25 +0000 | |
| commit | 334e733ea2f53d020e77e5cead189a529d7ee61f (patch) | |
| tree | 8440fabe5a84c451eb7d8a5fe60d786842157694 | |
| parent | 988a6dd5e312ace695ae4f67732f96d69fc29f32 (diff) | |
| parent | cd1cb8331442cc6e41a94c964886859a6567a108 (diff) | |
Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: 615f9e1277" into oc-mr1-dev
| -rw-r--r-- | core/java/android/hardware/camera2/CameraDevice.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/core/java/android/hardware/camera2/CameraDevice.java b/core/java/android/hardware/camera2/CameraDevice.java index 63eedf539bfe..55343a2904f2 100644 --- a/core/java/android/hardware/camera2/CameraDevice.java +++ b/core/java/android/hardware/camera2/CameraDevice.java @@ -73,8 +73,10 @@ public abstract class CameraDevice implements AutoCloseable { * Create a request suitable for still image capture. Specifically, this * means prioritizing image quality over frame rate. These requests would * commonly be used with the {@link CameraCaptureSession#capture} method. - * This template is guaranteed to be supported on all camera devices. - * + * This template is guaranteed to be supported on all camera devices except + * {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT DEPTH_OUTPUT} devices + * that are not {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE + * BACKWARD_COMPATIBLE}. * @see #createCaptureRequest */ public static final int TEMPLATE_STILL_CAPTURE = 2; @@ -84,7 +86,10 @@ public abstract class CameraDevice implements AutoCloseable { * that a stable frame rate is used, and post-processing is set for * recording quality. These requests would commonly be used with the * {@link CameraCaptureSession#setRepeatingRequest} method. - * This template is guaranteed to be supported on all camera devices. + * This template is guaranteed to be supported on all camera devices except + * {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT DEPTH_OUTPUT} devices + * that are not {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE + * BACKWARD_COMPATIBLE}. * * @see #createCaptureRequest */ @@ -98,7 +103,10 @@ public abstract class CameraDevice implements AutoCloseable { * {@link #TEMPLATE_RECORD} is is in use with {@link CameraCaptureSession#setRepeatingRequest}. * This template is guaranteed to be supported on all camera devices except * legacy devices ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL} - * {@code == }{@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY LEGACY}) + * {@code == }{@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY LEGACY}) and + * {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT DEPTH_OUTPUT} devices + * that are not {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE + * BACKWARD_COMPATIBLE}. * * @see #createCaptureRequest */ |