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

Commit 2fd7157a authored by Ronghua Wu's avatar Ronghua Wu Committed by android-build-merger
Browse files

media: update dolby vision CodecProfileLevel am: 32e537c6 

am: 8a051c1a

* commit '8a051c1a':
  media: update dolby vision CodecProfileLevel

Change-Id: I7fb4443d4e2de8275f5d2e6115245bb45de5711a
parents 760f294d 8a051c1a

api/current.txt

+7 −6
Original line number Diff line number Diff line
@@ -20583,12 +20583,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

api/system-current.txt

+7 −6
Original line number Diff line number Diff line
@@ -22062,12 +22062,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

api/test-current.txt

+7 −6
Original line number Diff line number Diff line
@@ -20648,12 +20648,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

media/java/android/media/MediaCodecInfo.java

+7 −6
Original line number Diff line number Diff line
@@ -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;