diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-04-09 19:04:31 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2014-04-09 19:04:31 -0700 |
| commit | e30adb762ad17fc49fd3f7c1aa9ba6bd24bc43a0 (patch) | |
| tree | 940833519e70a4a345df0705e884785efa740398 /core/java/android/hardware/camera2 | |
| parent | 9817ddd420aaa885f92f778ae2cfd17e6a71bc87 (diff) | |
| download | frameworks_base-e30adb762ad17fc49fd3f7c1aa9ba6bd24bc43a0.zip frameworks_base-e30adb762ad17fc49fd3f7c1aa9ba6bd24bc43a0.tar.gz frameworks_base-e30adb762ad17fc49fd3f7c1aa9ba6bd24bc43a0.tar.bz2 | |
Camera2: Add MANUAL capture intent
Change-Id: I6a3ba818cc7d13e0fcf0d90a16c53884b6cc20ab
Diffstat (limited to 'core/java/android/hardware/camera2')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraMetadata.java | 11 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureRequest.java | 9 |
2 files changed, 18 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index 1e34498..9b1bc53 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -940,6 +940,17 @@ public abstract class CameraMetadata { */ public static final int CONTROL_CAPTURE_INTENT_ZERO_SHUTTER_LAG = 5; + /** + * <p>This request is for manual capture use case where + * the applications want to directly control the capture parameters + * (e.g. {@link CaptureRequest#SENSOR_EXPOSURE_TIME android.sensor.exposureTime}, {@link CaptureRequest#SENSOR_SENSITIVITY android.sensor.sensitivity} etc.).</p> + * + * @see CaptureRequest#SENSOR_EXPOSURE_TIME + * @see CaptureRequest#SENSOR_SENSITIVITY + * @see CaptureRequest#CONTROL_CAPTURE_INTENT + */ + public static final int CONTROL_CAPTURE_INTENT_MANUAL = 6; + // // Enumeration values for CaptureRequest#CONTROL_EFFECT_MODE // diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index 7656505..c4e342c 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -714,16 +714,21 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { * auto-focus, auto-white balance) routines about the purpose * of this capture, to help the camera device to decide optimal 3A * strategy.</p> - * <p>This control is only effective if <code>{@link CaptureRequest#CONTROL_MODE android.control.mode} != OFF</code> - * and any 3A routine is active.</p> + * <p>This control (except for MANUAL) is only effective if + * <code>{@link CaptureRequest#CONTROL_MODE android.control.mode} != OFF</code> and any 3A routine is active.</p> + * <p>ZERO_SHUTTER_LAG must be supported if {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} + * contains ZSL. MANUAL must be supported if {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} + * contains MANUAL_SENSOR.</p> * * @see CaptureRequest#CONTROL_MODE + * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES * @see #CONTROL_CAPTURE_INTENT_CUSTOM * @see #CONTROL_CAPTURE_INTENT_PREVIEW * @see #CONTROL_CAPTURE_INTENT_STILL_CAPTURE * @see #CONTROL_CAPTURE_INTENT_VIDEO_RECORD * @see #CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT * @see #CONTROL_CAPTURE_INTENT_ZERO_SHUTTER_LAG + * @see #CONTROL_CAPTURE_INTENT_MANUAL */ public static final Key<Integer> CONTROL_CAPTURE_INTENT = new Key<Integer>("android.control.captureIntent", int.class); |