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

Commit 9d9b6691 authored by Dorin Drimus's avatar Dorin Drimus Committed by Automerger Merge Worker
Browse files

Merge "Add codec profile for DTS codecs" am: c5c60552 am: c2a2715f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2312586



Change-Id: If5d7ea115a7aeedb0d49f7996fb5ebaec5506b97
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 51b1db86 c2a2715f

core/api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -21574,6 +21574,11 @@ package android.media { 
    field public static final int AVCProfileHigh422 = 32; // 0x20

    field public static final int AVCProfileHigh444 = 64; // 0x40

    field public static final int AVCProfileMain = 2; // 0x2

    field public static final int DTS_HDProfileHRA = 1; // 0x1

    field public static final int DTS_HDProfileLBR = 2; // 0x2

    field public static final int DTS_HDProfileMA = 4; // 0x4

    field public static final int DTS_UHDProfileP1 = 1; // 0x1

    field public static final int DTS_UHDProfileP2 = 2; // 0x2

    field public static final int DolbyVisionLevel8k30 = 1024; // 0x400

    field public static final int DolbyVisionLevel8k60 = 2048; // 0x800

    field public static final int DolbyVisionLevelFhd24 = 4; // 0x4

media/java/android/media/MediaCodecInfo.java

+16 −0
Original line number Diff line number Diff line
@@ -4106,6 +4106,22 @@ public final class MediaCodecInfo { 
        public static final int AV1Level72      = 0x400000;

        public static final int AV1Level73      = 0x800000;



        /** DTS codec profile for DTS HRA. */

        @SuppressLint("AllUpper")

        public static final int DTS_HDProfileHRA = 0x1;

        /** DTS codec profile for DTS Express. */

        @SuppressLint("AllUpper")

        public static final int DTS_HDProfileLBR = 0x2;

        /** DTS codec profile for DTS-HD Master Audio */

        @SuppressLint("AllUpper")

        public static final int DTS_HDProfileMA = 0x4;

        /** DTS codec profile for DTS:X Profile 1 */

        @SuppressLint("AllUpper")

        public static final int DTS_UHDProfileP1 = 0x1;

        /** DTS codec profile for DTS:X Profile 2 */

        @SuppressLint("AllUpper")

        public static final int DTS_UHDProfileP2 = 0x2;



        /**

         * The profile of the media content. Depending on the type of media this can be

         * one of the profile values defined in this class.