commit 935f91c6a03eb39e2289c015d2630a25b3059c13
author Dorin Drimus <dorindrimus@google.com> Tue Nov 22 16:23:20 2022 +0100
committer Dorin Drimus <dorindrimus@google.com> Wed Nov 30 20:35:58 2022 +0100
tree 13d2feec1adc120dba82a78883c05837f0abf982
parent 7edaca37dd7ab61ceae698a9ff45540aa29279d3

Add codec profile for DTS codecs

Adding DTSHDProfileLBR, DTSHDProfileMA, DTSUHDProfileP1, DTSUHDProfileP2
profiles for DTS-LBR, DTS-MA, DTS-UHD P1 and DTS-UHD P2 bitstreams.

Bug: 235469058
Test: Builds, Presubmit
Change-Id: I0377d704681ca2d7be430030f2b77880d134b07b

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index 01bfecf..3342c12 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -21574,6 +21574,11 @@
     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

diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java
index bf30c50..30d90a8 100644
--- a/media/java/android/media/MediaCodecInfo.java
+++ b/media/java/android/media/MediaCodecInfo.java
@@ -4106,6 +4106,22 @@
         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.