From 45fa43a1815e2d0a25ed3a126e4e732a03b7ed7f Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Fri, 13 Jun 2014 18:29:37 -0700 Subject: Camera2: Add timestampCalibration tag Also update the video/optical stabilization docs. Change-Id: I444cc8d46c0a460bc4311e58bf6166b5c6dbfd14 --- .../hardware/camera2/CameraCharacteristics.java | 12 +++++++ .../android/hardware/camera2/CameraMetadata.java | 27 ++++++++++++++ .../android/hardware/camera2/CaptureRequest.java | 20 +++++++++-- .../android/hardware/camera2/CaptureResult.java | 41 +++++++++++++++++----- 4 files changed, 89 insertions(+), 11 deletions(-) (limited to 'core/java/android/hardware') diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 9eea545..4a87680 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -1423,6 +1423,18 @@ public final class CameraCharacteristics extends CameraMetadata("android.sensor.info.whiteLevel", int.class); /** + *

The sensor timestamp calibration quality.

+ *

The sensor timestamp calibration quality determines the reliability of + * {@link CaptureResult#SENSOR_TIMESTAMP android.sensor.timestamp} provided by the camera device.

+ * + * @see CaptureResult#SENSOR_TIMESTAMP + * @see #SENSOR_INFO_TIMESTAMP_CALIBRATION_UNCALIBRATED + * @see #SENSOR_INFO_TIMESTAMP_CALIBRATION_CALIBRATED + */ + public static final Key SENSOR_INFO_TIMESTAMP_CALIBRATION = + new Key("android.sensor.info.timestampCalibration", int.class); + + /** *

The standard reference illuminant used as the scene light source when * calculating the {@link CameraCharacteristics#SENSOR_COLOR_TRANSFORM1 android.sensor.colorTransform1}, * {@link CameraCharacteristics#SENSOR_CALIBRATION_TRANSFORM1 android.sensor.calibrationTransform1}, and diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index 33e1915..5a02435 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -419,6 +419,33 @@ public abstract class CameraMetadata { public static final int SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_RGB = 4; // + // Enumeration values for CameraCharacteristics#SENSOR_INFO_TIMESTAMP_CALIBRATION + // + + /** + *

Timestamps from {@link CaptureResult#SENSOR_TIMESTAMP android.sensor.timestamp} are in nanoseconds and monotonic, + * but can not be compared to timestamps from other subsystems + * (e.g. accelerometer, gyro etc.), or other instances of the same or different + * camera devices in the same system. Timestamps between streams and results for + * a single camera instance are comparable, and the timestamps for all buffers + * and the result metadata generated by a single capture are identical.

+ * + * @see CaptureResult#SENSOR_TIMESTAMP + * @see CameraCharacteristics#SENSOR_INFO_TIMESTAMP_CALIBRATION + */ + public static final int SENSOR_INFO_TIMESTAMP_CALIBRATION_UNCALIBRATED = 0; + + /** + *

Timestamps from {@link CaptureResult#SENSOR_TIMESTAMP android.sensor.timestamp} are in the same timebase as + * android.os.SystemClock#elapsedRealtimeNanos(), + * and they can be compared to other timestamps using that base.

+ * + * @see CaptureResult#SENSOR_TIMESTAMP + * @see CameraCharacteristics#SENSOR_INFO_TIMESTAMP_CALIBRATION + */ + public static final int SENSOR_INFO_TIMESTAMP_CALIBRATION_CALIBRATED = 1; + + // // Enumeration values for CameraCharacteristics#SENSOR_REFERENCE_ILLUMINANT1 // diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index bf7bd37..2cfb611 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -1020,9 +1020,17 @@ public final class CaptureRequest extends CameraMetadata> *

Video stabilization automatically translates and scales images from the camera * in order to stabilize motion between consecutive frames.

*

If enabled, video stabilization can modify the - * {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} to keep the video stream - * stabilized

+ * {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} to keep the video stream stabilized.

+ *

Switching between different video stabilization modes may take several frames + * to initialize, the camera device will report the current mode in capture result + * metadata. For example, When "ON" mode is requested, the video stabilization modes + * in the first several capture results may still be "OFF", and it will become "ON" + * when the initialization is done.

+ *

If a camera device supports both this mode and OIS ({@link CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE android.lens.opticalStabilizationMode}), + * turning both modes on may produce undesirable interaction, so it is recommended not to + * enable both at the same time.

