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

Merge pull request #4747 from kolpacheque/issue-4360-pcm-mulaw-support

Browse source 
Add parsing a-law and mu-law atom types
This commit is contained in:
ojw28 2018-09-03 15:17:18 +01:00 committed by GitHub
commit fc47f2222c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
View file

@ -143,6 +143,8 @@ import java.util.List;
public static final int TYPE_vpcC = Util.getIntegerCodeForString("vpcC");
public static final int TYPE_camm = Util.getIntegerCodeForString("camm");
public static final int TYPE_alac = Util.getIntegerCodeForString("alac");
public static final int TYPE_alaw = Util.getIntegerCodeForString("alaw");
public static final int TYPE_ulaw = Util.getIntegerCodeForString("ulaw");
public final int type;

7
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
View file

@ -660,7 +660,8 @@ import java.util.List;
|| childAtomType == Atom.TYPE_dtsh || childAtomType == Atom.TYPE_dtsl
|| childAtomType == Atom.TYPE_samr || childAtomType == Atom.TYPE_sawb
|| childAtomType == Atom.TYPE_lpcm || childAtomType == Atom.TYPE_sowt
|| childAtomType == Atom.TYPE__mp3 || childAtomType == Atom.TYPE_alac) {
|| childAtomType == Atom.TYPE__mp3 || childAtomType == Atom.TYPE_alac
|| childAtomType == Atom.TYPE_alaw || childAtomType == Atom.TYPE_ulaw ) {
parseAudioSampleEntry(stsd, childAtomType, childStartPosition, childAtomSize, trackId,
language, isQuickTime, drmInitData, out, i);
} else if (childAtomType == Atom.TYPE_TTML || childAtomType == Atom.TYPE_tx3g
@ -953,6 +954,10 @@ import java.util.List;
mimeType = MimeTypes.AUDIO_MPEG;
} else if (atomType == Atom.TYPE_alac) {
mimeType = MimeTypes.AUDIO_ALAC;
} else if (atomType == Atom.TYPE_alaw) {
mimeType = MimeTypes.AUDIO_ALAW;
} else if (atomType == Atom.TYPE_ulaw ) {
mimeType = MimeTypes.AUDIO_MLAW;
}
byte[] initializationData = null;