Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
2cab83e6
authored
Nov 26, 2018
by
olly
Committed by
Oliver Woodman
Nov 27, 2018
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix unnecessary media playlist requests when playing live streams
Issue: #5059 PiperOrigin-RevId: 222803511
parent
3a0b1270
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
6 deletions
RELEASENOTES.md
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
RELEASENOTES.md
View file @
2cab83e6
...
...
@@ -2,6 +2,8 @@
### 2.9.2 ###
*
HLS: Fix issue causing unnecessary media playlist requests when playing live
streams (
[
#5059
](
https://github.com/google/ExoPlayer/issues/5059
)
).
*
MP4: Support Opus and FLAC in the MP4 container, and in DASH
(
[
#4883
](
https://github.com/google/ExoPlayer/issues/4883
)
).
*
Support seeking for a wider range of MPEG-TS streams
...
...
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
View file @
2cab83e6
...
...
@@ -262,7 +262,8 @@ import java.util.List;
// Retry when playlist is refreshed.
return
;
}
HlsMediaPlaylist
mediaPlaylist
=
playlistTracker
.
getPlaylistSnapshot
(
selectedUrl
);
HlsMediaPlaylist
mediaPlaylist
=
playlistTracker
.
getPlaylistSnapshot
(
selectedUrl
,
/* isForPlayback= */
true
);
independentSegments
=
mediaPlaylist
.
hasIndependentSegments
;
updateLiveEdgeTimeUs
(
mediaPlaylist
);
...
...
@@ -279,7 +280,7 @@ import java.util.List;
// behind the live window.
selectedVariantIndex
=
oldVariantIndex
;
selectedUrl
=
variants
[
selectedVariantIndex
];
mediaPlaylist
=
playlistTracker
.
getPlaylistSnapshot
(
selectedUrl
);
mediaPlaylist
=
playlistTracker
.
getPlaylistSnapshot
(
selectedUrl
,
/* isForPlayback= */
true
);
startOfPlaylistInPeriodUs
=
mediaPlaylist
.
startTimeUs
-
playlistTracker
.
getInitialStartTimeUs
();
chunkMediaSequence
=
previous
.
getNextChunkIndex
();
...
...
@@ -435,7 +436,8 @@ import java.util.List;
chunkIterators
[
i
]
=
MediaChunkIterator
.
EMPTY
;
continue
;
}
HlsMediaPlaylist
playlist
=
playlistTracker
.
getPlaylistSnapshot
(
variantUrl
);
HlsMediaPlaylist
playlist
=
playlistTracker
.
getPlaylistSnapshot
(
variantUrl
,
/* isForPlayback= */
false
);
long
startOfPlaylistInPeriodUs
=
playlist
.
startTimeUs
-
playlistTracker
.
getInitialStartTimeUs
();
boolean
switchingVariant
=
variantIndex
!=
oldVariantIndex
;
...
...
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
View file @
2cab83e6
...
...
@@ -162,9 +162,9 @@ public final class DefaultHlsPlaylistTracker
}
@Override
public
HlsMediaPlaylist
getPlaylistSnapshot
(
HlsUrl
url
)
{
public
HlsMediaPlaylist
getPlaylistSnapshot
(
HlsUrl
url
,
boolean
isForPlayback
)
{
HlsMediaPlaylist
snapshot
=
playlistBundles
.
get
(
url
).
getPlaylistSnapshot
();
if
(
snapshot
!=
null
)
{
if
(
snapshot
!=
null
&&
isForPlayback
)
{
maybeSetPrimaryUrl
(
url
);
}
return
snapshot
;
...
...
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
View file @
2cab83e6
...
...
@@ -167,11 +167,13 @@ public interface HlsPlaylistTracker {
* HlsUrl}.
*
* @param url The {@link HlsUrl} corresponding to the requested media playlist.
* @param isForPlayback Whether the caller might use the snapshot to request media segments for
* playback. If true, the primary playlist may be updated to the one requested.
* @return The most recent snapshot of the playlist referenced by the provided {@link HlsUrl}. May
* be null if no snapshot has been loaded yet.
*/
@Nullable
HlsMediaPlaylist
getPlaylistSnapshot
(
HlsUrl
url
);
HlsMediaPlaylist
getPlaylistSnapshot
(
HlsUrl
url
,
boolean
isForPlayback
);
/**
* Returns the start time of the first loaded primary playlist, or {@link C#TIME_UNSET} if no
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment