Merge "Update mandatory concurrent stream docs to specify support for lower resolutions." into rvc-dev am: 83578eaa95 am: 8d514c97e4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12230970

Change-Id: I7bcfdc904e81031ea122dd86adf4d323bf5abf38
This commit is contained in:
TreeHugger Robot
2020-07-28 02:21:12 +00:00
committed by Automerger Merge Worker

View File

@@ -683,6 +683,8 @@ public abstract class CameraDevice implements AutoCloseable {
*<p>BACKWARD_COMPATIBLE devices capable of streaming concurrently with other devices as described by *<p>BACKWARD_COMPATIBLE devices capable of streaming concurrently with other devices as described by
* {@link android.hardware.camera2.CameraManager#getConcurrentCameraIds} have the * {@link android.hardware.camera2.CameraManager#getConcurrentCameraIds} have the
* following guaranteed streams (when streaming concurrently with other devices)</p> * following guaranteed streams (when streaming concurrently with other devices)</p>
* <p> Note: The sizes mentioned for these concurrent streams are the maximum sizes guaranteed
* to be supported. Sizes smaller than these, obtained by {@link StreamConfigurationMap#getOutputSizes} for a particular format, are supported as well. </p>
* *
* <table> * <table>
* <tr><th colspan="5">Concurrent stream guaranteed configurations</th></tr> * <tr><th colspan="5">Concurrent stream guaranteed configurations</th></tr>
@@ -696,7 +698,7 @@ public abstract class CameraDevice implements AutoCloseable {
* </table><br> * </table><br>
* </p> * </p>
* *
* <p> Devices which are not backwards-compatible, support a mandatory single stream of size sVGA with image format {@code DEPTH16} during concurrent operation. * <p> Devices which are not backwards-compatible, support a mandatory single stream of size sVGA with image format {@code DEPTH16} during concurrent operation. </p>
* *
* <p> For guaranteed concurrent stream configurations:</p> * <p> For guaranteed concurrent stream configurations:</p>
* <p> sVGA refers to the camera device's maximum resolution for that format from {@link StreamConfigurationMap#getOutputSizes} or * <p> sVGA refers to the camera device's maximum resolution for that format from {@link StreamConfigurationMap#getOutputSizes} or