Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20d2dcff authored by Bharatt Kukreja's avatar Bharatt Kukreja
Browse files

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
parent 1475e5f3

core/java/android/hardware/camera2/params/MandatoryStreamCombination.java

+3 −3
Original line number Diff line number Diff line
@@ -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