loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-15 19:49:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix indentation and missing javadoc

Browse Source
This commit is contained in:
Oliver Woodman 2016-10-24 19:22:41 +01:00
parent 6dbce88102
commit 1b39d21ed4
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
View File

@ -95,8 +95,8 @@ import java.util.List;
Pair<long[], long[]> edtsData = parseEdts(trak.getContainerAtomOfType(Atom.TYPE_edts)); Pair<long[], long[]> edtsData = parseEdts(trak.getContainerAtomOfType(Atom.TYPE_edts));
return stsdData.format == null ? null return stsdData.format == null ? null
: new Track(tkhdData.id, trackType, mdhdData.first, movieTimescale, durationUs, : new Track(tkhdData.id, trackType, mdhdData.first, movieTimescale, durationUs,
stsdData.format, stsdData.requiredSampleTransformation, stsdData.trackEncryptionBoxes, stsdData.format, stsdData.requiredSampleTransformation, stsdData.trackEncryptionBoxes,
stsdData.nalUnitLengthFieldLength, edtsData.first, edtsData.second); stsdData.nalUnitLengthFieldLength, edtsData.first, edtsData.second);
} }
/** /**
@ -407,6 +407,7 @@ import java.util.List;
* *
* @param udtaAtom The udta (user data) atom to decode. * @param udtaAtom The udta (user data) atom to decode.
* @param isQuickTime True for QuickTime media. False otherwise. * @param isQuickTime True for QuickTime media. False otherwise.
* @return Parsed metadata, or null.
*/ */
public static Metadata parseUdta(Atom.LeafAtom udtaAtom, boolean isQuickTime) { public static Metadata parseUdta(Atom.LeafAtom udtaAtom, boolean isQuickTime) {
if (isQuickTime) { if (isQuickTime) {
@ -868,12 +869,12 @@ import java.util.List;
/** /**
* Parses a stsd atom (defined in 14496-12). * Parses a stsd atom (defined in 14496-12).
* *
* @param stsd The stsd atom to decode. * @param stsd The stsd atom to decode.
* @param trackId The track's identifier in its container. * @param trackId The track's identifier in its container.
* @param rotationDegrees The rotation of the track in degrees. * @param rotationDegrees The rotation of the track in degrees.
* @param language The language of the track. * @param language The language of the track.
* @param drmInitData {@link DrmInitData} to be included in the format. * @param drmInitData {@link DrmInitData} to be included in the format.
* @param isQuickTime True for QuickTime media. False otherwise. * @param isQuickTime True for QuickTime media. False otherwise.
* @return An object containing the parsed data. * @return An object containing the parsed data.
*/ */
private static StsdData parseStsd(ParsableByteArray stsd, int trackId, int rotationDegrees, private static StsdData parseStsd(ParsableByteArray stsd, int trackId, int rotationDegrees,