sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-27 09:45:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add an errorCount argument to onLoadError

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=202313695
This commit is contained in:
aquilescanta 2018-06-27 08:33:33 -07:00 committed by Oliver Woodman
parent 93cbae5bff
commit fc2168eb61
8 changed files with 39 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java
View file

@ -534,7 +534,11 @@ import java.util.Arrays;
@Override
public LoadErrorAction onLoadError(
ExtractingLoadable loadable, long elapsedRealtimeMs, long loadDurationMs, IOException error) {
ExtractingLoadable loadable,
long elapsedRealtimeMs,
long loadDurationMs,
IOException error,
int errorCount) {
boolean isErrorFatal = isLoadableExceptionFatal(error);
eventDispatcher.loadError(
loadable.dataSpec,

8
library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java
View file

@ -62,7 +62,6 @@ import java.util.Arrays;
/* package */ boolean loadingSucceeded;
/* package */ byte[] sampleData;
/* package */ int sampleSize;
private int errorCount;
public SingleSampleMediaPeriod(
DataSpec dataSpec,
@ -230,8 +229,11 @@ import java.util.Arrays;
@Override
public LoadErrorAction onLoadError(
SourceLoadable loadable, long elapsedRealtimeMs, long loadDurationMs, IOException error) {
errorCount++;
SourceLoadable loadable,
long elapsedRealtimeMs,
long loadDurationMs,
IOException error,
int errorCount) {
boolean cancel = treatLoadErrorsAsEndOfStream && errorCount >= minLoadableRetryCount;
eventDispatcher.loadError(
loadable.dataSpec,

6
library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
View file

@ -411,7 +411,11 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
@Override
public LoadErrorAction onLoadError(
Chunk loadable, long elapsedRealtimeMs, long loadDurationMs, IOException error) {
Chunk loadable,
long elapsedRealtimeMs,
long loadDurationMs,
IOException error,
int errorCount) {
long bytesLoaded = loadable.bytesLoaded();
boolean isMediaChunk = isMediaChunk(loadable);
int lastChunkIndex = mediaChunks.size() - 1;

14
library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
View file

@ -111,12 +111,13 @@ public final class Loader implements LoaderErrorThrower {
* @param elapsedRealtimeMs {@link SystemClock#elapsedRealtime} when the error occurred.
* @param loadDurationMs The duration of the load up to the point at which the error occurred.
* @param error The load error.
* @param errorCount The number of errors this load has encountered, including this one.
* @return The desired error handling action. One of {@link Loader#RETRY}, {@link
* Loader#RETRY_RESET_ERROR_COUNT}, {@link Loader#DONT_RETRY}, {@link
* Loader#DONT_RETRY_FATAL} or a retry action created by {@link #createRetryAction}.
*/
LoadErrorAction onLoadError(
T loadable, long elapsedRealtimeMs, long loadDurationMs, IOException error);
T loadable, long elapsedRealtimeMs, long loadDurationMs, IOException error, int errorCount);
}
/**
@ -164,7 +165,7 @@ public final class Loader implements LoaderErrorThrower {
/**
* Action that can be taken in response to {@link Callback#onLoadError(Loadable, long, long,
* IOException)}.
* IOException, int)}.
*/
public static final class LoadErrorAction {
@ -445,12 +446,15 @@ public final class Loader implements LoaderErrorThrower {
break;
case MSG_IO_EXCEPTION:
currentError = (IOException) msg.obj;
LoadErrorAction action = callback.onLoadError(loadable, nowMs, durationMs, currentError);
errorCount++;
LoadErrorAction action =
callback.onLoadError(loadable, nowMs, durationMs, currentError, errorCount);
if (action.type == ACTION_TYPE_DONT_RETRY_FATAL) {
fatalError = currentError;
} else if (action.type != ACTION_TYPE_DONT_RETRY) {
errorCount =
action.type == ACTION_TYPE_RETRY_AND_RESET_ERROR_COUNT ? 1 : errorCount + 1;
if (action.type == ACTION_TYPE_RETRY_AND_RESET_ERROR_COUNT) {
errorCount = 1;
}
start(
action.retryDelayMillis != C.TIME_UNSET
? action.retryDelayMillis

6
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View file

@ -1175,7 +1175,8 @@ public final class DashMediaSource extends BaseMediaSource {
ParsingLoadable<DashManifest> loadable,
long elapsedRealtimeMs,
long loadDurationMs,
IOException error) {
IOException error,
int errorCount) {
return onManifestLoadError(loadable, elapsedRealtimeMs, loadDurationMs, error);
}
@ -1200,7 +1201,8 @@ public final class DashMediaSource extends BaseMediaSource {
ParsingLoadable<Long> loadable,
long elapsedRealtimeMs,
long loadDurationMs,
IOException error) {
IOException error,
int errorCount) {
return onUtcTimestampLoadError(loadable, elapsedRealtimeMs, loadDurationMs, error);
}

6
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
View file

@ -604,7 +604,11 @@ import java.util.Arrays;
@Override
public LoadErrorAction onLoadError(
Chunk loadable, long elapsedRealtimeMs, long loadDurationMs, IOException error) {
Chunk loadable,
long elapsedRealtimeMs,
long loadDurationMs,
IOException error,
int errorCount) {
long bytesLoaded = loadable.bytesLoaded();
boolean isMediaChunk = isMediaChunk(loadable);
boolean cancelable = !isMediaChunk || bytesLoaded == 0;

6
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
View file

@ -234,7 +234,8 @@ public final class DefaultHlsPlaylistTracker
ParsingLoadable<HlsPlaylist> loadable,
long elapsedRealtimeMs,
long loadDurationMs,
IOException error) {
IOException error,
int errorCount) {
boolean isFatal = error instanceof ParserException;
eventDispatcher.loadError(
loadable.dataSpec,
@ -490,7 +491,8 @@ public final class DefaultHlsPlaylistTracker
ParsingLoadable<HlsPlaylist> loadable,
long elapsedRealtimeMs,
long loadDurationMs,
IOException error) {
IOException error,
int errorCount) {
boolean isFatal = error instanceof ParserException;
eventDispatcher.loadError(
loadable.dataSpec,

3
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
View file

@ -545,7 +545,8 @@ public final class SsMediaSource extends BaseMediaSource
ParsingLoadable<SsManifest> loadable,
long elapsedRealtimeMs,
long loadDurationMs,
IOException error) {
IOException error,
int errorCount) {
boolean isFatal = error instanceof ParserException;
manifestEventDispatcher.loadError(
loadable.dataSpec,