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

Commit 98194d39 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Android (Google) Code Review
Browse files

Merge "Camera: Remove 3 processed streams combination for stream use case" into tm-qpr-dev

parents 0825f6b4 45087477

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[] = {