Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4fe6429b: Merge "Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG" into klp-dev

Browse Source 
* commit '4fe6429ba2c77a2cc639d712ba979e1f538c5bb1':
  Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG
This commit is contained in:
Rachad Alao
2013-09-13 17:16:05 -07:00
committed by Android Git Automerger
parent 56cb98e8f1 4fe6429ba2
commit 00b3f942e4
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -10822,7 +10822,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

13
core/java/android/hardware/camera2/CameraDevice.java
View File

@@ -88,6 +88,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
@@ -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.