diff --git a/api/current.txt b/api/current.txt index 03d3f884b1da8..67f4c1fa6059c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -20580,12 +20580,13 @@ 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 DolbyVisionProfileDvavDen = 2; // 0x2 - field public static final int DolbyVisionProfileDvavDer = 1; // 0x1 - field public static final int DolbyVisionProfileDvheDen = 4; // 0x4 - field public static final int DolbyVisionProfileDvheDer = 3; // 0x3 - field public static final int DolbyVisionProfileDvheDtr = 5; // 0x5 - field public static final int DolbyVisionProfileDvheStn = 6; // 0x6 + field public static final int DolbyVisionProfileDvavPen = 2; // 0x2 + field public static final int DolbyVisionProfileDvavPer = 1; // 0x1 + field public static final int DolbyVisionProfileDvheDen = 8; // 0x8 + field public static final int DolbyVisionProfileDvheDer = 4; // 0x4 + field public static final int DolbyVisionProfileDvheDth = 64; // 0x40 + field public static final int DolbyVisionProfileDvheDtr = 16; // 0x10 + field public static final int DolbyVisionProfileDvheStn = 32; // 0x20 field public static final int H263Level10 = 1; // 0x1 field public static final int H263Level20 = 2; // 0x2 field public static final int H263Level30 = 4; // 0x4 diff --git a/api/system-current.txt b/api/system-current.txt index ff9b956334b90..057f88d1d8380 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -22059,12 +22059,13 @@ 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 DolbyVisionProfileDvavDen = 2; // 0x2 - field public static final int DolbyVisionProfileDvavDer = 1; // 0x1 - field public static final int DolbyVisionProfileDvheDen = 4; // 0x4 - field public static final int DolbyVisionProfileDvheDer = 3; // 0x3 - field public static final int DolbyVisionProfileDvheDtr = 5; // 0x5 - field public static final int DolbyVisionProfileDvheStn = 6; // 0x6 + field public static final int DolbyVisionProfileDvavPen = 2; // 0x2 + field public static final int DolbyVisionProfileDvavPer = 1; // 0x1 + field public static final int DolbyVisionProfileDvheDen = 8; // 0x8 + field public static final int DolbyVisionProfileDvheDer = 4; // 0x4 + field public static final int DolbyVisionProfileDvheDth = 64; // 0x40 + field public static final int DolbyVisionProfileDvheDtr = 16; // 0x10 + field public static final int DolbyVisionProfileDvheStn = 32; // 0x20 field public static final int H263Level10 = 1; // 0x1 field public static final int H263Level20 = 2; // 0x2 field public static final int H263Level30 = 4; // 0x4 diff --git a/api/test-current.txt b/api/test-current.txt index 8f04e23b2cbea..3be562d0b3525 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -20645,12 +20645,13 @@ 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 DolbyVisionProfileDvavDen = 2; // 0x2 - field public static final int DolbyVisionProfileDvavDer = 1; // 0x1 - field public static final int DolbyVisionProfileDvheDen = 4; // 0x4 - field public static final int DolbyVisionProfileDvheDer = 3; // 0x3 - field public static final int DolbyVisionProfileDvheDtr = 5; // 0x5 - field public static final int DolbyVisionProfileDvheStn = 6; // 0x6 + field public static final int DolbyVisionProfileDvavPen = 2; // 0x2 + field public static final int DolbyVisionProfileDvavPer = 1; // 0x1 + field public static final int DolbyVisionProfileDvheDen = 8; // 0x8 + field public static final int DolbyVisionProfileDvheDer = 4; // 0x4 + field public static final int DolbyVisionProfileDvheDth = 64; // 0x40 + field public static final int DolbyVisionProfileDvheDtr = 16; // 0x10 + field public static final int DolbyVisionProfileDvheStn = 32; // 0x20 field public static final int H263Level10 = 1; // 0x1 field public static final int H263Level20 = 2; // 0x2 field public static final int H263Level30 = 4; // 0x4 diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index b1c1b79732c5c..2bd978180c4c8 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -2666,12 +2666,13 @@ public final class MediaCodecInfo { public static final int HEVCHighTierLevel62 = 0x2000000; // from OMX_VIDEO_DOLBYVISIONPROFILETYPE - public static final int DolbyVisionProfileDvavDer = 0x1; - public static final int DolbyVisionProfileDvavDen = 0x2; - public static final int DolbyVisionProfileDvheDer = 0x3; - public static final int DolbyVisionProfileDvheDen = 0x4; - public static final int DolbyVisionProfileDvheDtr = 0x5; - public static final int DolbyVisionProfileDvheStn = 0x6; + public static final int DolbyVisionProfileDvavPer = 0x1; + public static final int DolbyVisionProfileDvavPen = 0x2; + public static final int DolbyVisionProfileDvheDer = 0x4; + public static final int DolbyVisionProfileDvheDen = 0x8; + public static final int DolbyVisionProfileDvheDtr = 0x10; + public static final int DolbyVisionProfileDvheStn = 0x20; + public static final int DolbyVisionProfileDvheDth = 0x40; // from OMX_VIDEO_DOLBYVISIONLEVELTYPE public static final int DolbyVisionLevelHd24 = 0x1;