From 13fb0baf0ee0dd94510b79e0f676a1c0f041f3b6 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 26 Jun 2021 12:31:25 +0200 Subject: [PATCH 1/2] Use better builtin ControlDispatcher methods in media2 extension --- .../android/exoplayer2/ext/media2/PlayerWrapper.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java index a9e08beefb..9e14a18a7a 100644 --- a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java +++ b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java @@ -233,21 +233,13 @@ import java.util.List; public boolean skipToPreviousPlaylistItem() { Timeline timeline = player.getCurrentTimeline(); Assertions.checkState(!timeline.isEmpty()); - int previousWindowIndex = player.getPreviousWindowIndex(); - if (previousWindowIndex != C.INDEX_UNSET) { - return controlDispatcher.dispatchSeekTo(player, previousWindowIndex, C.TIME_UNSET); - } - return false; + return controlDispatcher.dispatchPrevious(player); } public boolean skipToNextPlaylistItem() { Timeline timeline = player.getCurrentTimeline(); Assertions.checkState(!timeline.isEmpty()); - int nextWindowIndex = player.getNextWindowIndex(); - if (nextWindowIndex != C.INDEX_UNSET) { - return controlDispatcher.dispatchSeekTo(player, nextWindowIndex, C.TIME_UNSET); - } - return false; + return controlDispatcher.dispatchNext(player); } public boolean skipToPlaylistItem(@IntRange(from = 0) int index) { From efc6992e1760f1715f8a65089919a3c319b30e86 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 28 Jun 2021 12:06:28 +0200 Subject: [PATCH 2/2] Remove useless assertions --- .../google/android/exoplayer2/ext/media2/PlayerWrapper.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java index 9e14a18a7a..060eb982e5 100644 --- a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java +++ b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java @@ -231,14 +231,10 @@ import java.util.List; } public boolean skipToPreviousPlaylistItem() { - Timeline timeline = player.getCurrentTimeline(); - Assertions.checkState(!timeline.isEmpty()); return controlDispatcher.dispatchPrevious(player); } public boolean skipToNextPlaylistItem() { - Timeline timeline = player.getCurrentTimeline(); - Assertions.checkState(!timeline.isEmpty()); return controlDispatcher.dispatchNext(player); }