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

Commit 2a01921f authored by Ronghua Wu's avatar Ronghua Wu Committed by Android (Google) Code Review
Browse files

Merge "media: add dolby vision profile and level defines in CodecProfileLevel."

parents b568fe04 d6c2a76d

api/current.txt

+15 −0
Original line number Diff line number Diff line
@@ -20125,6 +20125,21 @@ 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 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 DolbyVisionLevelUhd24 = 32; // 0x20

    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 H263Level10 = 1; // 0x1

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

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

api/system-current.txt

+15 −0
Original line number Diff line number Diff line
@@ -21475,6 +21475,21 @@ 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 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 DolbyVisionLevelUhd24 = 32; // 0x20

    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 H263Level10 = 1; // 0x1

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

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

api/test-current.txt

+15 −0
Original line number Diff line number Diff line
@@ -20133,6 +20133,21 @@ 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 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 DolbyVisionLevelUhd24 = 32; // 0x20

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

+19 −0
Original line number Diff line number Diff line
@@ -2563,6 +2563,25 @@ public final class MediaCodecInfo { 
        public static final int HEVCMainTierLevel62 = 0x1000000;

        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;



        // from OMX_VIDEO_DOLBYVISIONLEVELTYPE

        public static final int DolbyVisionLevelHd24    = 0x1;

        public static final int DolbyVisionLevelHd30    = 0x2;

        public static final int DolbyVisionLevelFhd24   = 0x4;

        public static final int DolbyVisionLevelFhd30   = 0x8;

        public static final int DolbyVisionLevelFhd60   = 0x10;

        public static final int DolbyVisionLevelUhd24   = 0x20;

        public static final int DolbyVisionLevelUhd30   = 0x40;

        public static final int DolbyVisionLevelUhd48   = 0x80;

        public static final int DolbyVisionLevelUhd60   = 0x100;



        /**

         * Defined in the OpenMAX IL specs, depending on the type of media

         * this can be OMX_VIDEO_AVCPROFILETYPE, OMX_VIDEO_H263PROFILETYPE,