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

Commit 45087477 authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Camera: Remove 3 processed streams combination for stream use case 

For LIMITED device level, the maximum number of processed streams
is 2.

To make the stream use case mandatory combinations consistent with
LIMITED device level, remove the mandatory combinations with 3 processed
streams.

Test: vendor testing, Camera CTS
Bug: 266436267
Change-Id: I4ba19813050e70c7f247847fb9579f57fb31d160
parent cafbb75b

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

+0 −24
Original line number Diff line number Diff line
@@ -1220,14 +1220,6 @@ public final class MandatoryStreamCombination { 
                new StreamTemplate(ImageFormat.JPEG, SizeThreshold.RECORD,

                        STREAM_USE_CASE_STILL_CAPTURE)},

                "Preview, video record and JPEG video snapshot"),

        new StreamCombinationTemplate(new StreamTemplate [] {

                new StreamTemplate(ImageFormat.PRIVATE, SizeThreshold.PREVIEW,

                        STREAM_USE_CASE_PREVIEW),

                new StreamTemplate(ImageFormat.PRIVATE, SizeThreshold.RECORD,

                        STREAM_USE_CASE_RECORD),

                new StreamTemplate(ImageFormat.YUV_420_888, SizeThreshold.RECORD,

                        STREAM_USE_CASE_STILL_CAPTURE)},

                "Preview, video record and YUV video snapshot"),

        new StreamCombinationTemplate(new StreamTemplate [] {

                new StreamTemplate(ImageFormat.PRIVATE, SizeThreshold.PREVIEW,

                        STREAM_USE_CASE_PREVIEW),
@@ -1236,14 +1228,6 @@ public final class MandatoryStreamCombination { 
                new StreamTemplate(ImageFormat.JPEG, SizeThreshold.RECORD,

                        STREAM_USE_CASE_STILL_CAPTURE)},

                "Preview, in-application video processing and JPEG video snapshot"),

        new StreamCombinationTemplate(new StreamTemplate [] {

                new StreamTemplate(ImageFormat.PRIVATE, SizeThreshold.PREVIEW,

                        STREAM_USE_CASE_PREVIEW),

                new StreamTemplate(ImageFormat.YUV_420_888, SizeThreshold.RECORD,

                        STREAM_USE_CASE_RECORD),

                new StreamTemplate(ImageFormat.YUV_420_888, SizeThreshold.RECORD,

                        STREAM_USE_CASE_STILL_CAPTURE)},

                "Preview, in-application video processing and YUV video snapshot"),

        new StreamCombinationTemplate(new StreamTemplate [] {

                new StreamTemplate(ImageFormat.PRIVATE, SizeThreshold.PREVIEW,

                        STREAM_USE_CASE_PREVIEW),
@@ -1252,14 +1236,6 @@ public final class MandatoryStreamCombination { 
                new StreamTemplate(ImageFormat.JPEG, SizeThreshold.MAXIMUM,

                        STREAM_USE_CASE_STILL_CAPTURE)},

                "Preview, in-application image processing, and JPEG still image capture"),

        new StreamCombinationTemplate(new StreamTemplate [] {

                new StreamTemplate(ImageFormat.PRIVATE, SizeThreshold.PREVIEW,

                        STREAM_USE_CASE_PREVIEW),

                new StreamTemplate(ImageFormat.YUV_420_888, SizeThreshold.PREVIEW,

                        STREAM_USE_CASE_PREVIEW),

                new StreamTemplate(ImageFormat.YUV_420_888, SizeThreshold.MAXIMUM,

                        STREAM_USE_CASE_STILL_CAPTURE)},

                "Preview, in-application image processing, and YUV still image capture"),

    };



    private static StreamCombinationTemplate sPreviewStabilizedStreamCombinations[] = {