Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MediaCodecInfo: define AACObjectXHE profile level" into pi-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2018-04-04 23:40:35 +00:00
committed by Android (Google) Code Review
parent fdc891e2af 9a30362790
commit 57e4156ee3
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -23165,6 +23165,7 @@ package android.media {
field public static final int AACObjectMain = 1; // 0x1
field public static final int AACObjectSSR = 3; // 0x3
field public static final int AACObjectScalable = 6; // 0x6
field public static final int AACObjectXHE = 42; // 0x2a
field public static final int AVCLevel1 = 1; // 0x1
field public static final int AVCLevel11 = 4; // 0x4
field public static final int AVCLevel12 = 8; // 0x8

2
media/java/android/media/MediaCodecInfo.java
View File

@@ -2971,6 +2971,8 @@ public final class MediaCodecInfo {
public static final int AACObjectLD = 23;
public static final int AACObjectHE_PS = 29;
public static final int AACObjectELD = 39;
/** xHE-AAC (includes USAC) */
public static final int AACObjectXHE = 42;
// from OMX_VIDEO_VP8LEVELTYPE
public static final int VP8Level_Version0 = 0x01;