From 62bdb1b93a3f7344b669587d1108ca41e83ad418 Mon Sep 17 00:00:00 2001 From: olly Date: Wed, 23 Nov 2016 07:34:00 -0800 Subject: [PATCH] Fix failure when a seek is performed with no enabled tracks This issue affects ExtractorMediaSource only. We shouldn't start loading in the case that we're prepared and have no enabled tracks, since there's nothing that we need to load. This was causing an assertion failure in startLoading. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=140030650 --- .../google/android/exoplayer2/source/ExtractorMediaPeriod.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java b/library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java index 3b18a06c75..13f33465d1 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java @@ -231,7 +231,7 @@ import java.io.IOException; @Override public boolean continueLoading(long playbackPositionUs) { - if (loadingFinished) { + if (loadingFinished || (prepared && enabledTrackCount == 0)) { return false; } boolean continuedLoading = loadCondition.open();