diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2015-04-18 10:04:39 +0530 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2015-05-05 11:05:22 -0700 |
| commit | 34265cd94f76cc18648c310e4f120d280bf3a0a4 (patch) | |
| tree | e84dafa7b195c5edb83f24d5db11bd40ca61df3e /api | |
| parent | def4c0c49aeebccbb42d9b82901a7de81782baad (diff) | |
| download | frameworks_base-34265cd94f76cc18648c310e4f120d280bf3a0a4.zip frameworks_base-34265cd94f76cc18648c310e4f120d280bf3a0a4.tar.gz frameworks_base-34265cd94f76cc18648c310e4f120d280bf3a0a4.tar.bz2 | |
media: Added MPEG2 profile/levels and tests
Bug: 20852831
Change-Id: I172f2f08c30d12bf684f32a52db64823cc286d35
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 10 | ||||
| -rw-r--r-- | api/system-current.txt | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index c8057db..ff66cf6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15608,6 +15608,16 @@ 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 MPEG2LevelH14 = 2; // 0x2 + field public static final int MPEG2LevelHL = 3; // 0x3 + field public static final int MPEG2LevelLL = 0; // 0x0 + field public static final int MPEG2LevelML = 1; // 0x1 + field public static final int MPEG2Profile422 = 2; // 0x2 + field public static final int MPEG2ProfileHigh = 5; // 0x5 + field public static final int MPEG2ProfileMain = 1; // 0x1 + field public static final int MPEG2ProfileSNR = 3; // 0x3 + field public static final int MPEG2ProfileSimple = 0; // 0x0 + field public static final int MPEG2ProfileSpatial = 4; // 0x4 field public static final int MPEG4Level0 = 1; // 0x1 field public static final int MPEG4Level0b = 2; // 0x2 field public static final int MPEG4Level1 = 4; // 0x4 diff --git a/api/system-current.txt b/api/system-current.txt index 5222a03..ffcb86f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -16830,6 +16830,16 @@ 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 MPEG2LevelH14 = 2; // 0x2 + field public static final int MPEG2LevelHL = 3; // 0x3 + field public static final int MPEG2LevelLL = 0; // 0x0 + field public static final int MPEG2LevelML = 1; // 0x1 + field public static final int MPEG2Profile422 = 2; // 0x2 + field public static final int MPEG2ProfileHigh = 5; // 0x5 + field public static final int MPEG2ProfileMain = 1; // 0x1 + field public static final int MPEG2ProfileSNR = 3; // 0x3 + field public static final int MPEG2ProfileSimple = 0; // 0x0 + field public static final int MPEG2ProfileSpatial = 4; // 0x4 field public static final int MPEG4Level0 = 1; // 0x1 field public static final int MPEG4Level0b = 2; // 0x2 field public static final int MPEG4Level1 = 4; // 0x4 |