From be11369966bb28df60dc84a178b3f68d68e7f35d Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Mon, 10 Sep 2018 11:34:35 -0700 Subject: [PATCH] Remove UnhandledEditListException ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=212303130 --- .../android/exoplayer2/extractor/mp4/AtomParsers.java | 4 ---- .../exoplayer2/extractor/mp4/Mp4Extractor.java | 11 ++--------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java index 7197321bf0..cce7dc058a 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java @@ -42,9 +42,6 @@ import java.util.List; @SuppressWarnings("ConstantField") /* 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 int TYPE_vide = Util.getIntegerCodeForString("vide"); @@ -119,7 +116,6 @@ import java.util.List; * @param stblAtom stbl (sample table) atom to decode. * @param gaplessInfoHolder Holder to populate with gapless playback information. * @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. */ public static TrackSampleTable parseStbl( diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java index 2aa9b86444..7cf61b4ff3 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java @@ -386,15 +386,8 @@ public final class Mp4Extractor implements Extractor, SeekMap { } boolean ignoreEditLists = (flags & FLAG_WORKAROUND_IGNORE_EDIT_LISTS) != 0; - ArrayList trackSampleTables; - try { - 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); - } + ArrayList trackSampleTables = + getTrackSampleTables(moov, gaplessInfoHolder, ignoreEditLists); int trackCount = trackSampleTables.size(); for (int i = 0; i < trackCount; i++) {