From cd7a2e2c05ea203a447f4ff2094f6788689d7760 Mon Sep 17 00:00:00 2001 From: Baoli Yan Date: Mon, 20 Dec 2021 22:39:35 -0500 Subject: [PATCH] Updates to Dolby Vision Levels Added Uhd120,8k30, 8k60 Change-Id: I609e45b6f496debf320292358dbe894b439dc124 --- core/api/current.txt | 3 +++ media/java/android/media/MediaCodecInfo.java | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/core/api/current.txt b/core/api/current.txt index add4158230dbd..74e1b16bbdbcb 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -22077,11 +22077,14 @@ 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 DolbyVisionLevel8k30 = 1024; // 0x400 + field public static final int DolbyVisionLevel8k60 = 2048; // 0x800 field public static final int DolbyVisionLevelFhd24 = 4; // 0x4 field public static final int DolbyVisionLevelFhd30 = 8; // 0x8 field public static final int DolbyVisionLevelFhd60 = 16; // 0x10 field public static final int DolbyVisionLevelHd24 = 1; // 0x1 field public static final int DolbyVisionLevelHd30 = 2; // 0x2 + field public static final int DolbyVisionLevelUhd120 = 512; // 0x200 field public static final int DolbyVisionLevelUhd24 = 32; // 0x20 field public static final int DolbyVisionLevelUhd30 = 64; // 0x40 field public static final int DolbyVisionLevelUhd48 = 128; // 0x80 diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index 41c8887250eec..77709d7d38232 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -4025,6 +4025,12 @@ public final class MediaCodecInfo { public static final int DolbyVisionLevelUhd30 = 0x40; public static final int DolbyVisionLevelUhd48 = 0x80; public static final int DolbyVisionLevelUhd60 = 0x100; + @SuppressLint("AllUpper") + public static final int DolbyVisionLevelUhd120 = 0x200; + @SuppressLint("AllUpper") + public static final int DolbyVisionLevel8k30 = 0x400; + @SuppressLint("AllUpper") + public static final int DolbyVisionLevel8k60 = 0x800; // Profiles and levels for AV1 Codec, corresponding to the definitions in // "AV1 Bitstream & Decoding Process Specification", Annex A