loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove UnhandledEditListException

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=212303130
This commit is contained in:
andrewlewis 2018-09-10 11:34:35 -07:00 committed by Oliver Woodman
parent bf0a7937e2
commit be11369966
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,9 +42,6 @@ import java.util.List;
@SuppressWarnings("ConstantField") @SuppressWarnings("ConstantField")
/* package */ final class AtomParsers { /* package */ final class AtomParsers {
/** Thrown if an edit list couldn't be applied. */
public static final class UnhandledEditListException extends ParserException {}
private static final String TAG = "AtomParsers"; private static final String TAG = "AtomParsers";
private static final int TYPE_vide = Util.getIntegerCodeForString("vide"); private static final int TYPE_vide = Util.getIntegerCodeForString("vide");
@ -119,7 +116,6 @@ import java.util.List;
* @param stblAtom stbl (sample table) atom to decode. * @param stblAtom stbl (sample table) atom to decode.
* @param gaplessInfoHolder Holder to populate with gapless playback information. * @param gaplessInfoHolder Holder to populate with gapless playback information.
* @return Sample table described by the stbl atom. * @return Sample table described by the stbl atom.
* @throws UnhandledEditListException Thrown if the edit list can't be applied.
* @throws ParserException Thrown if the stbl atom can't be parsed. * @throws ParserException Thrown if the stbl atom can't be parsed.
*/ */
public static TrackSampleTable parseStbl( public static TrackSampleTable parseStbl(

11
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
View File

@ -386,15 +386,8 @@ 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;
ArrayList<TrackSampleTable> trackSampleTables; ArrayList<TrackSampleTable> trackSampleTables =
try { getTrackSampleTables(moov, gaplessInfoHolder, ignoreEditLists);
trackSampleTables = getTrackSampleTables(moov, gaplessInfoHolder, ignoreEditLists);
} catch (AtomParsers.UnhandledEditListException e) {
// Discard gapless info as we aren't able to handle corresponding edits.
gaplessInfoHolder = new GaplessInfoHolder();
trackSampleTables =
getTrackSampleTables(moov, gaplessInfoHolder, /* ignoreEditLists= */ true);
}
int trackCount = trackSampleTables.size(); int trackCount = trackSampleTables.size();
for (int i = 0; i < trackCount; i++) { for (int i = 0; i < trackCount; i++) {