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

Merge "MediaFormat: new MIME types for MPEG-H audio" am: fae80ba7a4 am: 3eb382c3da

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682765

Change-Id: I2cbfa51d8b0b4c1aaa5452064df6119b0cf8794a
This commit is contained in:
Andy Hung
2021-04-23 20:43:38 +00:00
committed by Automerger Merge Worker
parent 9fe576be8b 3eb382c3da
commit 6698967429
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -21440,6 +21440,8 @@ package android.media {
field public static final String MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw";
field public static final String MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw";
field public static final String MIMETYPE_AUDIO_MPEG = "audio/mpeg";
field public static final String MIMETYPE_AUDIO_MPEGH_MHA1 = "audio/mha1";
field public static final String MIMETYPE_AUDIO_MPEGH_MHM1 = "audio/mhm1";
field public static final String MIMETYPE_AUDIO_MSGSM = "audio/gsm";
field public static final String MIMETYPE_AUDIO_OPUS = "audio/opus";
field public static final String MIMETYPE_AUDIO_QCELP = "audio/qcelp";

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

@@ -169,6 +169,10 @@ public final class MediaFormat {
public static final String MIMETYPE_AUDIO_EAC3_JOC = "audio/eac3-joc";
public static final String MIMETYPE_AUDIO_AC4 = "audio/ac4";
public static final String MIMETYPE_AUDIO_SCRAMBLED = "audio/scrambled";
/** MIME type for MPEG-H Audio single stream */
public static final String MIMETYPE_AUDIO_MPEGH_MHA1 = "audio/mha1";
/** MIME type for MPEG-H Audio single stream, encapsulated in MHAS */
public static final String MIMETYPE_AUDIO_MPEGH_MHM1 = "audio/mhm1";
/**
* MIME type for HEIF still image data encoded in HEVC.