sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add mp2 audio

Browse source
This commit is contained in:
Drew Hill 2016-11-11 19:08:17 -05:00
parent e56cf49038
commit 0752f790c7
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
View file

@ -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 {
|| 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 {
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;