loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-16 20:19:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

HLS playlist tracking cleanup

Browse Source 
Make the public loadPlaylist method not take an argument again.

PiperOrigin-RevId: 342646259
This commit is contained in:
olly 2020-11-16 16:55:56 +00:00 committed by kim-vde
parent e832a4e0fc
commit 0a778ceb1c
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,6 +89,7 @@ public final class HlsMediaSource extends BaseMediaSource
public static final int METADATA_TYPE_ID3 = 1;
/** Type for ESMG metadata in HLS streams. */
public static final int METADATA_TYPE_EMSG = 3;
/** Factory for {@link HlsMediaSource}s. */
public static final class Factory implements MediaSourceFactory {

67
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
View File

@ -220,7 +220,7 @@ public final class DefaultHlsPlaylistTracker
@Override
public void refreshPlaylist(Uri url) {
playlistBundles.get(url).loadPlaylist(url);
playlistBundles.get(url).loadPlaylist();
}
@Override
@ -259,7 +259,7 @@ public final class DefaultHlsPlaylistTracker
// We don't need to load the playlist again. We can use the same result.
primaryBundle.processLoadedPlaylist((HlsMediaPlaylist) result, loadEventInfo);
} else {
primaryBundle.loadPlaylist(primaryMediaPlaylistUrl);
primaryBundle.loadPlaylist();
}
loadErrorHandlingPolicy.onLoadTaskConcluded(loadable.loadTaskId);
eventDispatcher.loadCompleted(loadEventInfo, C.DATA_TYPE_MANIFEST);
@ -324,7 +324,7 @@ public final class DefaultHlsPlaylistTracker
MediaPlaylistBundle bundle = playlistBundles.get(variants.get(i).url);
if (currentTimeMs > bundle.excludeUntilMs) {
primaryMediaPlaylistUrl = bundle.playlistUrl;
bundle.loadPlaylist(primaryMediaPlaylistUrl);
bundle.loadPlaylist();
return true;
}
}
@ -340,7 +340,7 @@ public final class DefaultHlsPlaylistTracker
return;
}
primaryMediaPlaylistUrl = url;
playlistBundles.get(primaryMediaPlaylistUrl).loadPlaylist(url);
playlistBundles.get(primaryMediaPlaylistUrl).loadPlaylist();
}
/** Returns whether any of the variants in the master playlist have the specified playlist URL. */
@ -480,7 +480,7 @@ public final class DefaultHlsPlaylistTracker
private long earliestNextLoadTimeMs;
private long excludeUntilMs;
private boolean loadPending;
private IOException playlistError;
@Nullable private IOException playlistError;
public MediaPlaylistBundle(Uri playlistUrl) {
this.playlistUrl = playlistUrl;
@ -505,33 +505,8 @@ public final class DefaultHlsPlaylistTracker
|| lastSnapshotLoadMs + snapshotValidityDurationMs > currentTimeMs;
}
public void release() {
mediaPlaylistLoader.release();
}
/**
* Loads the playlist.
*
* @param requestUri The URI to be used for loading the playlist.
*/
public void loadPlaylist(Uri requestUri) {
excludeUntilMs = 0;
if (loadPending || mediaPlaylistLoader.isLoading() || mediaPlaylistLoader.hasFatalError()) {
// Load already pending, in progress, or a fatal error has been encountered. Do nothing.
return;
}
long currentTimeMs = SystemClock.elapsedRealtime();
if (currentTimeMs < earliestNextLoadTimeMs) {
loadPending = true;
playlistRefreshHandler.postDelayed(
() -> {
loadPending = false;
loadPlaylistImmediately(requestUri);
},
earliestNextLoadTimeMs - currentTimeMs);
} else {
loadPlaylistImmediately(requestUri);
}
public void loadPlaylist() {
loadPlaylistInternal(playlistUrl);
}
public void maybeThrowPlaylistRefreshError() throws IOException {
@ -541,6 +516,10 @@ public final class DefaultHlsPlaylistTracker
}
}
public void release() {
mediaPlaylistLoader.release();
}
// Loader.Callback implementation.
@Override
@ -609,7 +588,7 @@ public final class DefaultHlsPlaylistTracker
// Intercept bad request and service unavailable to force a full, non-blocking request
// (see RFC 8216, section 6.2.5.2).
earliestNextLoadTimeMs = SystemClock.elapsedRealtime();
loadPlaylist(/* requestUri= */ playlistUrl);
loadPlaylist();
castNonNull(eventDispatcher)
.loadError(loadEventInfo, loadable.type, error, /* wasCanceled= */ true);
return Loader.DONT_RETRY;
@ -648,6 +627,26 @@ public final class DefaultHlsPlaylistTracker
// Internal methods.
public void loadPlaylistInternal(Uri playlistRequestUri) {
excludeUntilMs = 0;
if (loadPending || mediaPlaylistLoader.isLoading() || mediaPlaylistLoader.hasFatalError()) {
// Load already pending, in progress, or a fatal error has been encountered. Do nothing.
return;
}
long currentTimeMs = SystemClock.elapsedRealtime();
if (currentTimeMs < earliestNextLoadTimeMs) {
loadPending = true;
playlistRefreshHandler.postDelayed(
() -> {
loadPending = false;
loadPlaylistImmediately(playlistRequestUri);
},
earliestNextLoadTimeMs - currentTimeMs);
} else {
loadPlaylistImmediately(playlistRequestUri);
}
}
private void loadPlaylistImmediately(Uri playlistRequestUri) {
ParsingLoadable<HlsPlaylist> mediaPlaylistLoadable =
new ParsingLoadable<>(
@ -721,7 +720,7 @@ public final class DefaultHlsPlaylistTracker
// next load will be scheduled when refreshPlaylist is called, or when this playlist becomes
// the primary.
if (playlistUrl.equals(primaryMediaPlaylistUrl) && !playlistSnapshot.hasEndTag) {
loadPlaylist(getMediaPlaylistUriForReload());
loadPlaylistInternal(getMediaPlaylistUriForReload());
}
}