From 9b0d24c909bc73f9410fa6f1a50064bf6f350548 Mon Sep 17 00:00:00 2001 From: olly Date: Thu, 16 Mar 2017 04:34:22 -0700 Subject: [PATCH] Fix stuck-buffering state when playing merged media Also added a TODO to track clarifying SequenceableLoader more accurately and auditing existing implementations. Issue: #2396 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=150305685 --- .../google/android/exoplayer2/source/ExtractorMediaPeriod.java | 1 + .../com/google/android/exoplayer2/source/SequenceableLoader.java | 1 + 2 files changed, 2 insertions(+) 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 31b76a84b3..d843943710 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 @@ -354,6 +354,7 @@ import java.io.IOException; sourceListener.onSourceInfoRefreshed( new SinglePeriodTimeline(durationUs, seekMap.isSeekable()), null); } + callback.onContinueLoadingRequested(this); } @Override diff --git a/library/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java b/library/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java index 9aebcece9e..f287153719 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java @@ -17,6 +17,7 @@ package com.google.android.exoplayer2.source; import com.google.android.exoplayer2.C; +// TODO: Clarify the requirements for implementing this interface [Internal ref: b/36250203]. /** * A loader that can proceed in approximate synchronization with other loaders. */