Skip to content

SDK / exoplayer

Go to a project
Commit f37e9800 by ibaker Committed by Ian Baker
Options

Migrate media3.session references from Window to MediaItem 

#minor-release

PiperOrigin-RevId: 405927299
parent d83fe03d
Expand all
Inline Side-by-side
Showing with 121 additions and 122 deletions
libraries/session/src/main/java/androidx/media3/session/MediaController.java
......@@ -1270,7 +1270,7 @@ public class MediaController implements Player {
@Override
public int getCurrentMediaItemIndex() {
verifyApplicationThread();
return isConnected() ? impl.getCurrentWindowIndex() : C.INDEX_UNSET;
return isConnected() ? impl.getCurrentMediaItemIndex() : C.INDEX_UNSET;
}
@UnstableApi
......@@ -1291,7 +1291,7 @@ public class MediaController implements Player {
@Override
public int getPreviousMediaItemIndex() {
verifyApplicationThread();
return isConnected() ? impl.getPreviousWindowIndex() : C.INDEX_UNSET;
return isConnected() ? impl.getPreviousMediaItemIndex() : C.INDEX_UNSET;
}
@UnstableApi
......@@ -1312,7 +1312,7 @@ public class MediaController implements Player {
@Override
public int getNextMediaItemIndex() {
verifyApplicationThread();
return isConnected() ? impl.getNextWindowIndex() : C.INDEX_UNSET;
return isConnected() ? impl.getNextMediaItemIndex() : C.INDEX_UNSET;
}
@UnstableApi
......@@ -1348,13 +1348,13 @@ public class MediaController implements Player {
@Override
public boolean hasPreviousMediaItem() {
verifyApplicationThread();
return isConnected() && impl.hasPreviousWindow();
return isConnected() && impl.hasPreviousMediaItem();
}
@Override
public boolean hasNextMediaItem() {
verifyApplicationThread();
return isConnected() && impl.hasNextWindow();
return isConnected() && impl.hasNextMediaItem();
}
@UnstableApi
......@@ -1392,7 +1392,7 @@ public class MediaController implements Player {
Log.w(TAG, "The controller is not connected. Ignoring seekToPreviousMediaItem().");
return;
}
impl.seekToPreviousWindow();
impl.seekToPreviousMediaItem();
}
@UnstableApi
......@@ -1416,7 +1416,7 @@ public class MediaController implements Player {
Log.w(TAG, "The controller is not connected. Ignoring seekToNextMediaItem().");
return;
}
impl.seekToNextWindow();
impl.seekToNextMediaItem();
}
/**
......@@ -1824,7 +1824,6 @@ public class MediaController implements Player {
checkState(Looper.myLooper() == getApplicationLooper(), WRONG_THREAD_ERROR_MESSAGE);
}
// TODO(b/202157117): Rename Window references to MediaItem.
interface MediaControllerImpl {
void addListener(Player.Listener listener);
......@@ -1850,11 +1849,11 @@ public class MediaController implements Player {
void seekToDefaultPosition();
void seekToDefaultPosition(int windowIndex);
void seekToDefaultPosition(int mediaItemIndex);
void seekTo(long positionMs);
void seekTo(int windowIndex, long positionMs);
void seekTo(int mediaItemIndex, long positionMs);
long getSeekBackIncrement();
......@@ -1920,7 +1919,7 @@ public class MediaController implements Player {
void setMediaItems(List<MediaItem> mediaItems, boolean resetPosition);
void setMediaItems(List<MediaItem> mediaItems, int startWindowIndex, long startPositionMs);
void setMediaItems(List<MediaItem> mediaItems, int startIndex, long startPositionMs);
ListenableFuture<SessionResult> setMediaUri(Uri uri, Bundle extras);
......@@ -1948,19 +1947,19 @@ public class MediaController implements Player {
int getCurrentPeriodIndex();
int getCurrentWindowIndex();
int getCurrentMediaItemIndex();
int getPreviousWindowIndex();
int getPreviousMediaItemIndex();
int getNextWindowIndex();
int getNextMediaItemIndex();
boolean hasPreviousWindow();
boolean hasPreviousMediaItem();
boolean hasNextWindow();
boolean hasNextMediaItem();
void seekToPreviousWindow();
void seekToPreviousMediaItem();
void seekToNextWindow();
void seekToNextMediaItem();
void seekToPrevious();
......
libraries/test_session_common/src/main/aidl/androidx/media3/test/session/common/IRemoteMediaController.aidl
......@@ -34,9 +34,9 @@ interface IRemoteMediaController {
void setPlayWhenReady(String controllerId, boolean playWhenReady);
void prepare(String controllerId);
void seekToDefaultPosition(String controllerId);
void seekToDefaultPositionWithWindowIndex(String controllerId, int windowIndex);
void seekToDefaultPositionWithMediaItemIndex(String controllerId, int mediaItemIndex);
void seekTo(String controllerId, long positionMs);
void seekToWithWindowIndex(String controllerId, int windowIndex, long positionMs);
void seekToWithMediaItemIndex(String controllerId, int mediaItemIndex, long positionMs);
void seekBack(String controllerId);
void seekForward(String controllerId);
void setPlaybackParameters(String controllerId, in Bundle playbackParametersBundle);
......@@ -49,8 +49,8 @@ interface IRemoteMediaController {
void setMediaItems(String controllerId, in List<Bundle> mediaItems);
void setMediaItemsWithResetPosition(
String controllerId, in List<Bundle> mediaItems, boolean resetPosition);
void setMediaItemsWithStartWindowIndex(
String controllerId, in List<Bundle> mediaItems, int startWindowIndex, long startPositionMs);
void setMediaItemsWithStartIndex(
String controllerId, in List<Bundle> mediaItems, int startIndex, long startPositionMs);
void createAndSetFakeMediaItems(String controllerId, int size);
void setMediaUri(String controllerId, in Uri uri, in Bundle extras);
void setPlaylistMetadata(String controllerId, in Bundle playlistMetadata);
......@@ -63,8 +63,8 @@ interface IRemoteMediaController {
void clearMediaItems(String controllerId);
void moveMediaItem(String controllerId, int currentIndex, int newIndex);
void moveMediaItems(String controllerId, int fromIndex, int toIndex, int newIndex);
void seekToPreviousWindow(String controllerId);
void seekToNextWindow(String controllerId);
void seekToPreviousMediaItem(String controllerId);
void seekToNextMediaItem(String controllerId);
void seekToPrevious(String controllerId);
void seekToNext(String controllerId);
void setShuffleModeEnabled(String controllerId, boolean shuffleModeEnabled);
......
libraries/test_session_common/src/main/aidl/androidx/media3/test/session/common/IRemoteMediaSession.aidl
......@@ -69,7 +69,7 @@ interface IRemoteMediaSession {
void setPlaylistMetadata(String sessionId, in Bundle metadata);
void setShuffleModeEnabled(String sessionId, boolean shuffleMode);
void setRepeatMode(String sessionId, int repeatMode);
void setCurrentWindowIndex(String sessionId, int index);
void setCurrentMediaItemIndex(String sessionId, int index);
void setTrackSelectionParameters(String sessionId, in Bundle parameters);
void notifyTimelineChanged(String sessionId, int reason);
void notifyPlaylistMetadataChanged(String sessionId);
......
libraries/test_session_common/src/main/java/androidx/media3/test/session/common/CommonConstants.java
......@@ -68,7 +68,7 @@ public class CommonConstants {
public static final String KEY_PLAYER_ERROR = "playerError";
public static final String KEY_AUDIO_ATTRIBUTES = "audioAttributes";
public static final String KEY_TIMELINE = "timeline";
public static final String KEY_CURRENT_WINDOW_INDEX = "currentWindowIndex";
public static final String KEY_CURRENT_MEDIA_ITEM_INDEX = "currentMediaItemIndex";
public static final String KEY_CURRENT_PERIOD_INDEX = "currentPeriodIndex";
public static final String KEY_DURATION = "duration";
public static final String KEY_CURRENT_POSITION = "currentPosition";
......
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerCompatCallbackWithMediaSessionTest.java
......@@ -126,7 +126,7 @@ public class MediaControllerCompatCallbackWithMediaSessionTest {
.setPlaybackParameters(new PlaybackParameters(testSpeed))
.setTimeline(testTimeline)
.setPlaylistMetadata(testPlaylistMetadata)
.setCurrentWindowIndex(testItemIndex)
.setCurrentMediaItemIndex(testItemIndex)
.setShuffleModeEnabled(testShuffleModeEnabled)
.setRepeatMode(testRepeatMode)
.build();
......@@ -370,7 +370,7 @@ public class MediaControllerCompatCallbackWithMediaSessionTest {
.setPlaybackParameters(playbackParameters)
.setTimeline(testTimeline)
.setPlaylistMetadata(testPlaylistMetadata)
.setCurrentWindowIndex(testItemIndex)
.setCurrentMediaItemIndex(testItemIndex)
.setShuffleModeEnabled(testShuffleModeEnabled)
.setRepeatMode(testRepeatMode)
.build();
......@@ -802,7 +802,7 @@ public class MediaControllerCompatCallbackWithMediaSessionTest {
};
controllerCompat.registerCallback(callback, handler);
session.getMockPlayer().setCurrentWindowIndex(testItemIndex);
session.getMockPlayer().setCurrentMediaItemIndex(testItemIndex);
session.getMockPlayer().setCurrentPosition(testPosition);
session
.getMockPlayer()
......
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerListenerTest.java
......@@ -455,7 +455,7 @@ public class MediaControllerListenerTest {
.setIsPlayingAd(testIsPlayingAd)
.setCurrentAdGroupIndex(testCurrentAdGroupIndex)
.setCurrentAdIndexInAdGroup(testCurrentAdIndexInAdGroup)
.setCurrentWindowIndex(testWindowIndex)
.setCurrentMediaItemIndex(testWindowIndex)
.setCurrentPeriodIndex(testPeriodIndex)
.build();
remoteSession.setPlayer(playerConfig);
......@@ -485,7 +485,7 @@ public class MediaControllerListenerTest {
remoteSession
.getMockPlayer()
.notifyTimelineChanged(Player.TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED);
remoteSession.getMockPlayer().setCurrentWindowIndex(currentIndex);
remoteSession.getMockPlayer().setCurrentMediaItemIndex(currentIndex);
remoteSession
.getMockPlayer()
.notifyMediaItemTransition(
......@@ -514,7 +514,7 @@ public class MediaControllerListenerTest {
}));
int testIndex = 3;
int testReason = Player.MEDIA_ITEM_TRANSITION_REASON_SEEK;
remoteSession.getMockPlayer().setCurrentWindowIndex(testIndex);
remoteSession.getMockPlayer().setCurrentMediaItemIndex(testIndex);
remoteSession.getMockPlayer().notifyMediaItemTransition(testIndex, testReason);
Timeline.Window window = new Timeline.Window();
MediaItem currentMediaItem = timeline.getWindow(testIndex, window).mediaItem;
......@@ -529,7 +529,7 @@ public class MediaControllerListenerTest {
public void onMediaItemTransition_withNullMediaItem() throws Exception {
Timeline timeline = MediaTestUtils.createTimeline(/* windowCount= */ 1);
remoteSession.getMockPlayer().setTimeline(timeline);
remoteSession.getMockPlayer().setCurrentWindowIndex(0);
remoteSession.getMockPlayer().setCurrentMediaItemIndex(0);
remoteSession
.getMockPlayer()
.notifyMediaItemTransition(0, Player.MEDIA_ITEM_TRANSITION_REASON_PLAYLIST_CHANGED);
......@@ -820,7 +820,7 @@ public class MediaControllerListenerTest {
/* shuffledIndices= */ new int[] {0, 2, 1});
player.setTimeline(timeline);
player.notifyTimelineChanged(Player.TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED);
player.setCurrentWindowIndex(2);
player.setCurrentMediaItemIndex(2);
player.setShuffleModeEnabled(false);
player.notifyShuffleModeEnabledChanged();
......@@ -860,7 +860,7 @@ public class MediaControllerListenerTest {
Timeline timeline = MediaTestUtils.createTimeline(/* windowCount= */ 3);
player.setTimeline(timeline);
player.notifyTimelineChanged(Player.TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED);
player.setCurrentWindowIndex(2);
player.setCurrentMediaItemIndex(2);
player.setRepeatMode(Player.REPEAT_MODE_OFF);
player.notifyRepeatModeChanged();
......
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionCallbackWithMediaControllerCompatTest.java
......@@ -435,8 +435,8 @@ public class MediaSessionCallbackWithMediaControllerCompatTest {
controller.getTransportControls().skipToQueueItem(queue.get(targetIndex).getQueueId());
assertThat(player.countDownLatch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
assertThat(player.seekToDefaultPositionWithWindowIndexCalled).isTrue();
assertThat(player.seekWindowIndex).isEqualTo(targetIndex);
assertThat(player.seekToDefaultPositionWithMediaItemIndexCalled).isTrue();
assertThat(player.seekMediaItemIndex).isEqualTo(targetIndex);
}
@Test
......
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionCompatCallbackWithMediaControllerTest.java
......@@ -172,8 +172,8 @@ public class MediaSessionCompatCallbackWithMediaControllerTest {
}
@Test
public void seekToDefaultPosition_withWindowIndex() throws Exception {
int testWindowIndex = 1;
public void seekToDefaultPosition_withMediaItemIndex() throws Exception {
int testMediaItemIndex = 1;
List<QueueItem> testQueue = MediaTestUtils.createQueueItems(/* size= */ 3);
session.setQueue(testQueue);
......@@ -182,16 +182,17 @@ public class MediaSessionCompatCallbackWithMediaControllerTest {
sessionCallback.reset(2);
controller.seekToDefaultPosition(testWindowIndex);
controller.seekToDefaultPosition(testMediaItemIndex);
assertThat(sessionCallback.await(TIMEOUT_MS)).isTrue();
assertThat(sessionCallback.onSkipToQueueItemCalled).isTrue();
assertThat(sessionCallback.queueItemId).isEqualTo(testQueue.get(testWindowIndex).getQueueId());
assertThat(sessionCallback.queueItemId)
.isEqualTo(testQueue.get(testMediaItemIndex).getQueueId());
assertThat(sessionCallback.onSeekToCalled).isTrue();
assertThat(sessionCallback.seekPosition).isEqualTo(/* pos= */ 0);
}
@Test
public void seekToDefaultPosition_withFakeWindowIndex_seeksWithPosition() throws Exception {
public void seekToDefaultPosition_withFakeMediaItemIndex_seeksWithPosition() throws Exception {
List<QueueItem> testQueue = MediaTestUtils.createQueueItems(/* size= */ 3);
int fakeItemIndex = testQueue.size();
MediaMetadataCompat testMetadata =
......@@ -226,8 +227,8 @@ public class MediaSessionCompatCallbackWithMediaControllerTest {
}
@Test
public void seekTo_withWindowIndex() throws Exception {
int testWindowIndex = 1;
public void seekTo_withMediaItemIndex() throws Exception {
int testMediaItemIndex = 1;
long testPositionMs = 12L;
List<QueueItem> testQueue = MediaTestUtils.createQueueItems(/* size= */ 3);
......@@ -238,10 +239,11 @@ public class MediaSessionCompatCallbackWithMediaControllerTest {
sessionCallback.reset(2);
controller.seekTo(testWindowIndex, testPositionMs);
controller.seekTo(testMediaItemIndex, testPositionMs);
assertThat(sessionCallback.await(TIMEOUT_MS)).isTrue();
assertThat(sessionCallback.onSkipToQueueItemCalled).isTrue();
assertThat(sessionCallback.queueItemId).isEqualTo(testQueue.get(testWindowIndex).getQueueId());
assertThat(sessionCallback.queueItemId)
.isEqualTo(testQueue.get(testMediaItemIndex).getQueueId());
assertThat(sessionCallback.onSeekToCalled).isTrue();
assertThat(sessionCallback.seekPosition).isEqualTo(testPositionMs);
}
......@@ -350,21 +352,21 @@ public class MediaSessionCompatCallbackWithMediaControllerTest {
}
@Test
public void seekToPreviousWindow() throws Exception {
public void seekToPreviousMediaItem() throws Exception {
RemoteMediaController controller = createControllerAndWaitConnection();
sessionCallback.reset(1);
controller.seekToPreviousWindow();
controller.seekToPreviousMediaItem();
assertThat(sessionCallback.await(TIMEOUT_MS)).isTrue();
assertThat(sessionCallback.onSkipToPreviousCalled).isTrue();
}
@Test
public void seekToNextWindow() throws Exception {
public void seekToNextMediaItem() throws Exception {
RemoteMediaController controller = createControllerAndWaitConnection();
sessionCallback.reset(1);
controller.seekToNextWindow();
controller.seekToNextMediaItem();
assertThat(sessionCallback.await(TIMEOUT_MS)).isTrue();
assertThat(sessionCallback.onSkipToNextCalled).isTrue();
}
......
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionPermissionTest.java
......@@ -164,14 +164,15 @@ public class MediaSessionPermissionTest {
}
@Test
public void seekToNextWindow() throws Exception {
testOnCommandRequest(COMMAND_SEEK_TO_NEXT_MEDIA_ITEM, RemoteMediaController::seekToNextWindow);
public void seekToNextMediaItem() throws Exception {
testOnCommandRequest(
COMMAND_SEEK_TO_NEXT_MEDIA_ITEM, RemoteMediaController::seekToNextMediaItem);
}
@Test
public void seekToPreviousWindow() throws Exception {
public void seekToPreviousMediaItem() throws Exception {
testOnCommandRequest(
COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM, RemoteMediaController::seekToPreviousWindow);
COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM, RemoteMediaController::seekToPreviousMediaItem);
}
@Test
......
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionPlayerTest.java
......@@ -138,12 +138,12 @@ public class MediaSessionPlayerTest {
}
@Test
public void seekToDefaultPosition_withWindowIndex() throws Exception {
int windowIndex = 3;
controller.seekToDefaultPosition(windowIndex);
public void seekToDefaultPosition_withMediaItemIndex() throws Exception {
int mediaItemIndex = 3;
controller.seekToDefaultPosition(mediaItemIndex);
assertThat(player.countDownLatch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
assertThat(player.seekToDefaultPositionWithWindowIndexCalled).isTrue();
assertThat(player.seekWindowIndex).isEqualTo(windowIndex);
assertThat(player.seekToDefaultPositionWithMediaItemIndexCalled).isTrue();
assertThat(player.seekMediaItemIndex).isEqualTo(mediaItemIndex);
}
@Test
......@@ -156,13 +156,13 @@ public class MediaSessionPlayerTest {
}
@Test
public void seekTo_withWindowIndex() throws Exception {
int windowIndex = 3;
public void seekTo_withMediaItemIndex() throws Exception {
int mediaItemIndex = 3;
long seekPositionMs = 12125L;
controller.seekTo(windowIndex, seekPositionMs);
controller.seekTo(mediaItemIndex, seekPositionMs);
assertThat(player.countDownLatch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
assertThat(player.seekToWithWindowIndexCalled).isTrue();
assertThat(player.seekWindowIndex).isEqualTo(windowIndex);
assertThat(player.seekToWithMediaItemIndexCalled).isTrue();
assertThat(player.seekMediaItemIndex).isEqualTo(mediaItemIndex);
assertThat(player.seekPositionMs).isEqualTo(seekPositionMs);
}
......@@ -260,17 +260,17 @@ public class MediaSessionPlayerTest {
}
@Test
public void setMediaItems_withStartWindowIndex() throws Exception {
public void setMediaItems_withStartMediaItemIndex() throws Exception {
List<MediaItem> items = MediaTestUtils.createMediaItems(/* size= */ 2);
int startWindowIndex = 1;
int startMediaItemIndex = 1;
long startPositionMs = 1234;
controller.setMediaItems(items, startWindowIndex, startPositionMs);
controller.setMediaItems(items, startMediaItemIndex, startPositionMs);
assertThat(player.countDownLatch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
assertThat(player.setMediaItemsWithStartWindowIndexCalled).isTrue();
assertThat(player.setMediaItemsWithStartIndexCalled).isTrue();
assertThat(player.mediaItems).isEqualTo(items);
assertThat(player.startWindowIndex).isEqualTo(startWindowIndex);
assertThat(player.startMediaItemIndex).isEqualTo(startMediaItemIndex);
assertThat(player.startPositionMs).isEqualTo(startPositionMs);
}
......@@ -426,15 +426,15 @@ public class MediaSessionPlayerTest {
}
@Test
public void seekToPreviousWindow() throws Exception {
controller.seekToPreviousWindow();
public void seekToPreviousMediaItem() throws Exception {
controller.seekToPreviousMediaItem();
assertThat(player.countDownLatch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
assertThat(player.seekToPreviousMediaItemCalled).isTrue();
}
@Test
public void seekToNextWindow() throws Exception {
controller.seekToNextWindow();
public void seekToNextMediaItem() throws Exception {
controller.seekToNextMediaItem();
assertThat(player.countDownLatch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
assertThat(player.seekToNextMediaItemCalled).isTrue();
}
......
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionTest.java
......@@ -247,7 +247,7 @@ public class MediaSessionTest {
Log.d(TAG, "7) Time spent on API call(ms): " + (endTime - startTime));
startTime = endTime;
controller.seekToNextWindow();
controller.seekToNextMediaItem();
endTime = SystemClock.elapsedRealtime();
Log.d(TAG, "8) Time spent on API call(ms): " + (endTime - startTime));
......@@ -257,7 +257,7 @@ public class MediaSessionTest {
Log.d(TAG, "9) Time spent on API call(ms): " + (endTime - startTime));
startTime = endTime;
controller.seekToPreviousWindow();
controller.seekToPreviousMediaItem();
endTime = SystemClock.elapsedRealtime();
Log.d(TAG, "10) Time spent on API call(ms): " + (endTime - startTime));
}
......
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MockPlayerTest.java
......@@ -166,8 +166,8 @@ public class MockPlayerTest {
int startWindowIndex = 3;
long startPositionMs = 132L;
player.setMediaItems(list, startWindowIndex, startPositionMs);
assertThat(player.setMediaItemsWithStartWindowIndexCalled).isTrue();
assertThat(player.startWindowIndex).isEqualTo(startWindowIndex);
assertThat(player.setMediaItemsWithStartIndexCalled).isTrue();
assertThat(player.startMediaItemIndex).isEqualTo(startWindowIndex);
assertThat(player.startPositionMs).isEqualTo(startPositionMs);
assertThat(player.mediaItems).isSameInstanceAs(list);
}
......
libraries/test_session_current/src/main/java/androidx/media3/session/MediaControllerProviderService.java
......@@ -216,12 +216,12 @@ public class MediaControllerProviderService extends Service {
}
@Override
public void seekToDefaultPositionWithWindowIndex(String controllerId, int windowIndex)
public void seekToDefaultPositionWithMediaItemIndex(String controllerId, int mediaItemIndex)
throws RemoteException {
runOnHandler(
() -> {
MediaController controller = mediaControllerMap.get(controllerId);
controller.seekToDefaultPosition(windowIndex);
controller.seekToDefaultPosition(mediaItemIndex);
});
}
......@@ -235,12 +235,12 @@ public class MediaControllerProviderService extends Service {
}
@Override
public void seekToWithWindowIndex(String controllerId, int windowIndex, long positionMs)
public void seekToWithMediaItemIndex(String controllerId, int mediaItemIndex, long positionMs)
throws RemoteException {
runOnHandler(
() -> {
MediaController controller = mediaControllerMap.get(controllerId);
controller.seekTo(windowIndex, positionMs);
controller.seekTo(mediaItemIndex, positionMs);
});
}
......@@ -336,18 +336,15 @@ public class MediaControllerProviderService extends Service {
}
@Override
public void setMediaItemsWithStartWindowIndex(
String controllerId,
List<Bundle> mediaItemBundles,
int startWindowIndex,
long startPositionMs)
public void setMediaItemsWithStartIndex(
String controllerId, List<Bundle> mediaItemBundles, int startIndex, long startPositionMs)
throws RemoteException {
runOnHandler(
() -> {
MediaController controller = mediaControllerMap.get(controllerId);
controller.setMediaItems(
BundleableUtil.fromBundleList(MediaItem.CREATOR, mediaItemBundles),
startWindowIndex,
startIndex,
startPositionMs);
});
}
......@@ -478,20 +475,20 @@ public class MediaControllerProviderService extends Service {
}
@Override
public void seekToPreviousWindow(String controllerId) throws RemoteException {
public void seekToPreviousMediaItem(String controllerId) throws RemoteException {
runOnHandler(
() -> {
MediaController controller = mediaControllerMap.get(controllerId);
controller.seekToPreviousWindow();
controller.seekToPreviousMediaItem();
});
}
@Override
public void seekToNextWindow(String controllerId) throws RemoteException {
public void seekToNextMediaItem(String controllerId) throws RemoteException {
runOnHandler(
() -> {
MediaController controller = mediaControllerMap.get(controllerId);
controller.seekToNextWindow();
controller.seekToNextMediaItem();
});
}
......
libraries/test_session_current/src/main/java/androidx/media3/session/MediaSessionProviderService.java
......@@ -26,9 +26,9 @@ import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_AD
import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_AD_INDEX_IN_AD_GROUP;
import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_CUES;
import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_LIVE_OFFSET;
import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_MEDIA_ITEM_INDEX;
import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_PERIOD_INDEX;
import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_POSITION;
import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_WINDOW_INDEX;
import static androidx.media3.test.session.common.CommonConstants.KEY_DEVICE_INFO;
import static androidx.media3.test.session.common.CommonConstants.KEY_DEVICE_MUTED;
import static androidx.media3.test.session.common.CommonConstants.KEY_DEVICE_VOLUME;
......@@ -287,7 +287,7 @@ public class MediaSessionProviderService extends Service {
BundleableUtil.fromNullableBundle(
Timeline.CREATOR, config.getBundle(KEY_TIMELINE), player.timeline);
player.currentMediaItemIndex =
config.getInt(KEY_CURRENT_WINDOW_INDEX, player.currentMediaItemIndex);
config.getInt(KEY_CURRENT_MEDIA_ITEM_INDEX, player.currentMediaItemIndex);
player.currentPeriodIndex =
config.getInt(KEY_CURRENT_PERIOD_INDEX, player.currentPeriodIndex);
player.playlistMetadata =
......@@ -749,7 +749,7 @@ public class MediaSessionProviderService extends Service {
}
@Override
public void setCurrentWindowIndex(String sessionId, int index) throws RemoteException {
public void setCurrentMediaItemIndex(String sessionId, int index) throws RemoteException {
runOnHandler(
() -> {
MediaSession session = sessionMap.get(sessionId);
......
libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java
......@@ -55,7 +55,7 @@ public class MockPlayer implements Player {
@Nullable PlaybackException playerError;
public AudioAttributes audioAttributes;
public long seekPositionMs;
public int seekWindowIndex;
public int seekMediaItemIndex;
public long currentPosition;
public long bufferedPosition;
public long duration;
......@@ -73,7 +73,7 @@ public class MockPlayer implements Player {
public MediaItem mediaItem;
public List<MediaItem> mediaItems;
public boolean resetPosition;
public int startWindowIndex;
public int startMediaItemIndex;
public long startPositionMs;
public MediaMetadata playlistMetadata;
public int index;
......@@ -112,9 +112,9 @@ public class MockPlayer implements Player {
public boolean stopCalled;
public boolean releaseCalled;
public boolean seekToDefaultPositionCalled;
public boolean seekToDefaultPositionWithWindowIndexCalled;
public boolean seekToDefaultPositionWithMediaItemIndexCalled;
public boolean seekToCalled;
public boolean seekToWithWindowIndexCalled;
public boolean seekToWithMediaItemIndexCalled;
public boolean setPlaybackSpeedCalled;
public boolean setPlaybackParametersCalled;
public boolean setMediaItemCalled;
......@@ -122,7 +122,7 @@ public class MockPlayer implements Player {
public boolean setMediaItemWithResetPositionCalled;
public boolean setMediaItemsCalled;
public boolean setMediaItemsWithResetPositionCalled;
public boolean setMediaItemsWithStartWindowIndexCalled;
public boolean setMediaItemsWithStartIndexCalled;
public boolean setPlaylistMetadataCalled;
public boolean addMediaItemCalled;
public boolean addMediaItemWithIndexCalled;
......@@ -180,7 +180,7 @@ public class MockPlayer implements Player {
cues = ImmutableList.of();
deviceInfo = DeviceInfo.UNKNOWN;
seekPositionMs = C.TIME_UNSET;
seekWindowIndex = C.INDEX_UNSET;
seekMediaItemIndex = C.INDEX_UNSET;
mediaMetadata = MediaMetadata.EMPTY;
currentPosition = 0;
......@@ -271,8 +271,8 @@ public class MockPlayer implements Player {
@Override
public void seekToDefaultPosition(int mediaItemIndex) {
seekToDefaultPositionWithWindowIndexCalled = true;
seekWindowIndex = mediaItemIndex;
seekToDefaultPositionWithMediaItemIndexCalled = true;
seekMediaItemIndex = mediaItemIndex;
countDownLatch.countDown();
}
......@@ -285,8 +285,8 @@ public class MockPlayer implements Player {
@Override
public void seekTo(int mediaItemIndex, long positionMs) {
seekToWithWindowIndexCalled = true;
seekWindowIndex = mediaItemIndex;
seekToWithMediaItemIndexCalled = true;
seekMediaItemIndex = mediaItemIndex;
seekPositionMs = positionMs;
countDownLatch.countDown();
}
......@@ -666,9 +666,9 @@ public class MockPlayer implements Player {
@Override
public void setMediaItems(List<MediaItem> mediaItems, int startIndex, long startPositionMs) {
setMediaItemsWithStartWindowIndexCalled = true;
setMediaItemsWithStartIndexCalled = true;
this.mediaItems = mediaItems;
this.startWindowIndex = startIndex;
this.startMediaItemIndex = startIndex;
this.startPositionMs = startPositionMs;
countDownLatch.countDown();
}
......
libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaController.java
......@@ -112,16 +112,16 @@ public class RemoteMediaController {
binder.seekToDefaultPosition(controllerId);
}
public void seekToDefaultPosition(int windowIndex) throws RemoteException {
binder.seekToDefaultPositionWithWindowIndex(controllerId, windowIndex);
public void seekToDefaultPosition(int mediaItemIndex) throws RemoteException {
binder.seekToDefaultPositionWithMediaItemIndex(controllerId, mediaItemIndex);
}
public void seekTo(long positionMs) throws RemoteException {
binder.seekTo(controllerId, positionMs);
}
public void seekTo(int windowIndex, long positionMs) throws RemoteException {
binder.seekToWithWindowIndex(controllerId, windowIndex, positionMs);
public void seekTo(int mediaItemIndex, long positionMs) throws RemoteException {
binder.seekToWithMediaItemIndex(controllerId, mediaItemIndex, positionMs);
}
public void seekBack() throws RemoteException {
......@@ -162,10 +162,10 @@ public class RemoteMediaController {
controllerId, BundleableUtil.toBundleList(mediaItems), resetPosition);
}
public void setMediaItems(List<MediaItem> mediaItems, int startWindowIndex, long startPositionMs)
public void setMediaItems(List<MediaItem> mediaItems, int startIndex, long startPositionMs)
throws RemoteException {
binder.setMediaItemsWithStartWindowIndex(
controllerId, BundleableUtil.toBundleList(mediaItems), startWindowIndex, startPositionMs);
binder.setMediaItemsWithStartIndex(
controllerId, BundleableUtil.toBundleList(mediaItems), startIndex, startPositionMs);
}
/**
......@@ -222,12 +222,12 @@ public class RemoteMediaController {
binder.moveMediaItems(controllerId, fromIndex, toIndex, newIndex);
}
public void seekToPreviousWindow() throws RemoteException {
binder.seekToPreviousWindow(controllerId);
public void seekToPreviousMediaItem() throws RemoteException {
binder.seekToPreviousMediaItem(controllerId);
}
public void seekToNextWindow() throws RemoteException {
binder.seekToNextWindow(controllerId);
public void seekToNextMediaItem() throws RemoteException {
binder.seekToNextMediaItem(controllerId);
}
public void seekToPrevious() throws RemoteException {
......
libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaSession.java
......@@ -26,9 +26,9 @@ import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_AD
import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_AD_INDEX_IN_AD_GROUP;
import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_CUES;
import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_LIVE_OFFSET;
import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_MEDIA_ITEM_INDEX;
import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_PERIOD_INDEX;
import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_POSITION;
import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_WINDOW_INDEX;
import static androidx.media3.test.session.common.CommonConstants.KEY_DEVICE_INFO;
import static androidx.media3.test.session.common.CommonConstants.KEY_DEVICE_MUTED;
import static androidx.media3.test.session.common.CommonConstants.KEY_DEVICE_VOLUME;
......@@ -343,8 +343,8 @@ public class RemoteMediaSession {
binder.setShuffleModeEnabled(sessionId, shuffleModeEnabled);
}
public void setCurrentWindowIndex(int index) throws RemoteException {
binder.setCurrentWindowIndex(sessionId, index);
public void setCurrentMediaItemIndex(int index) throws RemoteException {
binder.setCurrentMediaItemIndex(sessionId, index);
}
public void setTrackSelectionParameters(TrackSelectionParameters parameters)
......@@ -571,8 +571,8 @@ public class RemoteMediaSession {
return this;
}
public MockPlayerConfigBuilder setCurrentWindowIndex(int index) {
bundle.putInt(KEY_CURRENT_WINDOW_INDEX, index);
public MockPlayerConfigBuilder setCurrentMediaItemIndex(int index) {
bundle.putInt(KEY_CURRENT_MEDIA_ITEM_INDEX, index);
return this;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment