diff options
| author | 2014-06-13 21:41:15 +0000 | |
|---|---|---|
| committer | 2014-06-13 21:09:46 +0000 | |
| commit | 0cb41fd5ad37a1a9aaedb737491fa71310ef2ddc (patch) | |
| tree | 20f3620170ee5fa7c0a24d710cfde454982a4ba8 | |
| parent | 2b3818e9a8915711af80f746a6373cbd4456595d (diff) | |
| parent | 0bda31afe06a05144a31ce47adbc54694ec24228 (diff) | |
Merge "Camera2: Add rollingShutterSkew tag"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureResult.java | 16 |
2 files changed, 16 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 941eb5b2b9df..b7a4a3e0fa48 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12663,6 +12663,7 @@ package android.hardware.camera2 { field public static final android.hardware.camera2.CaptureResult.Key SENSOR_FRAME_DURATION; field public static final android.hardware.camera2.CaptureResult.Key SENSOR_GREEN_SPLIT; field public static final android.hardware.camera2.CaptureResult.Key SENSOR_NEUTRAL_COLOR_POINT; + field public static final android.hardware.camera2.CaptureResult.Key SENSOR_ROLLING_SHUTTER_SKEW; field public static final android.hardware.camera2.CaptureResult.Key SENSOR_SENSITIVITY; field public static final android.hardware.camera2.CaptureResult.Key SENSOR_TEST_PATTERN_DATA; field public static final android.hardware.camera2.CaptureResult.Key SENSOR_TEST_PATTERN_MODE; diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 3d17ed37aeb0..01fea540ebf1 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -2114,7 +2114,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { /** * <p>Time at start of exposure of first - * row of the image sensor, in nanoseconds.</p> + * row of the image sensor active array, in nanoseconds.</p> * <p>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 @@ -2215,6 +2215,20 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { new Key<Integer>("android.sensor.testPatternMode", int.class); /** + * <p>Duration between the start of first row exposure + * and the start of last row exposure.</p> + * <p>This is the exposure time skew (in the unit of nanosecond) between the first and + * last row exposure start times. The first row and the last row are the first + * and last rows inside of the {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.</p> + * <p>For typical camera sensors that use rolling shutters, this is also equivalent + * to the frame readout time.</p> + * + * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE + */ + public static final Key<Long> SENSOR_ROLLING_SHUTTER_SKEW = + new Key<Long>("android.sensor.rollingShutterSkew", long.class); + + /** * <p>Quality of lens shading correction applied * to the image data.</p> * <p>When set to OFF mode, no lens shading correction will be applied by the |