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

Merge "MediaCodec: unhide mime type for EAC3" into mnc-dev

Browse Source
This commit is contained in:
Chong Zhang
2015-05-27 21:17:11 +00:00
committed by Android (Google) Code Review
parent bcec2b0ceb 52c58bb699
commit ebdfefa496
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -15910,6 +15910,7 @@ package android.media {
field public static final java.lang.String MIMETYPE_AUDIO_AC3 = "audio/ac3"; field public static final java.lang.String MIMETYPE_AUDIO_AC3 = "audio/ac3";
field public static final java.lang.String MIMETYPE_AUDIO_AMR_NB = "audio/3gpp"; field public static final java.lang.String MIMETYPE_AUDIO_AMR_NB = "audio/3gpp";
field public static final java.lang.String MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb"; field public static final java.lang.String MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";
field public static final java.lang.String MIMETYPE_AUDIO_EAC3 = "audio/eac3";
field public static final java.lang.String MIMETYPE_AUDIO_FLAC = "audio/flac"; field public static final java.lang.String MIMETYPE_AUDIO_FLAC = "audio/flac";
field public static final java.lang.String MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw"; field public static final java.lang.String MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw";
field public static final java.lang.String MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw"; field public static final java.lang.String MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw";

1
api/system-current.txt
View File

@@ -17146,6 +17146,7 @@ package android.media {
field public static final java.lang.String MIMETYPE_AUDIO_AC3 = "audio/ac3"; field public static final java.lang.String MIMETYPE_AUDIO_AC3 = "audio/ac3";
field public static final java.lang.String MIMETYPE_AUDIO_AMR_NB = "audio/3gpp"; field public static final java.lang.String MIMETYPE_AUDIO_AMR_NB = "audio/3gpp";
field public static final java.lang.String MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb"; field public static final java.lang.String MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";
field public static final java.lang.String MIMETYPE_AUDIO_EAC3 = "audio/eac3";
field public static final java.lang.String MIMETYPE_AUDIO_FLAC = "audio/flac"; field public static final java.lang.String MIMETYPE_AUDIO_FLAC = "audio/flac";
field public static final java.lang.String MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw"; field public static final java.lang.String MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw";
field public static final java.lang.String MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw"; field public static final java.lang.String MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw";

3
media/java/android/media/MediaFormat.java
View File

@@ -106,9 +106,6 @@ public final class MediaFormat {
public static final String MIMETYPE_AUDIO_FLAC = "audio/flac"; public static final String MIMETYPE_AUDIO_FLAC = "audio/flac";
public static final String MIMETYPE_AUDIO_MSGSM = "audio/gsm"; public static final String MIMETYPE_AUDIO_MSGSM = "audio/gsm";
public static final String MIMETYPE_AUDIO_AC3 = "audio/ac3"; public static final String MIMETYPE_AUDIO_AC3 = "audio/ac3";
/**
* @hide
*/
public static final String MIMETYPE_AUDIO_EAC3 = "audio/eac3"; public static final String MIMETYPE_AUDIO_EAC3 = "audio/eac3";
/** /**