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

Fix main thread playlist refreshes in HlsPlaylistTracker

Browse Source 
The refresh handler in HlsPlaylistTracker was being instantiated in the
same thread as the MediaSource (i.e. Main thread).

Issue:#2108

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=140197553
This commit is contained in:
aquilescanta 2016-11-25 06:13:35 -08:00 committed by Oliver Woodman
parent 894ae1a310
commit 97a23ce572
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
View File

@ -42,11 +42,12 @@ public final class HlsMediaSource implements MediaSource,
*/
public static final int DEFAULT_MIN_LOADABLE_RETRY_COUNT = 3;
private final HlsPlaylistTracker playlistTracker;
private final Uri manifestUri;
private final DataSource.Factory dataSourceFactory;
private final int minLoadableRetryCount;
private final EventDispatcher eventDispatcher;
private HlsPlaylistTracker playlistTracker;
private MediaSource.Listener sourceListener;
public HlsMediaSource(Uri manifestUri, DataSource.Factory dataSourceFactory, Handler eventHandler,
@ -58,15 +59,17 @@ public final class HlsMediaSource implements MediaSource,
public HlsMediaSource(Uri manifestUri, DataSource.Factory dataSourceFactory,
int minLoadableRetryCount, Handler eventHandler,
AdaptiveMediaSourceEventListener eventListener) {
this.manifestUri = manifestUri;
this.dataSourceFactory = dataSourceFactory;
this.minLoadableRetryCount = minLoadableRetryCount;
eventDispatcher = new EventDispatcher(eventHandler, eventListener);
playlistTracker = new HlsPlaylistTracker(manifestUri, dataSourceFactory, eventDispatcher,
minLoadableRetryCount, this);
}
@Override
public void prepareSource(MediaSource.Listener listener) {
Assertions.checkState(playlistTracker == null);
playlistTracker = new HlsPlaylistTracker(manifestUri, dataSourceFactory, eventDispatcher,
minLoadableRetryCount, this);
sourceListener = listener;
playlistTracker.start();
}
@ -91,6 +94,7 @@ public final class HlsMediaSource implements MediaSource,
@Override
public void releaseSource() {
playlistTracker.release();
playlistTracker = null;
sourceListener = null;
}