From 362d0400cd6334552566774b213912ee6acf63d3 Mon Sep 17 00:00:00 2001 From: olly Date: Fri, 12 Feb 2016 10:14:45 -0800 Subject: [PATCH] Don't pass chunk list to ChunkSource.disable(). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=114545827 --- .../com/google/android/exoplayer/chunk/ChunkSampleSource.java | 2 +- .../java/com/google/android/exoplayer/chunk/ChunkSource.java | 4 +--- .../com/google/android/exoplayer/dash/DashChunkSource.java | 2 +- .../exoplayer/smoothstreaming/SmoothStreamingChunkSource.java | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/ChunkSampleSource.java b/library/src/main/java/com/google/android/exoplayer/chunk/ChunkSampleSource.java index 9a260cbd86..acb52f60d5 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/ChunkSampleSource.java +++ b/library/src/main/java/com/google/android/exoplayer/chunk/ChunkSampleSource.java @@ -205,7 +205,7 @@ public class ChunkSampleSource implements SampleSource, TrackStream, Loader.Call Assertions.checkState(--enabledTrackCount == 0); state = STATE_PREPARED; try { - chunkSource.disable(mediaChunks); + chunkSource.disable(); } finally { loadControl.unregister(this); if (loader.isLoading()) { diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/ChunkSource.java b/library/src/main/java/com/google/android/exoplayer/chunk/ChunkSource.java index 91cfb4dcbc..d8dc60179c 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/ChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer/chunk/ChunkSource.java @@ -135,9 +135,7 @@ public interface ChunkSource { * Disables the source. *

* This method should only be called when the source is enabled. - * - * @param queue A representation of the currently buffered {@link MediaChunk}s. */ - void disable(List queue); + void disable(); } diff --git a/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java b/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java index 37986d0a57..d1ef47b41f 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java @@ -491,7 +491,7 @@ public class DashChunkSource implements ChunkSource { } @Override - public void disable(List queue) { + public void disable() { if (enabledFormats.length > 1) { adaptiveFormatEvaluator.disable(); } diff --git a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingChunkSource.java b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingChunkSource.java index 9d82d36177..bad79f7266 100644 --- a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingChunkSource.java @@ -332,7 +332,7 @@ public class SmoothStreamingChunkSource implements ChunkSource { } @Override - public void disable(List queue) { + public void disable() { if (enabledFormats.length > 1) { adaptiveFormatEvaluator.disable(); }