diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-28 01:47:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-28 01:47:32 +0000 |
| commit | 83578eaa9547cf887d4a24d89315f5232d1fcc47 (patch) | |
| tree | 4ef1939aeb10ee1aa668d6edfde9cc0ed0586eee /core/java | |
| parent | 0df699ae7231273c11e30fee53fe0941aa239427 (diff) | |
| parent | d537ce04fb9abba855e19d393d343165ea09ffbe (diff) | |
Merge "Update mandatory concurrent stream docs to specify support for lower resolutions." into rvc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraDevice.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/CameraDevice.java b/core/java/android/hardware/camera2/CameraDevice.java index 15625cdeb8f4..decf05396c1f 100644 --- a/core/java/android/hardware/camera2/CameraDevice.java +++ b/core/java/android/hardware/camera2/CameraDevice.java @@ -683,6 +683,8 @@ public abstract class CameraDevice implements AutoCloseable { *<p>BACKWARD_COMPATIBLE devices capable of streaming concurrently with other devices as described by * {@link android.hardware.camera2.CameraManager#getConcurrentCameraIds} have the * 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> * <tr><th colspan="5">Concurrent stream guaranteed configurations</th></tr> @@ -696,7 +698,7 @@ public abstract class CameraDevice implements AutoCloseable { * </table><br> * </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> sVGA refers to the camera device's maximum resolution for that format from {@link StreamConfigurationMap#getOutputSizes} or |