From 0752f790c7aeca82768217ffa21a06e96942607e Mon Sep 17 00:00:00 2001 From: Drew Hill Date: Fri, 11 Nov 2016 19:08:17 -0500 Subject: [PATCH] add mp2 audio --- .../android/exoplayer2/extractor/mkv/MatroskaExtractor.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java index 301392b2d2..84fbf55c17 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java @@ -84,6 +84,7 @@ public final class MatroskaExtractor implements Extractor { private static final String CODEC_ID_VORBIS = "A_VORBIS"; private static final String CODEC_ID_OPUS = "A_OPUS"; private static final String CODEC_ID_AAC = "A_AAC"; + private static final String CODEC_ID_MP2 = "A_MPEG/L2"; private static final String CODEC_ID_MP3 = "A_MPEG/L3"; private static final String CODEC_ID_AC3 = "A_AC3"; private static final String CODEC_ID_E_AC3 = "A_EAC3"; @@ -1218,6 +1219,7 @@ public final class MatroskaExtractor implements Extractor { || CODEC_ID_OPUS.equals(codecId) || CODEC_ID_VORBIS.equals(codecId) || CODEC_ID_AAC.equals(codecId) + || CODEC_ID_MP2.equals(codecId) || CODEC_ID_MP3.equals(codecId) || CODEC_ID_AC3.equals(codecId) || CODEC_ID_E_AC3.equals(codecId) @@ -1403,6 +1405,7 @@ public final class MatroskaExtractor implements Extractor { mimeType = MimeTypes.AUDIO_AAC; initializationData = Collections.singletonList(codecPrivate); break; + case CODEC_ID_MP2: case CODEC_ID_MP3: mimeType = MimeTypes.AUDIO_MPEG; maxInputSize = MP3_MAX_INPUT_SIZE;