diff options
| author | 2013-09-13 11:32:20 -0700 | |
|---|---|---|
| committer | 2013-09-13 13:27:03 -0700 | |
| commit | bbae94a02e73020646535b0d915f4557c39f357b (patch) | |
| tree | 8c0d0bd13185dcfc144423e2836a1f29ef84ce68 | |
| parent | 074dc2eb2da23976bc2916cfe7c61dfcd9977e8f (diff) | |
Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG
It collides with HAL ZSL template, rename it to TEMPLATE_ZERO_SHUTTER_LAG and
hide it for now.
Bug: 10690122
Change-Id: I793154849aa7aa4bf4874e2ff3f3890dd05b1f9e
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CameraDevice.java | 13 |
2 files changed, 12 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 91fcab1e8a7d..f5aa0ec7d902 100644 --- a/api/current.txt +++ b/api/current.txt @@ -10827,7 +10827,6 @@ package android.hardware.camera2 { method public abstract void setRepeatingRequest(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraDevice.CaptureListener, android.os.Handler) throws android.hardware.camera2.CameraAccessException; method public abstract void stopRepeating() throws android.hardware.camera2.CameraAccessException; method public abstract void waitUntilIdle() throws android.hardware.camera2.CameraAccessException; - field public static final int TEMPLATE_MANUAL = 5; // 0x5 field public static final int TEMPLATE_PREVIEW = 1; // 0x1 field public static final int TEMPLATE_RECORD = 3; // 0x3 field public static final int TEMPLATE_STILL_CAPTURE = 2; // 0x2 diff --git a/core/java/android/hardware/camera2/CameraDevice.java b/core/java/android/hardware/camera2/CameraDevice.java index 75c0f7da08db..0c13b0f61e72 100644 --- a/core/java/android/hardware/camera2/CameraDevice.java +++ b/core/java/android/hardware/camera2/CameraDevice.java @@ -89,6 +89,16 @@ public interface CameraDevice extends AutoCloseable { public static final int TEMPLATE_VIDEO_SNAPSHOT = 4; /** + * 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. + * + * @see #createCaptureRequest + * @hide + */ + public static final int TEMPLATE_ZERO_SHUTTER_LAG = 5; + + /** * A basic template for direct application control of capture * parameters. All automatic control is disabled (auto-exposure, auto-white * balance, auto-focus), and post-processing parameters are set to preview @@ -97,8 +107,9 @@ public interface CameraDevice extends AutoCloseable { * application depending on the intended use case. * * @see #createCaptureRequest + * @hide */ - public static final int TEMPLATE_MANUAL = 5; + public static final int TEMPLATE_MANUAL = 6; /** * Get the ID of this camera device. |