diff options
| author | 2017-05-08 22:28:29 +0000 | |
|---|---|---|
| committer | 2017-05-08 22:28:38 +0000 | |
| commit | 9414a25592de67508143a1fd7a98136d90371894 (patch) | |
| tree | dedf5bee6bd02b0522cd086e1681bb41c6e8cc1e | |
| parent | 2e0d4551774a916885c63491c14007d5b12d4ac7 (diff) | |
| parent | 6828bb92bd9e5eeb3aa6d049a37e5ddec5dab355 (diff) | |
Merge changes from topic 'enableZslApi' into oc-dev
* changes:
camera: Clarify TEMPLATE_ZERO_SHUTTER_LAG
camera: Clarify ZSL supports
| -rw-r--r-- | core/java/android/hardware/camera2/CameraDevice.java | 4 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureRequest.java | 1 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureResult.java | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/CameraDevice.java b/core/java/android/hardware/camera2/CameraDevice.java index 211d54d1673f..63eedf539bfe 100644 --- a/core/java/android/hardware/camera2/CameraDevice.java +++ b/core/java/android/hardware/camera2/CameraDevice.java @@ -107,7 +107,8 @@ public abstract class CameraDevice implements AutoCloseable { /** * Create a request suitable for zero shutter lag still capture. This means * means maximizing image quality without compromising preview frame rate. - * AE/AWB/AF should be on auto mode. + * AE/AWB/AF should be on auto mode. This is intended for application-operated ZSL. For + * device-operated ZSL, use {@link CaptureRequest#CONTROL_ENABLE_ZSL} if available. * This template is guaranteed to be supported on camera devices that support the * {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_PRIVATE_REPROCESSING PRIVATE_REPROCESSING} * capability or the @@ -115,6 +116,7 @@ public abstract class CameraDevice implements AutoCloseable { * capability. * * @see #createCaptureRequest + * @see CaptureRequest#CONTROL_ENABLE_ZSL */ public static final int TEMPLATE_ZERO_SHUTTER_LAG = 5; diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index 279d73d215e3..c41fc0207d92 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -1669,6 +1669,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * <code>false</code> if present.</p> * <p>For applications targeting SDK versions older than O, the value of enableZsl in all * capture templates is always <code>false</code> if present.</p> + * <p>For application-operated ZSL, use CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG template.</p> * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> * * @see CaptureRequest#CONTROL_CAPTURE_INTENT diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index aedfc4b702a7..6d80c20a84af 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -2174,6 +2174,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <code>false</code> if present.</p> * <p>For applications targeting SDK versions older than O, the value of enableZsl in all * capture templates is always <code>false</code> if present.</p> + * <p>For application-operated ZSL, use CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG template.</p> * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> * * @see CaptureRequest#CONTROL_CAPTURE_INTENT |