loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-17 12:39:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify DefaultControlDispatcher by using Player methods

Browse Source 
PiperOrigin-RevId: 379732136
This commit is contained in:
kimvde 2021-06-16 17:00:44 +01:00 committed by Oliver Woodman
parent 63f12f0216
commit 56e97783eb
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
library/common/src/main/java/com/google/android/exoplayer2/DefaultControlDispatcher.java
View File

@ -28,7 +28,6 @@ public class DefaultControlDispatcher implements ControlDispatcher {
private static final int MAX_POSITION_FOR_SEEK_TO_PREVIOUS = 3000;
private final Timeline.Window window;
private final long rewindIncrementMs;
private final long fastForwardIncrementMs;
@ -48,7 +47,6 @@ public class DefaultControlDispatcher implements ControlDispatcher {
public DefaultControlDispatcher(long fastForwardIncrementMs, long rewindIncrementMs) {
this.fastForwardIncrementMs = fastForwardIncrementMs;
this.rewindIncrementMs = rewindIncrementMs;
window = new Timeline.Window();
}
@Override
@ -75,16 +73,14 @@ public class DefaultControlDispatcher implements ControlDispatcher {
if (timeline.isEmpty() || player.isPlayingAd()) {
return true;
}
int windowIndex = player.getCurrentWindowIndex();
timeline.getWindow(windowIndex, window);
int previousWindowIndex = player.getPreviousWindowIndex();
boolean isUnseekableLiveStream = window.isLive() && !window.isSeekable;
if (previousWindowIndex != C.INDEX_UNSET
boolean isUnseekableLiveStream =
player.isCurrentWindowLive() && !player.isCurrentWindowSeekable();
if (player.hasPrevious()
&& (player.getCurrentPosition() <= MAX_POSITION_FOR_SEEK_TO_PREVIOUS
|| isUnseekableLiveStream)) {
player.seekTo(previousWindowIndex, C.TIME_UNSET);
player.previous();
} else if (!isUnseekableLiveStream) {
player.seekTo(windowIndex, /* positionMs= */ 0);
player.seekTo(/* positionMs= */ 0);
}
return true;
}
@ -95,13 +91,10 @@ public class DefaultControlDispatcher implements ControlDispatcher {
if (timeline.isEmpty() || player.isPlayingAd()) {
return true;
}
int windowIndex = player.getCurrentWindowIndex();
timeline.getWindow(windowIndex, window);
int nextWindowIndex = player.getNextWindowIndex();
if (nextWindowIndex != C.INDEX_UNSET) {
player.seekTo(nextWindowIndex, C.TIME_UNSET);
} else if (window.isLive() && window.isDynamic) {
player.seekTo(windowIndex, C.TIME_UNSET);
if (player.hasNext()) {
player.next();
} else if (player.isCurrentWindowLive() && player.isCurrentWindowDynamic()) {
player.seekToDefaultPosition();
}
return true;
}
@ -176,6 +169,6 @@ public class DefaultControlDispatcher implements ControlDispatcher {
positionMs = min(positionMs, durationMs);
}
positionMs = max(positionMs, 0);
player.seekTo(player.getCurrentWindowIndex(), positionMs);
player.seekTo(positionMs);
}
}