Merge "Updates to Dolby Vision Levels" am: e7dd66d7db

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

Change-Id: Icb45dd4df89cb5f42dc9a7b5a37ab7acd0f1ce8f
This commit is contained in:
Treehugger Robot
2022-01-27 10:47:07 +00:00
committed by Automerger Merge Worker
2 changed files with 9 additions and 0 deletions

View File

@@ -20724,11 +20724,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

View File

@@ -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