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

Commit 6c2e0808 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

media: unhide codec levels 

Bug: 28930361
Change-Id: Ic9c55389c75ef0b789722aa0a7bddd5f56b15049
parent b143e3de

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -20557,6 +20557,7 @@ package android.media { 
    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 MPEG2LevelHP = 4; // 0x4

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

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

    field public static final int MPEG2Profile422 = 2; // 0x2
@@ -20570,9 +20571,11 @@ package android.media { 
    field public static final int MPEG4Level1 = 4; // 0x4

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

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

    field public static final int MPEG4Level3b = 24; // 0x18

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

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

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

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

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

    field public static final int MPEG4ProfileAdvancedCore = 8192; // 0x2000

    field public static final int MPEG4ProfileAdvancedRealTime = 1024; // 0x400

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -22075,6 +22075,7 @@ package android.media { 
    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 MPEG2LevelHP = 4; // 0x4

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

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

    field public static final int MPEG2Profile422 = 2; // 0x2
@@ -22088,9 +22089,11 @@ package android.media { 
    field public static final int MPEG4Level1 = 4; // 0x4

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

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

    field public static final int MPEG4Level3b = 24; // 0x18

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

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

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

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

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

    field public static final int MPEG4ProfileAdvancedCore = 8192; // 0x2000

    field public static final int MPEG4ProfileAdvancedRealTime = 1024; // 0x400

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -20626,6 +20626,7 @@ package android.media { 
    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 MPEG2LevelHP = 4; // 0x4

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

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

    field public static final int MPEG2Profile422 = 2; // 0x2
@@ -20639,9 +20640,11 @@ package android.media { 
    field public static final int MPEG4Level1 = 4; // 0x4

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

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

    field public static final int MPEG4Level3b = 24; // 0x18

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

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

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

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

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

    field public static final int MPEG4ProfileAdvancedCore = 8192; // 0x2000

    field public static final int MPEG4ProfileAdvancedRealTime = 1024; // 0x400

media/java/android/media/MediaCodecInfo.java

+0 −3
Original line number Diff line number Diff line
@@ -2636,12 +2636,10 @@ public final class MediaCodecInfo { 
        public static final int MPEG4Level1      = 0x04;

        public static final int MPEG4Level2      = 0x08;

        public static final int MPEG4Level3      = 0x10;

        /** @hide */

        public static final int MPEG4Level3b     = 0x18;

        public static final int MPEG4Level4      = 0x20;

        public static final int MPEG4Level4a     = 0x40;

        public static final int MPEG4Level5      = 0x80;

        /** @hide */

        public static final int MPEG4Level6      = 0x100;



        // from OMX_VIDEO_MPEG2PROFILETYPE
@@ -2657,7 +2655,6 @@ public final class MediaCodecInfo { 
        public static final int MPEG2LevelML     = 0x01;

        public static final int MPEG2LevelH14    = 0x02;

        public static final int MPEG2LevelHL     = 0x03;

        /** @hide */

        public static final int MPEG2LevelHP     = 0x04;



        // from OMX_AUDIO_AACPROFILETYPE