Merge "Camera: Update MOTION_TRACKING requirements"

This commit is contained in:
TreeHugger Robot
2018-01-19 06:08:23 +00:00
committed by Android (Google) Code Review

View File

@@ -183,7 +183,9 @@ public abstract class CameraDevice implements AutoCloseable {
TEMPLATE_RECORD,
TEMPLATE_VIDEO_SNAPSHOT,
TEMPLATE_ZERO_SHUTTER_LAG,
TEMPLATE_MANUAL })
TEMPLATE_MANUAL,
TEMPLATE_MOTION_TRACKING_PREVIEW,
TEMPLATE_MOTION_TRACKING_BEST})
public @interface RequestTemplate {};
/**
@@ -424,14 +426,17 @@ public abstract class CameraDevice implements AutoCloseable {
* {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED LIMITED} devices. The
* {@code FULL FOV 640} entry means that the device will support a resolution that's 640 pixels
* wide, with the height set so that the resolution aspect ratio matches the MAXIMUM output
* aspect ratio. So for a device with a 4:3 image sensor, this will be 640x480, and for a
* device with a 16:9 sensor, this will be 640x360, and so on.
* aspect ratio, rounded down. So for a device with a 4:3 image sensor, this will be 640x480,
* and for a device with a 16:9 sensor, this will be 640x360, and so on. And the
* {@code MAX 30FPS} entry means the largest JPEG resolution on the device for which
* {@link android.hardware.camera2.params.StreamConfigurationMap#getOutputMinFrameDuration}
* returns a value less than or equal to 1/30s.
*
* <table>
* <tr><th colspan="7">MOTION_TRACKING-capability additional guaranteed configurations</th></tr>
* <tr><th colspan="2" id="rb">Target 1</th><th colspan="2" id="rb">Target 2</th><th colspan="2" id="rb">Target 3</th><th rowspan="2">Sample use case(s)</th> </tr>
* <tr><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th></tr>
* <tr> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV }</td><td id="rb">{@code FULL FOV 640}</td> <td>{@code YUV }</td><td id="rb">{@code MAXIMUM}</td> <td>Live preview with a tracking YUV output and a maximum-resolution YUV for still captures.</td> </tr>
* <tr> <td>{@code YUV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV }</td><td id="rb">{@code FULL FOV 640}</td> <td>{@code JPEG}</td><td id="rb">{@code MAX 30FPS}</td> <td>Preview with a tracking YUV output and a as-large-as-possible JPEG for still captures.</td> </tr>
* </table><br>
* </p>
*
@@ -899,12 +904,6 @@ public abstract class CameraDevice implements AutoCloseable {
* @throws CameraAccessException if the camera device is no longer connected or has
* encountered a fatal error
* @throws IllegalStateException if the camera device has been closed
*
* @see #TEMPLATE_PREVIEW
* @see #TEMPLATE_RECORD
* @see #TEMPLATE_STILL_CAPTURE
* @see #TEMPLATE_VIDEO_SNAPSHOT
* @see #TEMPLATE_MANUAL
*/
@NonNull
public abstract CaptureRequest.Builder createCaptureRequest(@RequestTemplate int templateType)