loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't allow cancelation of non-cancelable loads

Browse Source 
Issue: #3441

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=175011804
This commit is contained in:
olly 2017-11-08 08:45:17 -08:00 committed by Oliver Woodman
parent 367bb64ba0
commit ed2e4dd91e
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
View File

@ -15,6 +15,8 @@
*/ */
package com.google.android.exoplayer2.source.chunk; package com.google.android.exoplayer2.source.chunk;
import android.util.Log;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.FormatHolder; import com.google.android.exoplayer2.FormatHolder;
@ -38,6 +40,8 @@ import java.util.List;
public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, SequenceableLoader, public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, SequenceableLoader,
Loader.Callback<Chunk>, Loader.ReleaseCallback { Loader.Callback<Chunk>, Loader.ReleaseCallback {
private static final String TAG = "ChunkSampleStream";
private final int primaryTrackType; private final int primaryTrackType;
private final int[] embeddedTrackTypes; private final int[] embeddedTrackTypes;
private final boolean[] embeddedTracksSelected; private final boolean[] embeddedTracksSelected;
@ -318,16 +322,20 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
boolean cancelable = bytesLoaded == 0 || !isMediaChunk || !haveReadFromLastMediaChunk(); boolean cancelable = bytesLoaded == 0 || !isMediaChunk || !haveReadFromLastMediaChunk();
boolean canceled = false; boolean canceled = false;
if (chunkSource.onChunkLoadError(loadable, cancelable, error)) { if (chunkSource.onChunkLoadError(loadable, cancelable, error)) {
canceled = true; if (!cancelable) {
if (isMediaChunk) { Log.w(TAG, "Ignoring attempt to cancel non-cancelable load.");
BaseMediaChunk removed = mediaChunks.removeLast(); } else {
Assertions.checkState(removed == loadable); canceled = true;
primarySampleQueue.discardUpstreamSamples(removed.getFirstSampleIndex(0)); if (isMediaChunk) {
for (int i = 0; i < embeddedSampleQueues.length; i++) { BaseMediaChunk removed = mediaChunks.removeLast();
embeddedSampleQueues[i].discardUpstreamSamples(removed.getFirstSampleIndex(i + 1)); Assertions.checkState(removed == loadable);
} primarySampleQueue.discardUpstreamSamples(removed.getFirstSampleIndex(0));
if (mediaChunks.isEmpty()) { for (int i = 0; i < embeddedSampleQueues.length; i++) {
pendingResetPositionUs = lastSeekPositionUs; embeddedSampleQueues[i].discardUpstreamSamples(removed.getFirstSampleIndex(i + 1));
}
if (mediaChunks.isEmpty()) {
pendingResetPositionUs = lastSeekPositionUs;
}
} }
} }
} }

3
library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java
View File

@ -85,7 +85,8 @@ public interface ChunkSource {
* @param chunk The chunk whose load encountered the error. * @param chunk The chunk whose load encountered the error.
* @param cancelable Whether the load can be canceled. * @param cancelable Whether the load can be canceled.
* @param e The error. * @param e The error.
* @return Whether the load should be canceled. * @return Whether the load should be canceled. Should always be false if {@code cancelable} is
* false.
*/ */
boolean onChunkLoadError(Chunk chunk, boolean cancelable, Exception e); boolean onChunkLoadError(Chunk chunk, boolean cancelable, Exception e);