diff options
| author | 2022-12-05 18:51:07 +0000 | |
|---|---|---|
| committer | 2022-12-05 18:51:07 +0000 | |
| commit | e3b11beae838c70de8d80fea36e10917902f4403 (patch) | |
| tree | fba4c71bacc2f22e627d8c5841697495264744b7 | |
| parent | 79ddcc1bb7a69704d8cfa9c4053cd507df0fe774 (diff) | |
| parent | 9d9b6691d273067e78da85d5d1221539a6171682 (diff) | |
Merge "Add codec profile for DTS codecs" am: c5c6055290 am: c2a2715ff2 am: 9d9b6691d2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2312586
Change-Id: I35e9715d841842e1f92b95b6b32451ab8aec98e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/current.txt | 5 | ||||
| -rw-r--r-- | media/java/android/media/MediaCodecInfo.java | 16 |
2 files changed, 21 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index af9c172b2c55..f83ba9b9a07c 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -22017,6 +22017,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 diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index bf30c5032132..30d90a8814d8 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -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. |