Skip to content

SDK / exoplayer

Go to a project
Commit 2eab6802 by kimvde Committed by Oliver Woodman
Options

Parse stbl in FragmentedMp4Extractor 

This will be necessary to support partially fragmented MP4s.

PiperOrigin-RevId: 318798726
parent e9249c3a
Expand all
Inline Side-by-side
Showing with 158 additions and 129 deletions
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
*/ */
package com.google.android.exoplayer2.extractor.mp4; package com.google.android.exoplayer2.extractor.mp4;
import static com.google.android.exoplayer2.extractor.mp4.AtomParsers.parseTraks;
import android.util.Pair; import android.util.Pair;
import android.util.SparseArray; import android.util.SparseArray;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
...@@ -31,6 +33,7 @@ import com.google.android.exoplayer2.extractor.Extractor; ...@@ -31,6 +33,7 @@ import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.ExtractorInput;
import com.google.android.exoplayer2.extractor.ExtractorOutput; import com.google.android.exoplayer2.extractor.ExtractorOutput;
import com.google.android.exoplayer2.extractor.ExtractorsFactory; import com.google.android.exoplayer2.extractor.ExtractorsFactory;
import com.google.android.exoplayer2.extractor.GaplessInfoHolder;
import com.google.android.exoplayer2.extractor.PositionHolder; import com.google.android.exoplayer2.extractor.PositionHolder;
import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.extractor.SeekMap;
import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.extractor.TrackOutput;
...@@ -479,33 +482,22 @@ public class FragmentedMp4Extractor implements Extractor { ...@@ -479,33 +482,22 @@ public class FragmentedMp4Extractor implements Extractor {
} }
} }
// Construction of tracks. // Construction of tracks and sample tables.
SparseArray<Track> tracks = new SparseArray<>(); List<TrackSampleTable> trackSampleTables =
int moovContainerChildrenSize = moov.containerChildren.size(); parseTraks(
for (int i = 0; i < moovContainerChildrenSize; i++) { moov,
Atom.ContainerAtom atom = moov.containerChildren.get(i); new GaplessInfoHolder(),
if (atom.type == Atom.TYPE_trak) { duration,
@Nullable drmInitData,
Track track = /* ignoreEditLists= */ (flags & FLAG_WORKAROUND_IGNORE_EDIT_LISTS) != 0,
modifyTrack( /* isQuickTime= */ false,
AtomParsers.parseTrak( this::modifyTrack);
atom,
moov.getLeafAtomOfType(Atom.TYPE_mvhd),
duration,
drmInitData,
(flags & FLAG_WORKAROUND_IGNORE_EDIT_LISTS) != 0,
false));
if (track != null) {
tracks.put(track.id, track);
}
}
}
int trackCount = tracks.size(); int trackCount = trackSampleTables.size();
if (trackBundles.size() == 0) { if (trackBundles.size() == 0) {
// We need to create the track bundles. // We need to create the track bundles.
for (int i = 0; i < trackCount; i++) { for (int i = 0; i < trackCount; i++) {
Track track = tracks.valueAt(i); Track track = trackSampleTables.get(i).track;
TrackBundle trackBundle = new TrackBundle(extractorOutput.track(i, track.type)); TrackBundle trackBundle = new TrackBundle(extractorOutput.track(i, track.type));
trackBundle.init(track, getDefaultSampleValues(defaultSampleValuesArray, track.id)); trackBundle.init(track, getDefaultSampleValues(defaultSampleValuesArray, track.id));
trackBundles.put(track.id, trackBundle); trackBundles.put(track.id, trackBundle);
...@@ -516,7 +508,7 @@ public class FragmentedMp4Extractor implements Extractor { ...@@ -516,7 +508,7 @@ public class FragmentedMp4Extractor implements Extractor {
} else { } else {
Assertions.checkState(trackBundles.size() == trackCount); Assertions.checkState(trackBundles.size() == trackCount);
for (int i = 0; i < trackCount; i++) { for (int i = 0; i < trackCount; i++) {
Track track = tracks.valueAt(i); Track track = trackSampleTables.get(i).track;
trackBundles trackBundles
.get(track.id) .get(track.id)
.init(track, getDefaultSampleValues(defaultSampleValuesArray, track.id)); .init(track, getDefaultSampleValues(defaultSampleValuesArray, track.id));
...@@ -1447,13 +1439,34 @@ public class FragmentedMp4Extractor implements Extractor { ...@@ -1447,13 +1439,34 @@ public class FragmentedMp4Extractor implements Extractor {
/** Returns whether the extractor should decode a leaf atom with type {@code atom}. */ /** Returns whether the extractor should decode a leaf atom with type {@code atom}. */
private static boolean shouldParseLeafAtom(int atom) { private static boolean shouldParseLeafAtom(int atom) {
return atom == Atom.TYPE_hdlr || atom == Atom.TYPE_mdhd || atom == Atom.TYPE_mvhd return atom == Atom.TYPE_hdlr
|| atom == Atom.TYPE_sidx || atom == Atom.TYPE_stsd || atom == Atom.TYPE_tfdt || atom == Atom.TYPE_mdhd
|| atom == Atom.TYPE_tfhd || atom == Atom.TYPE_tkhd || atom == Atom.TYPE_trex || atom == Atom.TYPE_mvhd
|| atom == Atom.TYPE_trun || atom == Atom.TYPE_pssh || atom == Atom.TYPE_saiz || atom == Atom.TYPE_sidx
|| atom == Atom.TYPE_saio || atom == Atom.TYPE_senc || atom == Atom.TYPE_uuid || atom == Atom.TYPE_stsd
|| atom == Atom.TYPE_sbgp || atom == Atom.TYPE_sgpd || atom == Atom.TYPE_elst || atom == Atom.TYPE_stts
|| atom == Atom.TYPE_mehd || atom == Atom.TYPE_emsg; || atom == Atom.TYPE_ctts
|| atom == Atom.TYPE_stsc
|| atom == Atom.TYPE_stsz
|| atom == Atom.TYPE_stz2
|| atom == Atom.TYPE_stco
|| atom == Atom.TYPE_co64
|| atom == Atom.TYPE_stss
|| atom == Atom.TYPE_tfdt
|| atom == Atom.TYPE_tfhd
|| atom == Atom.TYPE_tkhd
|| atom == Atom.TYPE_trex
|| atom == Atom.TYPE_trun
|| atom == Atom.TYPE_pssh
|| atom == Atom.TYPE_saiz
|| atom == Atom.TYPE_saio
|| atom == Atom.TYPE_senc
|| atom == Atom.TYPE_uuid
|| atom == Atom.TYPE_sbgp
|| atom == Atom.TYPE_sgpd
|| atom == Atom.TYPE_elst
|| atom == Atom.TYPE_mehd
|| atom == Atom.TYPE_emsg;
} }
/** Returns whether the extractor should decode a container atom with type {@code atom}. */ /** Returns whether the extractor should decode a container atom with type {@code atom}. */
......
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
...@@ -409,11 +409,21 @@ public final class Mp4Extractor implements Extractor, SeekMap { ...@@ -409,11 +409,21 @@ public final class Mp4Extractor implements Extractor, SeekMap {
boolean ignoreEditLists = (flags & FLAG_WORKAROUND_IGNORE_EDIT_LISTS) != 0; boolean ignoreEditLists = (flags & FLAG_WORKAROUND_IGNORE_EDIT_LISTS) != 0;
List<TrackSampleTable> trackSampleTables = List<TrackSampleTable> trackSampleTables =
parseTraks(moov, gaplessInfoHolder, ignoreEditLists, isQuickTime); parseTraks(
moov,
gaplessInfoHolder,
/* duration= */ C.TIME_UNSET,
/* drmInitData= */ null,
ignoreEditLists,
isQuickTime,
/* modifyTrackFunction= */ track -> track);
int trackCount = trackSampleTables.size(); int trackCount = trackSampleTables.size();
for (int i = 0; i < trackCount; i++) { for (int i = 0; i < trackCount; i++) {
TrackSampleTable trackSampleTable = trackSampleTables.get(i); TrackSampleTable trackSampleTable = trackSampleTables.get(i);
if (trackSampleTable.sampleCount == 0) {
continue;
}
Track track = trackSampleTable.track; Track track = trackSampleTable.track;
long trackDurationUs = long trackDurationUs =
track.durationUs != C.TIME_UNSET ? track.durationUs : trackSampleTable.durationUs; track.durationUs != C.TIME_UNSET ? track.durationUs : trackSampleTable.durationUs;
......
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