Skip to content

SDK / exoplayer

Go to a project
Commit 0752f790 by Drew Hill
Options

add mp2 audio

parent e56cf490
Inline Side-by-side
Showing with 3 additions and 0 deletions
library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
...@@ -84,6 +84,7 @@ public final class MatroskaExtractor implements Extractor { ...@@ -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_VORBIS = "A_VORBIS";
private static final String CODEC_ID_OPUS = "A_OPUS"; private static final String CODEC_ID_OPUS = "A_OPUS";
private static final String CODEC_ID_AAC = "A_AAC"; 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_MP3 = "A_MPEG/L3";
private static final String CODEC_ID_AC3 = "A_AC3"; private static final String CODEC_ID_AC3 = "A_AC3";
private static final String CODEC_ID_E_AC3 = "A_EAC3"; private static final String CODEC_ID_E_AC3 = "A_EAC3";
...@@ -1218,6 +1219,7 @@ public final class MatroskaExtractor implements Extractor { ...@@ -1218,6 +1219,7 @@ public final class MatroskaExtractor implements Extractor {
|| CODEC_ID_OPUS.equals(codecId) || CODEC_ID_OPUS.equals(codecId)
|| CODEC_ID_VORBIS.equals(codecId) || CODEC_ID_VORBIS.equals(codecId)
|| CODEC_ID_AAC.equals(codecId) || CODEC_ID_AAC.equals(codecId)
|| CODEC_ID_MP2.equals(codecId)
|| CODEC_ID_MP3.equals(codecId) || CODEC_ID_MP3.equals(codecId)
|| CODEC_ID_AC3.equals(codecId) || CODEC_ID_AC3.equals(codecId)
|| CODEC_ID_E_AC3.equals(codecId) || CODEC_ID_E_AC3.equals(codecId)
...@@ -1403,6 +1405,7 @@ public final class MatroskaExtractor implements Extractor { ...@@ -1403,6 +1405,7 @@ public final class MatroskaExtractor implements Extractor {
mimeType = MimeTypes.AUDIO_AAC; mimeType = MimeTypes.AUDIO_AAC;
initializationData = Collections.singletonList(codecPrivate); initializationData = Collections.singletonList(codecPrivate);
break; break;
case CODEC_ID_MP2:
case CODEC_ID_MP3: case CODEC_ID_MP3:
mimeType = MimeTypes.AUDIO_MPEG; mimeType = MimeTypes.AUDIO_MPEG;
maxInputSize = MP3_MAX_INPUT_SIZE; maxInputSize = MP3_MAX_INPUT_SIZE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment