From 8550ce26e91e29fd14ed49ffd37a50361e3c258f Mon Sep 17 00:00:00 2001 From: Vikas Balapal Maheswarappa Date: Tue, 10 Sep 2019 10:07:47 -0700 Subject: [PATCH] Adding Dolby Vision AV1 profile to frameworks/base Bug: 129367182 Test: build Change-Id: If273ffeaa14f2698b7f8d143a2a504bee5058dbe --- api/current.txt | 1 + media/java/android/media/MediaCodecInfo.java | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index 8733aab02b004..dfa18205d23ee 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24617,6 +24617,7 @@ package android.media { field public static final int DolbyVisionLevelUhd30 = 64; // 0x40 field public static final int DolbyVisionLevelUhd48 = 128; // 0x80 field public static final int DolbyVisionLevelUhd60 = 256; // 0x100 + field public static final int DolbyVisionProfileDvav110 = 1024; // 0x400 field public static final int DolbyVisionProfileDvavPen = 2; // 0x2 field public static final int DolbyVisionProfileDvavPer = 1; // 0x1 field public static final int DolbyVisionProfileDvavSe = 512; // 0x200 diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index f304f7cc5981b..dd94f4bb5cc46 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -21,6 +21,7 @@ import static android.media.Utils.sortDistinctRanges; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.SuppressLint; import android.annotation.TestApi; import android.annotation.UnsupportedAppUsage; import android.os.Build; @@ -3741,8 +3742,11 @@ public final class MediaCodecInfo { public static final int DolbyVisionProfileDvheStn = 0x20; public static final int DolbyVisionProfileDvheDth = 0x40; public static final int DolbyVisionProfileDvheDtb = 0x80; - public static final int DolbyVisionProfileDvheSt = 0x100; - public static final int DolbyVisionProfileDvavSe = 0x200; + public static final int DolbyVisionProfileDvheSt = 0x100; + public static final int DolbyVisionProfileDvavSe = 0x200; + /** Dolby Vision AV1 profile */ + @SuppressLint("AllUpper") + public static final int DolbyVisionProfileDvav110 = 0x400; public static final int DolbyVisionLevelHd24 = 0x1; public static final int DolbyVisionLevelHd30 = 0x2;