Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ca4449d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add new Dolby Vision Profile types" into oc-mr1-dev

parents 1ce17014 307da62b

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -22192,11 +22192,13 @@ package android.media { 
    field public static final int DolbyVisionLevelUhd60 = 256; // 0x100

    field public static final int DolbyVisionProfileDvavPen = 2; // 0x2

    field public static final int DolbyVisionProfileDvavPer = 1; // 0x1

    field public static final int DolbyVisionProfileDvavSe = 512; // 0x200

    field public static final int DolbyVisionProfileDvheDen = 8; // 0x8

    field public static final int DolbyVisionProfileDvheDer = 4; // 0x4

    field public static final int DolbyVisionProfileDvheDtb = 128; // 0x80

    field public static final int DolbyVisionProfileDvheDth = 64; // 0x40

    field public static final int DolbyVisionProfileDvheDtr = 16; // 0x10

    field public static final int DolbyVisionProfileDvheSt = 256; // 0x100

    field public static final int DolbyVisionProfileDvheStn = 32; // 0x20

    field public static final int H263Level10 = 1; // 0x1

    field public static final int H263Level20 = 2; // 0x2

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -24136,11 +24136,13 @@ package android.media { 
    field public static final int DolbyVisionLevelUhd60 = 256; // 0x100

    field public static final int DolbyVisionProfileDvavPen = 2; // 0x2

    field public static final int DolbyVisionProfileDvavPer = 1; // 0x1

    field public static final int DolbyVisionProfileDvavSe = 512; // 0x200

    field public static final int DolbyVisionProfileDvheDen = 8; // 0x8

    field public static final int DolbyVisionProfileDvheDer = 4; // 0x4

    field public static final int DolbyVisionProfileDvheDtb = 128; // 0x80

    field public static final int DolbyVisionProfileDvheDth = 64; // 0x40

    field public static final int DolbyVisionProfileDvheDtr = 16; // 0x10

    field public static final int DolbyVisionProfileDvheSt = 256; // 0x100

    field public static final int DolbyVisionProfileDvheStn = 32; // 0x20

    field public static final int H263Level10 = 1; // 0x1

    field public static final int H263Level20 = 2; // 0x2

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -22328,11 +22328,13 @@ package android.media { 
    field public static final int DolbyVisionLevelUhd60 = 256; // 0x100

    field public static final int DolbyVisionProfileDvavPen = 2; // 0x2

    field public static final int DolbyVisionProfileDvavPer = 1; // 0x1

    field public static final int DolbyVisionProfileDvavSe = 512; // 0x200

    field public static final int DolbyVisionProfileDvheDen = 8; // 0x8

    field public static final int DolbyVisionProfileDvheDer = 4; // 0x4

    field public static final int DolbyVisionProfileDvheDtb = 128; // 0x80

    field public static final int DolbyVisionProfileDvheDth = 64; // 0x40

    field public static final int DolbyVisionProfileDvheDtr = 16; // 0x10

    field public static final int DolbyVisionProfileDvheSt = 256; // 0x100

    field public static final int DolbyVisionProfileDvheStn = 32; // 0x20

    field public static final int H263Level10 = 1; // 0x1

    field public static final int H263Level20 = 2; // 0x2

media/java/android/media/MediaCodecInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -3044,6 +3044,8 @@ 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;



        // from OMX_VIDEO_DOLBYVISIONLEVELTYPE

        public static final int DolbyVisionLevelHd24    = 0x1;