From e5edb5cf657f4f4501f3698a5071ce508407c4c1 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Wed, 17 Mar 2021 10:07:39 -0700 Subject: [PATCH] MediaFormat: new MIME types for MPEG-H audio Add new MIME types for MPEG-H audio Bug: 178619392 Test: atest android.media.cts.MediaFormatTest Merged-In: I6b0026e6b5b979b6c3e3ca0b1c675e890662c0df Change-Id: I6b0026e6b5b979b6c3e3ca0b1c675e890662c0df --- core/api/current.txt | 2 ++ media/java/android/media/MediaFormat.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/core/api/current.txt b/core/api/current.txt index 2a16084f348ea..496839bf01b83 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -21435,6 +21435,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"; diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index 1bfa9991e5d2f..a73fd81e6d247 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -160,6 +160,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.