Merge "Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG" into klp-dev
This commit is contained in:
@@ -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 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 stopRepeating() throws android.hardware.camera2.CameraAccessException;
|
||||||
method public abstract void waitUntilIdle() 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_PREVIEW = 1; // 0x1
|
||||||
field public static final int TEMPLATE_RECORD = 3; // 0x3
|
field public static final int TEMPLATE_RECORD = 3; // 0x3
|
||||||
field public static final int TEMPLATE_STILL_CAPTURE = 2; // 0x2
|
field public static final int TEMPLATE_STILL_CAPTURE = 2; // 0x2
|
||||||
|
|||||||
@@ -88,6 +88,16 @@ public interface CameraDevice extends AutoCloseable {
|
|||||||
*/
|
*/
|
||||||
public static final int TEMPLATE_VIDEO_SNAPSHOT = 4;
|
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
|
* A basic template for direct application control of capture
|
||||||
* parameters. All automatic control is disabled (auto-exposure, auto-white
|
* 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.
|
* application depending on the intended use case.
|
||||||
*
|
*
|
||||||
* @see #createCaptureRequest
|
* @see #createCaptureRequest
|
||||||
|
* @hide
|
||||||
*/
|
*/
|
||||||
public static final int TEMPLATE_MANUAL = 5;
|
public static final int TEMPLATE_MANUAL = 6;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the ID of this camera device.
|
* Get the ID of this camera device.
|
||||||
|
|||||||
Reference in New Issue
Block a user