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

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

Merge "media: define HEVCProfileMain10HDR10" into nyc-dev

parents 8fc5462e f2615b8b

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -20659,6 +20659,7 @@ package android.media { 
    field public static final int HEVCMainTierLevel62 = 16777216; // 0x1000000

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

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

    field public static final int HEVCProfileMain10HDR10 = 4096; // 0x1000

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

    field public static final int MPEG2LevelHL = 3; // 0x3

    field public static final int MPEG2LevelLL = 0; // 0x0

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -22167,6 +22167,7 @@ package android.media { 
    field public static final int HEVCMainTierLevel62 = 16777216; // 0x1000000

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

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

    field public static final int HEVCProfileMain10HDR10 = 4096; // 0x1000

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

    field public static final int MPEG2LevelHL = 3; // 0x3

    field public static final int MPEG2LevelLL = 0; // 0x0

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -20668,6 +20668,7 @@ package android.media { 
    field public static final int HEVCMainTierLevel62 = 16777216; // 0x1000000

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

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

    field public static final int HEVCProfileMain10HDR10 = 4096; // 0x1000

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

    field public static final int MPEG2LevelHL = 3; // 0x3

    field public static final int MPEG2LevelLL = 0; // 0x0

media/java/android/media/MediaCodecInfo.java

+4 −2
Original line number Diff line number Diff line
@@ -2231,6 +2231,7 @@ public final class MediaCodecInfo { 
                    switch (profileLevel.profile) {

                        case CodecProfileLevel.HEVCProfileMain:

                        case CodecProfileLevel.HEVCProfileMain10:

                        case CodecProfileLevel.HEVCProfileMain10HDR10:

                            break;

                        default:

                            Log.w(TAG, "Unrecognized profile "
@@ -2634,6 +2635,7 @@ public final class MediaCodecInfo { 
        // from OMX_VIDEO_HEVCPROFILETYPE

        public static final int HEVCProfileMain        = 0x01;

        public static final int HEVCProfileMain10      = 0x02;

        public static final int HEVCProfileMain10HDR10 = 0x1000;



        // from OMX_VIDEO_HEVCLEVELTYPE

        public static final int HEVCMainTierLevel1  = 0x1;