diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-11-26 22:11:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-11-26 22:11:24 +0000 |
| commit | 9d7964b973aaa5179b9c29356d04bca07a2b719b (patch) | |
| tree | b419aef51967f2b565f866d8b513c988456ef96a | |
| parent | 8b84998ffff6a408efb081b0a18bbddd614f7fd0 (diff) | |
| parent | 14d2d59f1c36e73120991e98cc74d80831ea622f (diff) | |
Merge "Add MIMETYPE_AUDIO_AC4 support in MediaFormat"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/MediaCodecInfo.java | 4 | ||||
| -rw-r--r-- | media/java/android/media/MediaFormat.java | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index b29c311e8923..ac1ae34f4bdc 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24588,6 +24588,7 @@ package android.media { field public static final java.lang.String KEY_WIDTH = "width"; field public static final java.lang.String MIMETYPE_AUDIO_AAC = "audio/mp4a-latm"; field public static final java.lang.String MIMETYPE_AUDIO_AC3 = "audio/ac3"; + field public static final java.lang.String MIMETYPE_AUDIO_AC4 = "audio/ac4"; 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_EAC3 = "audio/eac3"; diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index 995ebb2897c5..dfe29e953a56 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -1135,6 +1135,10 @@ public final class MediaCodecInfo { maxChannels = 6; } else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_EAC3)) { maxChannels = 16; + } else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_AC4)) { + sampleRates = new int[] { 44100, 48000, 96000, 192000 }; + bitRates = Range.create(16000, 2688000); + maxChannels = 24; } else { Log.w(TAG, "Unsupported mime " + mime); mParent.mError |= ERROR_UNSUPPORTED; diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index 5dee16e03542..284e422374aa 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -138,6 +138,7 @@ public final class MediaFormat { public static final String MIMETYPE_AUDIO_MSGSM = "audio/gsm"; public static final String MIMETYPE_AUDIO_AC3 = "audio/ac3"; public static final String MIMETYPE_AUDIO_EAC3 = "audio/eac3"; + public static final String MIMETYPE_AUDIO_AC4 = "audio/ac4"; public static final String MIMETYPE_AUDIO_SCRAMBLED = "audio/scrambled"; /** |