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

Cleanup following #884 II

Browse source
This commit is contained in:
Oliver Woodman 2015-10-27 21:06:38 +00:00
parent 02cc495f1c
commit 4237e3d391
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
library/src/main/java/com/google/android/exoplayer/extractor/mp4/AtomParsers.java
View file

@ -454,14 +454,15 @@ import java.util.List;
parseAudioSampleEntry(stsd, childAtomType, childStartPosition, childAtomSize, trackId, parseAudioSampleEntry(stsd, childAtomType, childStartPosition, childAtomSize, trackId,
durationUs, language, out, i); durationUs, language, out, i);
} else if (childAtomType == Atom.TYPE_TTML) { } else if (childAtomType == Atom.TYPE_TTML) {
out.mediaFormat = MediaFormat.createTextFormat(Integer.toString(trackId), MimeTypes.APPLICATION_TTML, out.mediaFormat = MediaFormat.createTextFormat(Integer.toString(trackId),
MediaFormat.NO_VALUE, durationUs, language); MimeTypes.APPLICATION_TTML, MediaFormat.NO_VALUE, durationUs, language);
} else if (childAtomType == Atom.TYPE_tx3g) { } else if (childAtomType == Atom.TYPE_tx3g) {
out.mediaFormat = MediaFormat.createTextFormat(Integer.toString(trackId), MimeTypes.APPLICATION_TX3G, out.mediaFormat = MediaFormat.createTextFormat(Integer.toString(trackId),
MediaFormat.NO_VALUE, durationUs, language); MimeTypes.APPLICATION_TX3G, MediaFormat.NO_VALUE, durationUs, language);
} else if (childAtomType == Atom.TYPE_stpp) { } else if (childAtomType == Atom.TYPE_stpp) {
out.mediaFormat = MediaFormat.createTextFormat(Integer.toString(trackId), MimeTypes.APPLICATION_TTML, out.mediaFormat = MediaFormat.createTextFormat(Integer.toString(trackId),
MediaFormat.NO_VALUE, durationUs, language, 0 /* subsample timing is absolute */); MimeTypes.APPLICATION_TTML, MediaFormat.NO_VALUE, durationUs, language,
0 /* subsample timing is absolute */);
} }
stsd.setPosition(childStartPosition + childAtomSize); stsd.setPosition(childStartPosition + childAtomSize);
} }
@ -531,9 +532,9 @@ import java.util.List;
return; return;
} }
out.mediaFormat = MediaFormat.createVideoFormat(Integer.toString(trackId), mimeType, MediaFormat.NO_VALUE, out.mediaFormat = MediaFormat.createVideoFormat(Integer.toString(trackId), mimeType,
MediaFormat.NO_VALUE, durationUs, width, height, initializationData, rotationDegrees, MediaFormat.NO_VALUE, MediaFormat.NO_VALUE, durationUs, width, height, initializationData,
pixelWidthHeightRatio); rotationDegrees, pixelWidthHeightRatio);
} }
private static AvcCData parseAvcCFromParent(ParsableByteArray parent, int position) { private static AvcCData parseAvcCFromParent(ParsableByteArray parent, int position) {
@ -768,8 +769,8 @@ import java.util.List;
return; return;
} }
out.mediaFormat = MediaFormat.createAudioFormat(Integer.toString(trackId), mimeType, MediaFormat.NO_VALUE, out.mediaFormat = MediaFormat.createAudioFormat(Integer.toString(trackId), mimeType,
sampleSize, durationUs, channelCount, sampleRate, MediaFormat.NO_VALUE, sampleSize, durationUs, channelCount, sampleRate,
initializationData == null ? null : Collections.singletonList(initializationData), initializationData == null ? null : Collections.singletonList(initializationData),
language); language);
} }