diff options
| author | 2022-07-19 18:23:22 +0000 | |
|---|---|---|
| committer | 2022-07-19 18:24:35 +0000 | |
| commit | 20d2dcff5808668151dce66457f29e38755e7b16 (patch) | |
| tree | f1a48a0c7446a5471ce1ad35b2c9444fe6c4652c | |
| parent | 1475e5f3dd7bc0f07a615599a35f149090e6493c (diff) | |
Fix MandatoryStreamCombinations for ultra high resolution sensors
Some combinations for ultra high resolution sensors are repeated, and
some are there in the documentation which are missing. Specifically
YUV/RAW/Jpeg + YUV preview don't have the right combinations listed.
This was probably a typo.
Bug: 234752370
Test: Tested in RobustnessTest.java
Change-Id: I316443c1e2328494b75ac49242b4ddac5a51775e
| -rw-r--r-- | core/java/android/hardware/camera2/params/MandatoryStreamCombination.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java b/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java index e5b9cdb74d3b..26415d30e323 100644 --- a/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java +++ b/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java @@ -920,15 +920,15 @@ public final class MandatoryStreamCombination { // UH res YUV / RAW / JPEG + YUV preview size stream new StreamCombinationTemplate(new StreamTemplate [] { new StreamTemplate(ImageFormat.YUV_420_888, SizeThreshold.FULL_RES), - new StreamTemplate(ImageFormat.PRIVATE, SizeThreshold.PREVIEW)}, + new StreamTemplate(ImageFormat.YUV_420_888, SizeThreshold.PREVIEW)}, "No-viewfinder Ultra high resolution YUV image capture with image analysis"), new StreamCombinationTemplate(new StreamTemplate [] { new StreamTemplate(ImageFormat.RAW_SENSOR, SizeThreshold.FULL_RES), - new StreamTemplate(ImageFormat.PRIVATE, SizeThreshold.PREVIEW)}, + new StreamTemplate(ImageFormat.YUV_420_888, SizeThreshold.PREVIEW)}, "No-viewfinder Ultra high resolution RAW_SENSOR image capture with image analysis"), new StreamCombinationTemplate(new StreamTemplate [] { new StreamTemplate(ImageFormat.JPEG, SizeThreshold.FULL_RES), - new StreamTemplate(ImageFormat.PRIVATE, SizeThreshold.PREVIEW)}, + new StreamTemplate(ImageFormat.YUV_420_888, SizeThreshold.PREVIEW)}, "No-viewfinder Ultra high resolution JPEG image capture with image analysis"), // UH res YUV / RAW / JPEG + PRIV preview + PRIV RECORD stream |