* + * @see CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE * @see CaptureRequest#SCALER_CROP_REGION * @see #CONTROL_VIDEO_STABILIZATION_MODE_OFF * @see #CONTROL_VIDEO_STABILIZATION_MODE_ON @@ -1258,6 +1266,14 @@ public final class CaptureRequest extends CameraMetadata> * makes use of mechanical elements to stabilize the camera * sensor, and thus allows for longer exposure times before * camera shake becomes apparent.

+ *

Switching between different optical stabilization modes may take several + * frames to initialize, the camera device will report the current mode in + * capture result metadata. For example, When "ON" mode is requested, the + * optical stabilization modes in the first several capture results may still + * be "OFF", and it will become "ON" when the initialization is done.

+ *

If a camera device supports both OIS and EIS ({@link CaptureRequest#CONTROL_VIDEO_STABILIZATION_MODE android.control.videoStabilizationMode}), + * turning both modes on may produce undesirable interaction, so it is recommended not + * to enable both at the same time.

*

Not all devices will support OIS; see * {@link CameraCharacteristics#LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION android.lens.info.availableOpticalStabilization} for * available controls.

diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 3d17ed3..65b6627 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -1591,9 +1591,17 @@ public class CaptureResult extends CameraMetadata> { *

Video stabilization automatically translates and scales images from the camera * in order to stabilize motion between consecutive frames.

*

If enabled, video stabilization can modify the - * {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} to keep the video stream - * stabilized

- * + * {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} to keep the video stream stabilized.

+ *

Switching between different video stabilization modes may take several frames + * to initialize, the camera device will report the current mode in capture result + * metadata. For example, When "ON" mode is requested, the video stabilization modes + * in the first several capture results may still be "OFF", and it will become "ON" + * when the initialization is done.

+ *

If a camera device supports both this mode and OIS ({@link CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE android.lens.opticalStabilizationMode}), + * turning both modes on may produce undesirable interaction, so it is recommended not to + * enable both at the same time.

+ * + * @see CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE * @see CaptureRequest#SCALER_CROP_REGION * @see #CONTROL_VIDEO_STABILIZATION_MODE_OFF * @see #CONTROL_VIDEO_STABILIZATION_MODE_ON @@ -1846,6 +1854,14 @@ public class CaptureResult extends CameraMetadata> { * makes use of mechanical elements to stabilize the camera * sensor, and thus allows for longer exposure times before * camera shake becomes apparent.

+ *

Switching between different optical stabilization modes may take several + * frames to initialize, the camera device will report the current mode in + * capture result metadata. For example, When "ON" mode is requested, the + * optical stabilization modes in the first several capture results may still + * be "OFF", and it will become "ON" when the initialization is done.

+ *

If a camera device supports both OIS and EIS ({@link CaptureRequest#CONTROL_VIDEO_STABILIZATION_MODE android.control.videoStabilizationMode}), + * turning both modes on may produce undesirable interaction, so it is recommended not + * to enable both at the same time.

*

Not all devices will support OIS; see * {@link CameraCharacteristics#LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION android.lens.info.availableOpticalStabilization} for * available controls.

@@ -2117,12 +2133,19 @@ public class CaptureResult extends CameraMetadata> { * row of the image sensor, in nanoseconds.

*

The timestamps are also included in all image * buffers produced for the same capture, and will be identical - * on all the outputs. The timestamps measure time since an - * unspecified starting point, and are monotonically - * increasing.

- *

They can be compared with the timestamps for other captures - * from the same camera device, but are not guaranteed to be - * comparable to any other time source.

+ * on all the outputs.

+ *

When {@link CameraCharacteristics#SENSOR_INFO_TIMESTAMP_CALIBRATION android.sensor.info.timestampCalibration} == UNCALIBRATED, + * the timestamps measure time since an unspecified starting point, + * and are monotonically increasing. They can be compared with the + * timestamps for other captures from the same camera device, but are + * not guaranteed to be comparable to any other time source.

+ *

When {@link CameraCharacteristics#SENSOR_INFO_TIMESTAMP_CALIBRATION android.sensor.info.timestampCalibration} == CALIBRATED, + * the timestamps measure time in the same timebase as + * android.os.SystemClock#elapsedRealtimeNanos(), and they can be + * compared to other timestamps from other subsystems that are using + * that base.

+ * + * @see CameraCharacteristics#SENSOR_INFO_TIMESTAMP_CALIBRATION */ public static final Key SENSOR_TIMESTAMP = new Key("android.sensor.timestamp", long.class); -- cgit v1.1