diff options
| author | Chien-Yu Chen <cychen@google.com> | 2015-07-08 20:34:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-08 20:35:00 +0000 |
| commit | 3bbcc46d54f667ec7529a051f1bb9cbfd9f5fed0 (patch) | |
| tree | 61e7441908cd347c8dca72ec846d6013b336aee5 /core | |
| parent | 4ccf69e1191244ee104edd74843fc7ae391c5270 (diff) | |
| parent | 72333917a7802d2a1f233418a0e2c15d7e86a357 (diff) | |
| download | frameworks_base-3bbcc46d54f667ec7529a051f1bb9cbfd9f5fed0.zip frameworks_base-3bbcc46d54f667ec7529a051f1bb9cbfd9f5fed0.tar.gz frameworks_base-3bbcc46d54f667ec7529a051f1bb9cbfd9f5fed0.tar.bz2 | |
Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 6 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CameraMetadata.java | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 6c74a9f..547cce4 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -738,7 +738,9 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri /** * <p>List of edge enhancement modes for {@link CaptureRequest#EDGE_MODE android.edge.mode} that are supported by this camera * device.</p> - * <p>Full-capability camera devices must always support OFF; all devices will list FAST.</p> + * <p>Full-capability camera devices must always support OFF; camera devices that support + * YUV_REPROCESSING or PRIVATE_REPROCESSING will list ZERO_SHUTTER_LAG; all devices will + * list FAST.</p> * <p><b>Range of valid values:</b><br> * Any value listed in {@link CaptureRequest#EDGE_MODE android.edge.mode}</p> * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> @@ -1176,6 +1178,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * <p>List of noise reduction modes for {@link CaptureRequest#NOISE_REDUCTION_MODE android.noiseReduction.mode} that are supported * by this camera device.</p> * <p>Full-capability camera devices will always support OFF and FAST.</p> + * <p>Camera devices that support YUV_REPROCESSING or PRIVATE_REPROCESSING will support + * ZERO_SHUTTER_LAG.</p> * <p>Legacy-capability camera devices will only support FAST mode.</p> * <p><b>Range of valid values:</b><br> * Any value listed in {@link CaptureRequest#NOISE_REDUCTION_MODE android.noiseReduction.mode}</p> diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index f7c6274..0aa6447 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -2024,7 +2024,8 @@ public abstract class CameraMetadata<TKey> { * reasonable preview quality.</p> * <p>This mode is guaranteed to be supported by devices that support either the * YUV_REPROCESSING or PRIVATE_REPROCESSING capabilities - * ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} lists either of those capabilities).</p> + * ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} lists either of those capabilities) and it will + * be the default mode for CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG template.</p> * * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES * @see CaptureRequest#EDGE_MODE @@ -2154,7 +2155,8 @@ public abstract class CameraMetadata<TKey> { * applied for reasonable preview quality.</p> * <p>This mode is guaranteed to be supported by devices that support either the * YUV_REPROCESSING or PRIVATE_REPROCESSING capabilities - * ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} lists either of those capabilities).</p> + * ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} lists either of those capabilities) and it will + * be the default mode for CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG template.</p> * * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES * @see CaptureRequest#NOISE_REDUCTION_MODE |