mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2024-12-25 09:30:32 +00:00
-Fixed failed media source not treated as ready.
This commit is contained in:
parent
563a4137bd
commit
ac431e3ece
@ -4,10 +4,8 @@ import android.support.annotation.NonNull;
|
|||||||
|
|
||||||
import com.google.android.exoplayer2.ExoPlayer;
|
import com.google.android.exoplayer2.ExoPlayer;
|
||||||
import com.google.android.exoplayer2.source.MediaPeriod;
|
import com.google.android.exoplayer2.source.MediaPeriod;
|
||||||
import com.google.android.exoplayer2.source.MediaSource;
|
|
||||||
import com.google.android.exoplayer2.upstream.Allocator;
|
import com.google.android.exoplayer2.upstream.Allocator;
|
||||||
|
|
||||||
import org.schabi.newpipe.extractor.stream.StreamInfo;
|
|
||||||
import org.schabi.newpipe.playlist.PlayQueueItem;
|
import org.schabi.newpipe.playlist.PlayQueueItem;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
@ -219,13 +219,16 @@ public class MediaSourceManager {
|
|||||||
//////////////////////////////////////////////////////////////////////////*/
|
//////////////////////////////////////////////////////////////////////////*/
|
||||||
|
|
||||||
private boolean isPlayQueueReady() {
|
private boolean isPlayQueueReady() {
|
||||||
|
if (playQueue == null) return false;
|
||||||
|
|
||||||
final boolean isWindowLoaded = playQueue.size() - playQueue.getIndex() > windowSize;
|
final boolean isWindowLoaded = playQueue.size() - playQueue.getIndex() > windowSize;
|
||||||
return playQueue.isComplete() || isWindowLoaded;
|
return playQueue.isComplete() || isWindowLoaded;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Checks if the current playback media source is a placeholder, if so, then it is not ready
|
||||||
private boolean isPlaybackReady() {
|
private boolean isPlaybackReady() {
|
||||||
return sources.getSize() > 0 &&
|
return sources != null && playQueue != null && sources.getSize() > playQueue.getIndex() &&
|
||||||
sources.getMediaSource(playQueue.getIndex()) instanceof LoadedMediaSource;
|
!(sources.getMediaSource(playQueue.getIndex()) instanceof PlaceholderMediaSource);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void tryBlock() {
|
private void tryBlock() {
|
||||||
|
Loading…
Reference in New Issue
Block a user