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

Make SsMediaSource reusable.

Browse Source 
GitHub:#3498

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=183369041
This commit is contained in:
tonihei 2018-01-26 04:12:59 -08:00 committed by Oliver Woodman
parent 677fc291cf
commit e4a91b9e3d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,6 +245,7 @@ public final class SsMediaSource implements MediaSource,
*/ */
private static final long MIN_LIVE_DEFAULT_START_POSITION_US = 5000000; private static final long MIN_LIVE_DEFAULT_START_POSITION_US = 5000000;
private final boolean sideloadedManifest;
private final Uri manifestUri; private final Uri manifestUri;
private final DataSource.Factory manifestDataSourceFactory; private final DataSource.Factory manifestDataSourceFactory;
private final SsChunkSource.Factory chunkSourceFactory; private final SsChunkSource.Factory chunkSourceFactory;
@ -412,6 +413,7 @@ public final class SsMediaSource implements MediaSource,
this.minLoadableRetryCount = minLoadableRetryCount; this.minLoadableRetryCount = minLoadableRetryCount;
this.livePresentationDelayMs = livePresentationDelayMs; this.livePresentationDelayMs = livePresentationDelayMs;
this.eventDispatcher = new EventDispatcher(eventHandler, eventListener); this.eventDispatcher = new EventDispatcher(eventHandler, eventListener);
sideloadedManifest = manifest != null;
mediaPeriods = new ArrayList<>(); mediaPeriods = new ArrayList<>();
} }
@ -419,9 +421,8 @@ public final class SsMediaSource implements MediaSource,
@Override @Override
public void prepareSource(ExoPlayer player, boolean isTopLevelSource, Listener listener) { public void prepareSource(ExoPlayer player, boolean isTopLevelSource, Listener listener) {
Assertions.checkState(sourceListener == null, MEDIA_SOURCE_REUSED_ERROR_MESSAGE);
sourceListener = listener; sourceListener = listener;
if (manifest != null) { if (sideloadedManifest) {
manifestLoaderErrorThrower = new LoaderErrorThrower.Dummy(); manifestLoaderErrorThrower = new LoaderErrorThrower.Dummy();
processManifest(); processManifest();
} else { } else {
@ -456,7 +457,8 @@ public final class SsMediaSource implements MediaSource,
@Override @Override
public void releaseSource() { public void releaseSource() {
manifest = null; sourceListener = null;
manifest = sideloadedManifest ? manifest : null;
manifestDataSource = null; manifestDataSource = null;
manifestLoadStartTimestamp = 0; manifestLoadStartTimestamp = 0;
if (manifestLoader != null) { if (manifestLoader != null) {