diff options
| author | 2016-05-24 18:36:56 +0000 | |
|---|---|---|
| committer | 2016-05-24 18:36:57 +0000 | |
| commit | aba6e2c78f3188d201365a99f52be3074fc94962 (patch) | |
| tree | 6f462309aa406092c689fb0e32705ece0c0b7c1c | |
| parent | 7932d676071e36b88a4105515cfb81c255398dd8 (diff) | |
| parent | 6c2e08083adeab9f5eabe230db5c35787367dbed (diff) | |
Merge "media: unhide codec levels" into nyc-dev
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 | ||||
| -rw-r--r-- | api/test-current.txt | 3 | ||||
| -rw-r--r-- | media/java/android/media/MediaCodecInfo.java | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 79c95dc1f600..70ea1c577134 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 diff --git a/api/system-current.txt b/api/system-current.txt index a1461deb7870..a6f612d195bf 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 diff --git a/api/test-current.txt b/api/test-current.txt index 98bce147cd35..37bc7afb69ef 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index 08c184270d5b..87c6d88a0c11 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -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 |