sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-06-28 05:29:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't pass INDEX_UNSET to ExoPlayer seek methods

Browse source 
It's not valid, and will cause IllegalSeekPositionException to be thrown

PiperOrigin-RevId: 327301325
This commit is contained in:
olly 2020-08-18 22:00:13 +01:00 committed by Oliver Woodman
parent ee743870d8
commit 8c5af10ab0
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java
View file

@ -294,7 +294,7 @@ import java.util.List;
@Nullable
public androidx.media2.common.MediaItem getCurrentMediaItem() {
int index = getCurrentMediaItemIndex();
return (index != C.INDEX_UNSET) ? media2Playlist.get(index) : null;
return index == C.INDEX_UNSET ? null : media2Playlist.get(index);
}
public boolean prepare() {
@ -307,9 +307,9 @@ import java.util.List;
public boolean play() {
if (player.getPlaybackState() == Player.STATE_ENDED) {
int currentWindowIndex = getCurrentMediaItemIndex();
boolean seekHandled =
controlDispatcher.dispatchSeekTo(player, currentWindowIndex, /* positionMs= */ 0);
controlDispatcher.dispatchSeekTo(
player, player.getCurrentWindowIndex(), /* positionMs= */ 0);
if (!seekHandled) {
return false;
}
@ -332,8 +332,7 @@ import java.util.List;
}
public boolean seekTo(long position) {
int currentWindowIndex = getCurrentMediaItemIndex();
return controlDispatcher.dispatchSeekTo(player, currentWindowIndex, position);
return controlDispatcher.dispatchSeekTo(player, player.getCurrentWindowIndex(), position);
}
public long getCurrentPosition() {