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

Use LoadErrorHandlingPolicy.getRetryDelayMsFor for DASH/SS manifest loads.

Browse Source 
Both manifest loads currently use the default retry delay although a
LoadErrorHandlingPolicy is provided to the MediaSource.

PiperOrigin-RevId: 242852672
This commit is contained in:
tonihei 2019-04-10 13:47:25 +01:00 committed by Oliver Woodman
parent 30beb9b300
commit c830c8dc63
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View File

@ -812,7 +812,8 @@ public final class DashMediaSource extends BaseMediaSource {
ParsingLoadable<DashManifest> loadable, ParsingLoadable<DashManifest> loadable,
long elapsedRealtimeMs, long elapsedRealtimeMs,
long loadDurationMs, long loadDurationMs,
IOException error) { IOException error,
int errorCount) {
boolean isFatal = error instanceof ParserException; boolean isFatal = error instanceof ParserException;
manifestEventDispatcher.loadError( manifestEventDispatcher.loadError(
loadable.dataSpec, loadable.dataSpec,
@ -824,7 +825,12 @@ public final class DashMediaSource extends BaseMediaSource {
loadable.bytesLoaded(), loadable.bytesLoaded(),
error, error,
isFatal); isFatal);
return isFatal ? Loader.DONT_RETRY_FATAL : Loader.RETRY; return isFatal
? Loader.DONT_RETRY_FATAL
: Loader.createRetryAction(
/* resetErrorCount= */ false,
loadErrorHandlingPolicy.getRetryDelayMsFor(
C.DATA_TYPE_MANIFEST, loadDurationMs, error, errorCount));
} }
/* package */ void onUtcTimestampLoadCompleted(ParsingLoadable<Long> loadable, /* package */ void onUtcTimestampLoadCompleted(ParsingLoadable<Long> loadable,
@ -1296,7 +1302,7 @@ public final class DashMediaSource extends BaseMediaSource {
long loadDurationMs, long loadDurationMs,
IOException error, IOException error,
int errorCount) { int errorCount) {
return onManifestLoadError(loadable, elapsedRealtimeMs, loadDurationMs, error); return onManifestLoadError(loadable, elapsedRealtimeMs, loadDurationMs, error, errorCount);
} }
} }

7
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
View File

@ -639,7 +639,12 @@ public final class SsMediaSource extends BaseMediaSource
loadable.bytesLoaded(), loadable.bytesLoaded(),
error, error,
isFatal); isFatal);
return isFatal ? Loader.DONT_RETRY_FATAL : Loader.RETRY; return isFatal
? Loader.DONT_RETRY_FATAL
: Loader.createRetryAction(
/* resetErrorCount= */ false,
loadErrorHandlingPolicy.getRetryDelayMsFor(
C.DATA_TYPE_MANIFEST, loadDurationMs, error, errorCount));
} }
// Internal methods // Internal methods