diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-28 02:21:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-28 02:21:12 +0000 |
| commit | 0fa3c008a775767478ee370f26bb97582678fad9 (patch) | |
| tree | 03edfd928d20f2751d61d5be7726cd4888d1d1f9 /core/java/android | |
| parent | 8abd4d536542b3fe9169b2dbfbb2b50929712354 (diff) | |
| parent | 8d514c97e44d8b5af21ca4a63c2b8af534b8192c (diff) | |
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
Diffstat (limited to 'core/java/android')
| -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 |