sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't pass chunk list to ChunkSource.disable().

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=114545827
This commit is contained in:
olly 2016-02-12 10:14:45 -08:00 committed by Oliver Woodman
parent 782817d524
commit 362d0400cd
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/src/main/java/com/google/android/exoplayer/chunk/ChunkSampleSource.java
View file

@ -205,7 +205,7 @@ public class ChunkSampleSource implements SampleSource, TrackStream, Loader.Call
Assertions.checkState(--enabledTrackCount == 0); Assertions.checkState(--enabledTrackCount == 0);
state = STATE_PREPARED; state = STATE_PREPARED;
try { try {
chunkSource.disable(mediaChunks); chunkSource.disable();
} finally { } finally {
loadControl.unregister(this); loadControl.unregister(this);
if (loader.isLoading()) { if (loader.isLoading()) {

4
library/src/main/java/com/google/android/exoplayer/chunk/ChunkSource.java
View file

@ -135,9 +135,7 @@ public interface ChunkSource {
* Disables the source. * Disables the source.
* <p> * <p>
* This method should only be called when the source is enabled. * 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<? extends MediaChunk> queue); void disable();
} }

2
library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java
View file

@ -491,7 +491,7 @@ public class DashChunkSource implements ChunkSource {
} }
@Override @Override
public void disable(List<? extends MediaChunk> queue) { public void disable() {
if (enabledFormats.length > 1) { if (enabledFormats.length > 1) {
adaptiveFormatEvaluator.disable(); adaptiveFormatEvaluator.disable();
} }

2
library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingChunkSource.java
View file

@ -332,7 +332,7 @@ public class SmoothStreamingChunkSource implements ChunkSource {
} }
@Override @Override
public void disable(List<? extends MediaChunk> queue) { public void disable() {
if (enabledFormats.length > 1) { if (enabledFormats.length > 1) {
adaptiveFormatEvaluator.disable(); adaptiveFormatEvaluator.disable();
} }