From e6d36e8b92c29f477454bef758c97edd079fb6f6 Mon Sep 17 00:00:00 2001 From: jaewan Date: Tue, 18 Aug 2020 18:40:48 +0100 Subject: [PATCH] Add SessionPlayerConnector ctor that use DefaultMediaItemConverter PiperOrigin-RevId: 327258863 --- .../android/exoplayer2/ext/media2/PlayerTestRule.java | 3 +-- .../exoplayer2/ext/media2/SessionPlayerConnectorTest.java | 2 +- .../exoplayer2/ext/media2/SessionPlayerConnector.java | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/PlayerTestRule.java b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/PlayerTestRule.java index d311e0a5b6..4838319f48 100644 --- a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/PlayerTestRule.java +++ b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/PlayerTestRule.java @@ -83,8 +83,7 @@ import org.junit.rules.ExternalResource; .setLooper(Looper.myLooper()) .setMediaSourceFactory(new DefaultMediaSourceFactory(dataSourceFactory, null)) .build(); - sessionPlayerConnector = - new SessionPlayerConnector(exoPlayer, new DefaultMediaItemConverter()); + sessionPlayerConnector = new SessionPlayerConnector(exoPlayer); }); } diff --git a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java index 86e0dfe723..766c584ad3 100644 --- a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java +++ b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java @@ -1272,7 +1272,7 @@ public class SessionPlayerConnectorTest { simpleExoPlayer.setMediaItems(exoMediaItems); try (SessionPlayerConnector sessionPlayer = - new SessionPlayerConnector(simpleExoPlayer, converter)) { + new SessionPlayerConnector(simpleExoPlayer)) { List playlist = sessionPlayer.getPlaylist(); playlistFromSessionPlayer.set(playlist); } diff --git a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnector.java b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnector.java index 343ccd2e34..bc3d336281 100644 --- a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnector.java +++ b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnector.java @@ -96,13 +96,13 @@ public final class SessionPlayerConnector extends SessionPlayer { @Nullable private MediaItem currentMediaItem; /** - * Creates an instance using {@link DefaultControlDispatcher} to dispatch player commands. + * Creates an instance using {@link DefaultMediaItemConverter} to convert between ExoPlayer and + * media2 MediaItems and {@link DefaultControlDispatcher} to dispatch player commands. * * @param player The player to wrap. - * @param mediaItemConverter The {@link MediaItemConverter}. */ - public SessionPlayerConnector(Player player, MediaItemConverter mediaItemConverter) { - this(player, mediaItemConverter, new DefaultControlDispatcher()); + public SessionPlayerConnector(Player player) { + this(player, new DefaultMediaItemConverter(), new DefaultControlDispatcher()); } /**