loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate usages of Window-based Player methods

Browse Source 
Where this introduced an inconsistency (e.g. assigning to something
called `windowIndex`), I generally renamed the transitive closure of
identifiers to maintain consistency (meaning this change is quite
large). The exception is code that interacts with Timeline and Window
directly, where sometimes I kept the 'window' nomenclature.

#minor-release

PiperOrigin-RevId: 407040052
This commit is contained in:
ibaker 2021-11-02 10:27:56 +00:00 committed by Ian Baker
parent 4f46e679a6
commit 686f2ca96d
36 changed files with 849 additions and 806 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
demos/cast/src/main/java/androidx/media3/demo/cast/PlayerManager.java
View File

@ -261,7 +261,7 @@ import java.util.ArrayList;
int playbackState = currentPlayer.getPlaybackState();
maybeSetCurrentItemAndNotify(
playbackState != Player.STATE_IDLE && playbackState != Player.STATE_ENDED
? currentPlayer.getCurrentWindowIndex()
? currentPlayer.getCurrentMediaItemIndex()
: C.INDEX_UNSET);
}
@ -281,7 +281,7 @@ import java.util.ArrayList;
// Player state management.
long playbackPositionMs = C.TIME_UNSET;
int windowIndex = C.INDEX_UNSET;
int currentItemIndex = C.INDEX_UNSET;
boolean playWhenReady = false;
Player previousPlayer = this.currentPlayer;
@ -291,10 +291,10 @@ import java.util.ArrayList;
if (playbackState != Player.STATE_ENDED) {
playbackPositionMs = previousPlayer.getCurrentPosition();
playWhenReady = previousPlayer.getPlayWhenReady();
windowIndex = previousPlayer.getCurrentWindowIndex();
if (windowIndex != currentItemIndex) {
currentItemIndex = previousPlayer.getCurrentMediaItemIndex();
if (currentItemIndex != this.currentItemIndex) {
playbackPositionMs = C.TIME_UNSET;
windowIndex = currentItemIndex;
currentItemIndex = this.currentItemIndex;
}
}
previousPlayer.stop();
@ -304,7 +304,7 @@ import java.util.ArrayList;
this.currentPlayer = currentPlayer;
// Media queue management.
currentPlayer.setMediaItems(mediaQueue, windowIndex, playbackPositionMs);
currentPlayer.setMediaItems(mediaQueue, currentItemIndex, playbackPositionMs);
currentPlayer.setPlayWhenReady(playWhenReady);
currentPlayer.prepare();
}

16
demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java
View File

@ -65,7 +65,7 @@ public class PlayerActivity extends AppCompatActivity
// Saved instance state keys.
private static final String KEY_TRACK_SELECTION_PARAMETERS = "track_selection_parameters";
private static final String KEY_WINDOW = "window";
private static final String KEY_ITEM_INDEX = "item_index";
private static final String KEY_POSITION = "position";
private static final String KEY_AUTO_PLAY = "auto_play";
@ -83,7 +83,7 @@ public class PlayerActivity extends AppCompatActivity
private DebugTextViewHelper debugViewHelper;
private TracksInfo lastSeenTracksInfo;
private boolean startAutoPlay;
private int startWindow;
private int startItemIndex;
private long startPosition;
// For ad playback only.
@ -114,7 +114,7 @@ public class PlayerActivity extends AppCompatActivity
DefaultTrackSelector.Parameters.CREATOR.fromBundle(
savedInstanceState.getBundle(KEY_TRACK_SELECTION_PARAMETERS));
startAutoPlay = savedInstanceState.getBoolean(KEY_AUTO_PLAY);
startWindow = savedInstanceState.getInt(KEY_WINDOW);
startItemIndex = savedInstanceState.getInt(KEY_ITEM_INDEX);
startPosition = savedInstanceState.getLong(KEY_POSITION);
} else {
trackSelectionParameters =
@ -206,7 +206,7 @@ public class PlayerActivity extends AppCompatActivity
updateStartPosition();
outState.putBundle(KEY_TRACK_SELECTION_PARAMETERS, trackSelectionParameters.toBundle());
outState.putBoolean(KEY_AUTO_PLAY, startAutoPlay);
outState.putInt(KEY_WINDOW, startWindow);
outState.putInt(KEY_ITEM_INDEX, startItemIndex);
outState.putLong(KEY_POSITION, startPosition);
}
@ -282,9 +282,9 @@ public class PlayerActivity extends AppCompatActivity
debugViewHelper = new DebugTextViewHelper(player, debugTextView);
debugViewHelper.start();
}
boolean haveStartPosition = startWindow != C.INDEX_UNSET;
boolean haveStartPosition = startItemIndex != C.INDEX_UNSET;
if (haveStartPosition) {
player.seekTo(startWindow, startPosition);
player.seekTo(startItemIndex, startPosition);
}
player.setMediaItems(mediaItems, /* resetPosition= */ !haveStartPosition);
player.prepare();
@ -382,14 +382,14 @@ public class PlayerActivity extends AppCompatActivity
private void updateStartPosition() {
if (player != null) {
startAutoPlay = player.getPlayWhenReady();
startWindow = player.getCurrentWindowIndex();
startItemIndex = player.getCurrentMediaItemIndex();
startPosition = Math.max(0, player.getContentPosition());
}
}
protected void clearStartPosition() {
startAutoPlay = true;
startWindow = C.INDEX_UNSET;
startItemIndex = C.INDEX_UNSET;
startPosition = C.TIME_UNSET;
}

2
demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt
View File

@ -204,7 +204,7 @@ class PlayerActivity : AppCompatActivity() {
returnConvertView.findViewById<TextView>(R.id.media_item).text = mediaItem.mediaMetadata.title
if (position == controller?.currentWindowIndex) {
if (position == controller?.currentMediaItemIndex) {
returnConvertView.setBackgroundColor(ContextCompat.getColor(context, R.color.white))
returnConvertView
.findViewById<TextView>(R.id.media_item)

18
libraries/cast/src/main/java/androidx/media3/cast/CastPlayer.java
View File

@ -320,9 +320,9 @@ public final class CastPlayer extends BasePlayer {
@Override
public void setMediaItems(List<MediaItem> mediaItems, boolean resetPosition) {
int windowIndex = resetPosition ? 0 : getCurrentWindowIndex();
int mediaItemIndex = resetPosition ? 0 : getCurrentMediaItemIndex();
long startPositionMs = resetPosition ? C.TIME_UNSET : getContentPosition();
setMediaItems(mediaItems, windowIndex, startPositionMs);
setMediaItems(mediaItems, mediaItemIndex, startPositionMs);
}
@Override
@ -445,7 +445,7 @@ public final class CastPlayer extends BasePlayer {
// in RemoteMediaClient.
positionMs = positionMs != C.TIME_UNSET ? positionMs : 0;
if (mediaStatus != null) {
if (getCurrentWindowIndex() != mediaItemIndex) {
if (getCurrentMediaItemIndex() != mediaItemIndex) {
remoteMediaClient
.queueJumpToItem(
(int) currentTimeline.getPeriod(mediaItemIndex, period).uid, positionMs, null)
@ -638,7 +638,7 @@ public final class CastPlayer extends BasePlayer {
@Override
public int getCurrentPeriodIndex() {
return getCurrentWindowIndex();
return getCurrentMediaItemIndex();
}
@Override
@ -1105,15 +1105,15 @@ public final class CastPlayer extends BasePlayer {
@Nullable
private PendingResult<MediaChannelResult> setMediaItemsInternal(
MediaQueueItem[] mediaQueueItems,
int startWindowIndex,
int startIndex,
long startPositionMs,
@RepeatMode int repeatMode) {
if (remoteMediaClient == null || mediaQueueItems.length == 0) {
return null;
}
startPositionMs = startPositionMs == C.TIME_UNSET ? 0 : startPositionMs;
if (startWindowIndex == C.INDEX_UNSET) {
startWindowIndex = getCurrentWindowIndex();
if (startIndex == C.INDEX_UNSET) {
startIndex = getCurrentMediaItemIndex();
startPositionMs = getCurrentPosition();
}
Timeline currentTimeline = getCurrentTimeline();
@ -1122,7 +1122,7 @@ public final class CastPlayer extends BasePlayer {
}
return remoteMediaClient.queueLoad(
mediaQueueItems,
min(startWindowIndex, mediaQueueItems.length - 1),
min(startIndex, mediaQueueItems.length - 1),
getCastRepeatMode(repeatMode),
startPositionMs,
/* customData= */ null);
@ -1182,7 +1182,7 @@ public final class CastPlayer extends BasePlayer {
}
return new PositionInfo(
newWindowUid,
getCurrentWindowIndex(),
getCurrentMediaItemIndex(),
newMediaItem,
newPeriodUid,
getCurrentPeriodIndex(),

49
libraries/common/src/main/java/androidx/media3/common/BasePlayer.java
View File

@ -120,7 +120,7 @@ public abstract class BasePlayer implements Player {
@Override
public final void seekToDefaultPosition() {
seekToDefaultPosition(getCurrentWindowIndex());
seekToDefaultPosition(getCurrentMediaItemIndex());
}
@Override
@ -130,7 +130,7 @@ public abstract class BasePlayer implements Player {
@Override
public final void seekTo(long positionMs) {
seekTo(getCurrentWindowIndex(), positionMs);
seekTo(getCurrentMediaItemIndex(), positionMs);
}
@Override
@ -186,13 +186,13 @@ public abstract class BasePlayer implements Player {
if (timeline.isEmpty() || isPlayingAd()) {
return;
}
boolean hasPreviousWindow = hasPreviousWindow();
if (isCurrentWindowLive() && !isCurrentWindowSeekable()) {
if (hasPreviousWindow) {
seekToPreviousWindow();
boolean hasPreviousMediaItem = hasPreviousMediaItem();
if (isCurrentMediaItemLive() && !isCurrentMediaItemSeekable()) {
if (hasPreviousMediaItem) {
seekToPreviousMediaItem();
}
} else if (hasPreviousWindow && getCurrentPosition() <= getMaxSeekToPreviousPosition()) {
seekToPreviousWindow();
} else if (hasPreviousMediaItem && getCurrentPosition() <= getMaxSeekToPreviousPosition()) {
seekToPreviousMediaItem();
} else {
seekTo(/* positionMs= */ 0);
}
@ -241,9 +241,9 @@ public abstract class BasePlayer implements Player {
if (timeline.isEmpty() || isPlayingAd()) {
return;
}
if (hasNextWindow()) {
seekToNextWindow();
} else if (isCurrentWindowLive() && isCurrentWindowDynamic()) {
if (hasNextMediaItem()) {
seekToNextMediaItem();
} else if (isCurrentMediaItemLive() && isCurrentMediaItemDynamic()) {
seekToDefaultPosition();
}
}
@ -295,7 +295,7 @@ public abstract class BasePlayer implements Player {
Timeline timeline = getCurrentTimeline();
return timeline.isEmpty()
? null
: timeline.getWindow(getCurrentWindowIndex(), window).mediaItem;
: timeline.getWindow(getCurrentMediaItemIndex(), window).mediaItem;
}
@Override
@ -312,7 +312,9 @@ public abstract class BasePlayer implements Player {
@Nullable
public final Object getCurrentManifest() {
Timeline timeline = getCurrentTimeline();
return timeline.isEmpty() ? null : timeline.getWindow(getCurrentWindowIndex(), window).manifest;
return timeline.isEmpty()
? null
: timeline.getWindow(getCurrentMediaItemIndex(), window).manifest;
}
@Override
@ -354,7 +356,8 @@ public abstract class BasePlayer implements Player {
if (timeline.isEmpty()) {
return C.TIME_UNSET;
}
long windowStartTimeMs = timeline.getWindow(getCurrentWindowIndex(), window).windowStartTimeMs;
long windowStartTimeMs =
timeline.getWindow(getCurrentMediaItemIndex(), window).windowStartTimeMs;
if (windowStartTimeMs == C.TIME_UNSET) {
return C.TIME_UNSET;
}
@ -378,7 +381,7 @@ public abstract class BasePlayer implements Player {
Timeline timeline = getCurrentTimeline();
return timeline.isEmpty()
? C.TIME_UNSET
: timeline.getWindow(getCurrentWindowIndex(), window).getDurationMs();
: timeline.getWindow(getCurrentMediaItemIndex(), window).getDurationMs();
}
/**
@ -391,22 +394,24 @@ public abstract class BasePlayer implements Player {
return new Commands.Builder()
.addAll(permanentAvailableCommands)
.addIf(COMMAND_SEEK_TO_DEFAULT_POSITION, !isPlayingAd())
.addIf(COMMAND_SEEK_IN_CURRENT_MEDIA_ITEM, isCurrentWindowSeekable() && !isPlayingAd())
.addIf(COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM, hasPreviousWindow() && !isPlayingAd())
.addIf(COMMAND_SEEK_IN_CURRENT_MEDIA_ITEM, isCurrentMediaItemSeekable() && !isPlayingAd())
.addIf(COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM, hasPreviousMediaItem() && !isPlayingAd())
.addIf(
COMMAND_SEEK_TO_PREVIOUS,
!getCurrentTimeline().isEmpty()
&& (hasPreviousWindow() || !isCurrentWindowLive() || isCurrentWindowSeekable())
&& (hasPreviousMediaItem()
|| !isCurrentMediaItemLive()
|| isCurrentMediaItemSeekable())
&& !isPlayingAd())
.addIf(COMMAND_SEEK_TO_NEXT_MEDIA_ITEM, hasNextWindow() && !isPlayingAd())
.addIf(COMMAND_SEEK_TO_NEXT_MEDIA_ITEM, hasNextMediaItem() && !isPlayingAd())
.addIf(
COMMAND_SEEK_TO_NEXT,
!getCurrentTimeline().isEmpty()
&& (hasNextWindow() || (isCurrentWindowLive() && isCurrentWindowDynamic()))
&& (hasNextMediaItem() || (isCurrentMediaItemLive() && isCurrentMediaItemDynamic()))
&& !isPlayingAd())
.addIf(COMMAND_SEEK_TO_MEDIA_ITEM, !isPlayingAd())
.addIf(COMMAND_SEEK_BACK, isCurrentWindowSeekable() && !isPlayingAd())
.addIf(COMMAND_SEEK_FORWARD, isCurrentWindowSeekable() && !isPlayingAd())
.addIf(COMMAND_SEEK_BACK, isCurrentMediaItemSeekable() && !isPlayingAd())
.addIf(COMMAND_SEEK_FORWARD, isCurrentMediaItemSeekable() && !isPlayingAd())
.build();
}

23
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java
View File

@ -1182,7 +1182,7 @@ public interface ExoPlayer extends Player {
* @param mediaSources The new {@link MediaSource MediaSources}.
* @param resetPosition Whether the playback position should be reset to the default position in
* the first {@link Timeline.Window}. If false, playback will start from the position defined
* by {@link #getCurrentWindowIndex()} and {@link #getCurrentPosition()}.
* by {@link #getCurrentMediaItemIndex()} and {@link #getCurrentPosition()}.
*/
@UnstableApi
void setMediaSources(List<MediaSource> mediaSources, boolean resetPosition);
@ -1191,15 +1191,16 @@ public interface ExoPlayer extends Player {
* Clears the playlist and adds the specified {@link MediaSource MediaSources}.
*
* @param mediaSources The new {@link MediaSource MediaSources}.
* @param startWindowIndex The window index to start playback from. If {@link C#INDEX_UNSET} is
* passed, the current position is not reset.
* @param startMediaItemIndex The media item index to start playback from. If {@link
* C#INDEX_UNSET} is passed, the current position is not reset.
* @param startPositionMs The position in milliseconds to start playback from. If {@link
* C#TIME_UNSET} is passed, the default position of the given window is used. In any case, if
* {@code startWindowIndex} is set to {@link C#INDEX_UNSET}, this parameter is ignored and the
* position is not reset at all.
* C#TIME_UNSET} is passed, the default position of the given media item is used. In any case,
* if {@code startMediaItemIndex} is set to {@link C#INDEX_UNSET}, this parameter is ignored
* and the position is not reset at all.
*/
@UnstableApi
void setMediaSources(List<MediaSource> mediaSources, int startWindowIndex, long startPositionMs);
void setMediaSources(
List<MediaSource> mediaSources, int startMediaItemIndex, long startPositionMs);
/**
* Clears the playlist, adds the specified {@link MediaSource} and resets the position to the
@ -1224,7 +1225,7 @@ public interface ExoPlayer extends Player {
*
* @param mediaSource The new {@link MediaSource}.
* @param resetPosition Whether the playback position should be reset to the default position. If
* false, playback will start from the position defined by {@link #getCurrentWindowIndex()}
* false, playback will start from the position defined by {@link #getCurrentMediaItemIndex()}
* and {@link #getCurrentPosition()}.
*/
@UnstableApi
@ -1411,9 +1412,9 @@ public interface ExoPlayer extends Player {
* will be delivered immediately without blocking on the playback thread. The default {@link
* PlayerMessage#getType()} is 0 and the default {@link PlayerMessage#getPayload()} is null. If a
* position is specified with {@link PlayerMessage#setPosition(long)}, the message will be
* delivered at this position in the current window defined by {@link #getCurrentWindowIndex()}.
* Alternatively, the message can be sent at a specific window using {@link
* PlayerMessage#setPosition(int, long)}.
* delivered at this position in the current media item defined by {@link
* #getCurrentMediaItemIndex()}. Alternatively, the message can be sent at a specific mediaItem
* using {@link PlayerMessage#setPosition(int, long)}.
*/
@UnstableApi
PlayerMessage createMessage(PlayerMessage.Target target);

43
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java
View File

@ -550,7 +550,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
playbackInfo,
timeline,
getPeriodPositionOrMaskWindowPosition(
timeline, getCurrentWindowIndex(), getCurrentPosition()));
timeline, getCurrentMediaItemIndex(), getCurrentPosition()));
pendingOperationAcks++;
this.shuffleOrder = shuffleOrder;
internalPlayer.setShuffleOrder(shuffleOrder);
@ -675,7 +675,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
@Player.State
int newPlaybackState =
getPlaybackState() == Player.STATE_IDLE ? Player.STATE_IDLE : Player.STATE_BUFFERING;
int oldMaskingWindowIndex = getCurrentWindowIndex();
int oldMaskingMediaItemIndex = getCurrentMediaItemIndex();
PlaybackInfo newPlaybackInfo = playbackInfo.copyWithPlaybackState(newPlaybackState);
newPlaybackInfo =
maskTimelineAndPosition(
@ -691,7 +691,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
/* positionDiscontinuity= */ true,
/* positionDiscontinuityReason= */ DISCONTINUITY_REASON_SEEK,
/* discontinuityWindowStartPositionUs= */ getCurrentPositionUsInternal(newPlaybackInfo),
oldMaskingWindowIndex);
oldMaskingMediaItemIndex);
}
@Override
@ -852,7 +852,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
internalPlayer,
target,
playbackInfo.timeline,
getCurrentWindowIndex(),
getCurrentMediaItemIndex(),
clock,
internalPlayer.getPlaybackLooper());
}
@ -923,7 +923,10 @@ import java.util.concurrent.CopyOnWriteArraySet;
if (isPlayingAd()) {
playbackInfo.timeline.getPeriodByUid(playbackInfo.periodId.periodUid, period);
return playbackInfo.requestedContentPositionUs == C.TIME_UNSET
? playbackInfo.timeline.getWindow(getCurrentWindowIndex(), window).getDefaultPositionMs()
? playbackInfo
.timeline
.getWindow(getCurrentMediaItemIndex(), window)
.getDefaultPositionMs()
: period.getPositionInWindowMs() + Util.usToMs(playbackInfo.requestedContentPositionUs);
} else {
return getCurrentPosition();
@ -937,7 +940,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
}
if (playbackInfo.loadingMediaPeriodId.windowSequenceNumber
!= playbackInfo.periodId.windowSequenceNumber) {
return playbackInfo.timeline.getWindow(getCurrentWindowIndex(), window).getDurationMs();
return playbackInfo.timeline.getWindow(getCurrentMediaItemIndex(), window).getDurationMs();
}
long contentBufferedPositionUs = playbackInfo.bufferedPositionUs;
if (playbackInfo.loadingMediaPeriodId.isAd()) {
@ -1231,7 +1234,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
boolean positionDiscontinuity,
@DiscontinuityReason int positionDiscontinuityReason,
long discontinuityWindowStartPositionUs,
int oldMaskingWindowIndex) {
int oldMaskingMediaItemIndex) {
// Assign playback info immediately such that all getters return the right values, but keep
// snapshot of previous and new state so that listener invocations are triggered correctly.
@ -1280,7 +1283,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
if (positionDiscontinuity) {
PositionInfo previousPositionInfo =
getPreviousPositionInfo(
positionDiscontinuityReason, previousPlaybackInfo, oldMaskingWindowIndex);
positionDiscontinuityReason, previousPlaybackInfo, oldMaskingMediaItemIndex);
PositionInfo positionInfo = getPositionInfo(discontinuityWindowStartPositionUs);
listeners.queueEvent(
Player.EVENT_POSITION_DISCONTINUITY,
@ -1391,19 +1394,19 @@ import java.util.concurrent.CopyOnWriteArraySet;
private PositionInfo getPreviousPositionInfo(
@DiscontinuityReason int positionDiscontinuityReason,
PlaybackInfo oldPlaybackInfo,
int oldMaskingWindowIndex) {
int oldMaskingMediaItemIndex) {
@Nullable Object oldWindowUid = null;
@Nullable Object oldPeriodUid = null;
int oldWindowIndex = oldMaskingWindowIndex;
int oldMediaItemIndex = oldMaskingMediaItemIndex;
int oldPeriodIndex = C.INDEX_UNSET;
@Nullable MediaItem oldMediaItem = null;
Timeline.Period oldPeriod = new Timeline.Period();
if (!oldPlaybackInfo.timeline.isEmpty()) {
oldPeriodUid = oldPlaybackInfo.periodId.periodUid;
oldPlaybackInfo.timeline.getPeriodByUid(oldPeriodUid, oldPeriod);
oldWindowIndex = oldPeriod.windowIndex;
oldMediaItemIndex = oldPeriod.windowIndex;
oldPeriodIndex = oldPlaybackInfo.timeline.getIndexOfPeriod(oldPeriodUid);
oldWindowUid = oldPlaybackInfo.timeline.getWindow(oldWindowIndex, window).uid;
oldWindowUid = oldPlaybackInfo.timeline.getWindow(oldMediaItemIndex, window).uid;
oldMediaItem = window.mediaItem;
}
long oldPositionUs;
@ -1434,7 +1437,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
}
return new PositionInfo(
oldWindowUid,
oldWindowIndex,
oldMediaItemIndex,
oldMediaItem,
oldPeriodUid,
oldPeriodIndex,
@ -1447,20 +1450,20 @@ import java.util.concurrent.CopyOnWriteArraySet;
private PositionInfo getPositionInfo(long discontinuityWindowStartPositionUs) {
@Nullable Object newWindowUid = null;
@Nullable Object newPeriodUid = null;
int newWindowIndex = getCurrentWindowIndex();
int newMediaItemIndex = getCurrentMediaItemIndex();
int newPeriodIndex = C.INDEX_UNSET;
@Nullable MediaItem newMediaItem = null;
if (!playbackInfo.timeline.isEmpty()) {
newPeriodUid = playbackInfo.periodId.periodUid;
playbackInfo.timeline.getPeriodByUid(newPeriodUid, period);
newPeriodIndex = playbackInfo.timeline.getIndexOfPeriod(newPeriodUid);
newWindowUid = playbackInfo.timeline.getWindow(newWindowIndex, window).uid;
newWindowUid = playbackInfo.timeline.getWindow(newMediaItemIndex, window).uid;
newMediaItem = window.mediaItem;
}
long positionMs = Util.usToMs(discontinuityWindowStartPositionUs);
return new PositionInfo(
newWindowUid,
newWindowIndex,
newMediaItemIndex,
newMediaItem,
newPeriodUid,
newPeriodIndex,
@ -1614,7 +1617,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
private PlaybackInfo removeMediaItemsInternal(int fromIndex, int toIndex) {
Assertions.checkArgument(
fromIndex >= 0 && toIndex >= fromIndex && toIndex <= mediaSourceHolderSnapshots.size());
int currentWindowIndex = getCurrentWindowIndex();
int currentIndex = getCurrentMediaItemIndex();
Timeline oldTimeline = getCurrentTimeline();
int currentMediaSourceCount = mediaSourceHolderSnapshots.size();
pendingOperationAcks++;
@ -1631,7 +1634,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
&& newPlaybackInfo.playbackState != STATE_ENDED
&& fromIndex < toIndex
&& toIndex == currentMediaSourceCount
&& currentWindowIndex >= newPlaybackInfo.timeline.getWindowCount();
&& currentIndex >= newPlaybackInfo.timeline.getWindowCount();
if (transitionsToEnded) {
newPlaybackInfo = newPlaybackInfo.copyWithPlaybackState(STATE_ENDED);
}
@ -1766,11 +1769,11 @@ import java.util.concurrent.CopyOnWriteArraySet;
isCleared ? C.INDEX_UNSET : getCurrentWindowIndexInternal(),
isCleared ? C.TIME_UNSET : currentPositionMs);
}
int currentWindowIndex = getCurrentWindowIndex();
int currentMediaItemIndex = getCurrentMediaItemIndex();
@Nullable
Pair<Object, Long> oldPeriodPosition =
oldTimeline.getPeriodPosition(
window, period, currentWindowIndex, Util.msToUs(currentPositionMs));
window, period, currentMediaItemIndex, Util.msToUs(currentPositionMs));
Object periodUid = castNonNull(oldPeriodPosition).first;
if (newTimeline.getIndexOfPeriod(periodUid) != C.INDEX_UNSET) {
// The old period position is still available in the new timeline.

2
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImplInternal.java
View File

@ -2726,7 +2726,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
newTimeline,
new SeekPosition(
pendingMessageInfo.message.getTimeline(),
pendingMessageInfo.message.getWindowIndex(),
pendingMessageInfo.message.getMediaItemIndex(),
requestPositionUs),
/* trySubsequentPeriods= */ false,
repeatMode,

49
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/PlayerMessage.java
View File

@ -70,7 +70,7 @@ public final class PlayerMessage {
private int type;
@Nullable private Object payload;
private Looper looper;
private int windowIndex;
private int mediaItemIndex;
private long positionMs;
private boolean deleteAfterDelivery;
private boolean isSent;
@ -85,8 +85,8 @@ public final class PlayerMessage {
* @param target The {@link Target} the message is sent to.
* @param timeline The timeline used when setting the position with {@link #setPosition(long)}. If
* set to {@link Timeline#EMPTY}, any position can be specified.
* @param defaultWindowIndex The default window index in the {@code timeline} when no other window
* index is specified.
* @param defaultMediaItemIndex The default media item index in the {@code timeline} when no other
* media item index is specified.
* @param clock The {@link Clock}.
* @param defaultLooper The default {@link Looper} to send the message on when no other looper is
* specified.
@ -95,7 +95,7 @@ public final class PlayerMessage {
Sender sender,
Target target,
Timeline timeline,
int defaultWindowIndex,
int defaultMediaItemIndex,
Clock clock,
Looper defaultLooper) {
this.sender = sender;
@ -103,7 +103,7 @@ public final class PlayerMessage {
this.timeline = timeline;
this.looper = defaultLooper;
this.clock = clock;
this.windowIndex = defaultWindowIndex;
this.mediaItemIndex = defaultMediaItemIndex;
this.positionMs = C.TIME_UNSET;
this.deleteAfterDelivery = true;
}
@ -180,21 +180,21 @@ public final class PlayerMessage {
}
/**
* Returns position in window at {@link #getWindowIndex()} at which the message will be delivered,
* in milliseconds. If {@link C#TIME_UNSET}, the message will be delivered immediately. If {@link
* C#TIME_END_OF_SOURCE}, the message will be delivered at the end of the window at {@link
* #getWindowIndex()}.
* Returns position in the media item at {@link #getMediaItemIndex()} at which the message will be
* delivered, in milliseconds. If {@link C#TIME_UNSET}, the message will be delivered immediately.
* If {@link C#TIME_END_OF_SOURCE}, the message will be delivered at the end of the media item at
* {@link #getMediaItemIndex()}.
*/
public long getPositionMs() {
return positionMs;
}
/**
* Sets a position in the current window at which the message will be delivered.
* Sets a position in the current media item at which the message will be delivered.
*
* @param positionMs The position in the current window at which the message will be sent, in
* @param positionMs The position in the current media item at which the message will be sent, in
* milliseconds, or {@link C#TIME_END_OF_SOURCE} to deliver the message at the end of the
* current window.
* current media item.
* @return This message.
* @throws IllegalStateException If {@link #send()} has already been called.
*/
@ -205,31 +205,32 @@ public final class PlayerMessage {
}
/**
* Sets a position in a window at which the message will be delivered.
* Sets a position in a media item at which the message will be delivered.
*
* @param windowIndex The index of the window at which the message will be sent.
* @param positionMs The position in the window with index {@code windowIndex} at which the
* @param mediaItemIndex The index of the media item at which the message will be sent.
* @param positionMs The position in the media item with index {@code mediaItemIndex} at which the
* message will be sent, in milliseconds, or {@link C#TIME_END_OF_SOURCE} to deliver the
* message at the end of the window with index {@code windowIndex}.
* message at the end of the media item with index {@code mediaItemIndex}.
* @return This message.
* @throws IllegalSeekPositionException If the timeline returned by {@link #getTimeline()} is not
* empty and the provided window index is not within the bounds of the timeline.
* empty and the provided media item index is not within the bounds of the timeline.
* @throws IllegalStateException If {@link #send()} has already been called.
*/
public PlayerMessage setPosition(int windowIndex, long positionMs) {
public PlayerMessage setPosition(int mediaItemIndex, long positionMs) {
Assertions.checkState(!isSent);
Assertions.checkArgument(positionMs != C.TIME_UNSET);
if (windowIndex < 0 || (!timeline.isEmpty() && windowIndex >= timeline.getWindowCount())) {
throw new IllegalSeekPositionException(timeline, windowIndex, positionMs);
if (mediaItemIndex < 0
|| (!timeline.isEmpty() && mediaItemIndex >= timeline.getWindowCount())) {
throw new IllegalSeekPositionException(timeline, mediaItemIndex, positionMs);
}
this.windowIndex = windowIndex;
this.mediaItemIndex = mediaItemIndex;
this.positionMs = positionMs;
return this;
}
/** Returns window index at which the message will be delivered. */
public int getWindowIndex() {
return windowIndex;
/** Returns media item index at which the message will be delivered. */
public int getMediaItemIndex() {
return mediaItemIndex;
}
/**

6
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java
View File

@ -1121,9 +1121,9 @@ public class SimpleExoPlayer extends BasePlayer
@Override
public void setMediaSources(
List<MediaSource> mediaSources, int startWindowIndex, long startPositionMs) {
List<MediaSource> mediaSources, int startMediaItemIndex, long startPositionMs) {
verifyApplicationThread();
player.setMediaSources(mediaSources, startWindowIndex, startPositionMs);
player.setMediaSources(mediaSources, startMediaItemIndex, startPositionMs);
}
@Override
@ -1430,7 +1430,7 @@ public class SimpleExoPlayer extends BasePlayer
@Override
public int getCurrentMediaItemIndex() {
verifyApplicationThread();
return player.getCurrentWindowIndex();
return player.getCurrentMediaItemIndex();
}
@Override

6
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/AnalyticsCollector.java
View File

@ -916,7 +916,7 @@ public class AnalyticsCollector
long eventPositionMs;
boolean isInCurrentWindow =
timeline.equals(player.getCurrentTimeline())
&& windowIndex == player.getCurrentWindowIndex();
&& windowIndex == player.getCurrentMediaItemIndex();
if (mediaPeriodId != null && mediaPeriodId.isAd()) {
boolean isCurrentAd =
isInCurrentWindow
@ -941,7 +941,7 @@ public class AnalyticsCollector
mediaPeriodId,
eventPositionMs,
player.getCurrentTimeline(),
player.getCurrentWindowIndex(),
player.getCurrentMediaItemIndex(),
currentMediaPeriodId,
player.getCurrentPosition(),
player.getTotalBufferedDuration());
@ -964,7 +964,7 @@ public class AnalyticsCollector
? null
: mediaPeriodQueueTracker.getMediaPeriodIdTimeline(mediaPeriodId);
if (mediaPeriodId == null || knownTimeline == null) {
int windowIndex = player.getCurrentWindowIndex();
int windowIndex = player.getCurrentMediaItemIndex();
Timeline timeline = player.getCurrentTimeline();
boolean windowIsInTimeline = windowIndex < timeline.getWindowCount();
return generateEventTime(

10
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/AnalyticsListener.java
View File

@ -384,7 +384,7 @@ public interface AnalyticsListener {
/**
* The current window index in {@link #currentTimeline} at the time of the event, or the
* prospective window index if the timeline is not yet known and empty (equivalent to {@link
* Player#getCurrentWindowIndex()}).
* Player#getCurrentMediaItemIndex()}).
*/
public final int currentWindowIndex;
@ -421,7 +421,7 @@ public interface AnalyticsListener {
* {@link Player#getCurrentTimeline()}).
* @param currentWindowIndex The current window index in {@code currentTimeline} at the time of
* the event, or the prospective window index if the timeline is not yet known and empty
* (equivalent to {@link Player#getCurrentWindowIndex()}).
* (equivalent to {@link Player#getCurrentMediaItemIndex()}).
* @param currentMediaPeriodId {@link MediaPeriodId Media period identifier} for the currently
* playing media period at the time of the event, or {@code null} if no current media period
* identifier is available.
@ -1206,9 +1206,9 @@ public interface AnalyticsListener {
* {@link Player#seekTo(long)} after a {@link
* AnalyticsListener#onMediaItemTransition(EventTime, MediaItem, int)}).
* <li>They intend to use multiple state values together or in combination with {@link Player}
* getter methods. For example using {@link Player#getCurrentWindowIndex()} with the {@code
* timeline} provided in {@link #onTimelineChanged(EventTime, int)} is only safe from within
* this method.
* getter methods. For example using {@link Player#getCurrentMediaItemIndex()} with the
* {@code timeline} provided in {@link #onTimelineChanged(EventTime, int)} is only safe from
* within this method.
* <li>They are interested in events that logically happened together (e.g {@link
* #onPlaybackStateChanged(EventTime, int)} to {@link Player#STATE_BUFFERING} because of
* {@link #onMediaItemTransition(EventTime, MediaItem, int)}).

4
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/util/DebugTextViewHelper.java
View File

@ -141,8 +141,8 @@ public class DebugTextViewHelper implements Player.Listener, Runnable {
break;
}
return String.format(
"playWhenReady:%s playbackState:%s window:%s",
player.getPlayWhenReady(), playbackStateString, player.getCurrentWindowIndex());
"playWhenReady:%s playbackState:%s item:%s",
player.getPlayWhenReady(), playbackStateString, player.getCurrentMediaItemIndex());
}
/** Returns a string containing video debugging information. */

1003
libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java
View File

File diff suppressed because it is too large Load Diff

2
libraries/exoplayer_ima/src/test/java/androidx/media3/exoplayer/ima/FakeExoPlayer.java
View File

@ -279,7 +279,7 @@ import androidx.media3.test.utils.StubExoPlayer;
timeline.getPeriod(0, period).getAdDurationUs(adGroupIndex, adIndexInAdGroup);
return Util.usToMs(adDurationUs);
} else {
return timeline.getWindow(getCurrentWindowIndex(), window).getDurationMs();
return timeline.getWindow(getCurrentMediaItemIndex(), window).getDurationMs();
}
}

2
libraries/session/src/main/java/androidx/media3/session/MediaController.java
View File

@ -1238,7 +1238,7 @@ public class MediaController implements Player {
Timeline timeline = getCurrentTimeline();
return timeline.isEmpty()
? null
: timeline.getWindow(getCurrentWindowIndex(), window).mediaItem;
: timeline.getWindow(getCurrentMediaItemIndex(), window).mediaItem;
}
@Override

10
libraries/session/src/main/java/androidx/media3/session/PlayerNotificationManager.java
View File

@ -607,9 +607,9 @@ public class PlayerNotificationManager {
public static final String ACTION_PLAY = "androidx.media3.ui.notification.play";
/** The action which pauses playback. */
public static final String ACTION_PAUSE = "androidx.media3.ui.notification.pause";
/** The action which skips to the previous window. */
/** The action which skips to the previous media item. */
public static final String ACTION_PREVIOUS = "androidx.media3.ui.notification.prev";
/** The action which skips to the next window. */
/** The action which skips to the next media item. */
public static final String ACTION_NEXT = "androidx.media3.ui.notification.next";
/** The action which fast forwards. */
public static final String ACTION_FAST_FORWARD = "androidx.media3.ui.notification.ffwd";
@ -1097,7 +1097,7 @@ public class PlayerNotificationManager {
*
* <ul>
* <li>The media is {@link Player#isPlaying() actively playing}.
* <li>The media is not {@link Player#isCurrentWindowDynamic() dynamically changing its
* <li>The media is not {@link Player#isCurrentMediaItemDynamic() dynamically changing its
* duration} (like for example a live stream).
* <li>The media is not {@link Player#isPlayingAd() interrupted by an ad}.
* <li>The media is played at {@link Player#getPlaybackParameters() regular speed}.
@ -1255,7 +1255,7 @@ public class PlayerNotificationManager {
&& useChronometer
&& player.isPlaying()
&& !player.isPlayingAd()
&& !player.isCurrentWindowDynamic()
&& !player.isCurrentMediaItemDynamic()
&& player.getPlaybackParameters().speed == 1f) {
builder
.setWhen(System.currentTimeMillis() - player.getContentPosition())
@ -1533,7 +1533,7 @@ public class PlayerNotificationManager {
if (player.getPlaybackState() == Player.STATE_IDLE) {
player.prepare();
} else if (player.getPlaybackState() == Player.STATE_ENDED) {
player.seekToDefaultPosition(player.getCurrentWindowIndex());
player.seekToDefaultPosition(player.getCurrentMediaItemIndex());
}
player.play();
} else if (ACTION_PAUSE.equals(action)) {

4
libraries/session/src/main/java/androidx/media3/session/PlayerWrapper.java
View File

@ -728,7 +728,7 @@ import java.util.List;
| PlaybackStateCompat.ACTION_SET_REPEAT_MODE
| PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE
| PlaybackStateCompat.ACTION_SET_CAPTIONING_ENABLED;
long queueItemId = MediaUtils.convertToQueueItemId(getCurrentWindowIndex());
long queueItemId = MediaUtils.convertToQueueItemId(getCurrentMediaItemIndex());
PlaybackStateCompat.Builder builder =
new PlaybackStateCompat.Builder()
.setState(
@ -807,7 +807,7 @@ import java.util.List;
public PositionInfo createPositionInfoForBundling() {
return new PositionInfo(
/* windowUid= */ null,
getCurrentWindowIndex(),
getCurrentMediaItemIndex(),
/* periodUid= */ null,
getCurrentMediaItem(),
getCurrentPeriodIndex(),

2
libraries/session/src/test/java/androidx/media3/session/PlayerWrapperTest.java
View File

@ -73,7 +73,7 @@ public class PlayerWrapperTest {
when(player.getContentDuration()).thenReturn(testContentDurationMs);
when(player.getContentPosition()).thenReturn(testContentPositionMs);
when(player.getContentBufferedPosition()).thenReturn(testContentBufferedPositionMs);
when(player.getCurrentWindowIndex()).thenReturn(testmediaItemIndex);
when(player.getCurrentMediaItemIndex()).thenReturn(testmediaItemIndex);
when(player.getCurrentPeriodIndex()).thenReturn(testPeriodIndex);
SessionPositionInfo sessionPositionInfo = playerWrapper.createSessionPositionInfoForBundling();

24
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerListenerTest.java
View File

@ -392,7 +392,7 @@ public class MediaControllerListenerTest {
boolean testIsPlayingAd = true;
int testCurrentAdGroupIndex = 2;
int testCurrentAdIndexInAdGroup = 6;
int testWindowIndex = 1;
int testMediaItemIndex = 1;
int testPeriodIndex = 2;
controller = controllerTestRule.createController(remoteSession.getToken());
@ -410,7 +410,7 @@ public class MediaControllerListenerTest {
AtomicBoolean isPlayingAdRef = new AtomicBoolean();
AtomicInteger currentAdGroupIndexRef = new AtomicInteger();
AtomicInteger currentAdIndexInAdGroupRef = new AtomicInteger();
AtomicInteger currentWindowIndexRef = new AtomicInteger();
AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
AtomicInteger currentPeriodIndexRef = new AtomicInteger();
threadTestRule
.getHandler()
@ -435,7 +435,7 @@ public class MediaControllerListenerTest {
isPlayingAdRef.set(controller.isPlayingAd());
currentAdGroupIndexRef.set(controller.getCurrentAdGroupIndex());
currentAdIndexInAdGroupRef.set(controller.getCurrentAdIndexInAdGroup());
currentWindowIndexRef.set(controller.getCurrentWindowIndex());
currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
currentPeriodIndexRef.set(controller.getCurrentPeriodIndex());
latch.countDown();
}
@ -455,7 +455,7 @@ public class MediaControllerListenerTest {
.setIsPlayingAd(testIsPlayingAd)
.setCurrentAdGroupIndex(testCurrentAdGroupIndex)
.setCurrentAdIndexInAdGroup(testCurrentAdIndexInAdGroup)
.setCurrentMediaItemIndex(testWindowIndex)
.setCurrentMediaItemIndex(testMediaItemIndex)
.setCurrentPeriodIndex(testPeriodIndex)
.build();
remoteSession.setPlayer(playerConfig);
@ -473,7 +473,7 @@ public class MediaControllerListenerTest {
assertThat(isPlayingAdRef.get()).isEqualTo(testIsPlayingAd);
assertThat(currentAdGroupIndexRef.get()).isEqualTo(testCurrentAdGroupIndex);
assertThat(currentAdIndexInAdGroupRef.get()).isEqualTo(testCurrentAdIndexInAdGroup);
assertThat(currentWindowIndexRef.get()).isEqualTo(testWindowIndex);
assertThat(currentMediaItemIndexRef.get()).isEqualTo(testMediaItemIndex);
assertThat(currentPeriodIndexRef.get()).isEqualTo(testPeriodIndex);
}
@ -836,8 +836,8 @@ public class MediaControllerListenerTest {
public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
shuffleModeEnabledFromParamRef.set(shuffleModeEnabled);
shuffleModeEnabledFromGetterRef.set(controller.getShuffleModeEnabled());
previousIndexRef.set(controller.getPreviousWindowIndex());
nextIndexRef.set(controller.getNextWindowIndex());
previousIndexRef.set(controller.getPreviousMediaItemIndex());
nextIndexRef.set(controller.getNextMediaItemIndex());
latch.countDown();
}
};
@ -876,8 +876,8 @@ public class MediaControllerListenerTest {
public void onRepeatModeChanged(@RepeatMode int repeatMode) {
repeatModeFromParamRef.set(repeatMode);
repeatModeFromGetterRef.set(controller.getRepeatMode());
previousIndexRef.set(controller.getPreviousWindowIndex());
nextIndexRef.set(controller.getNextWindowIndex());
previousIndexRef.set(controller.getPreviousMediaItemIndex());
nextIndexRef.set(controller.getNextMediaItemIndex());
latch.countDown();
}
};
@ -1352,7 +1352,7 @@ public class MediaControllerListenerTest {
PositionInfo testOldPosition =
new PositionInfo(
/* windowUid= */ null,
/* windowIndex= */ 2,
/* mediaItemIndex= */ 2,
new MediaItem.Builder().setMediaId("media-id-2").build(),
/* periodUid= */ null,
/* periodIndex= */ C.INDEX_UNSET,
@ -1363,7 +1363,7 @@ public class MediaControllerListenerTest {
PositionInfo testNewPosition =
new PositionInfo(
/* windowUid= */ null,
/* windowIndex= */ 3,
/* mediaItemIndex= */ 3,
new MediaItem.Builder().setMediaId("media-id-3").build(),
/* periodUid= */ null,
/* periodIndex= */ C.INDEX_UNSET,
@ -1418,7 +1418,7 @@ public class MediaControllerListenerTest {
PositionInfo newPositionInfo =
new PositionInfo(
/* windowUid= */ null,
/* windowIndex= */ C.INDEX_UNSET,
/* mediaItemIndex= */ C.INDEX_UNSET,
/* mediaItem= */ null,
/* periodUid= */ null,
/* periodIndex= */ C.INDEX_UNSET,

8
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerMediaSessionCompatCallbackAggregationTest.java
View File

@ -188,7 +188,7 @@ public class MediaControllerMediaSessionCompatCallbackAggregationTest {
threadTestRule.getHandler().postAndSync(controller::getCurrentTimeline);
assertThat(currentTimeline).isEqualTo(timelineRef.get());
int currentMediaItemIndex =
threadTestRule.getHandler().postAndSync(controller::getCurrentWindowIndex);
threadTestRule.getHandler().postAndSync(controller::getCurrentMediaItemIndex);
assertThat(currentMediaItemIndex).isEqualTo(testMediaItemIndex);
MediaItem currentMediaItem =
threadTestRule.getHandler().postAndSync(controller::getCurrentMediaItem);
@ -292,7 +292,7 @@ public class MediaControllerMediaSessionCompatCallbackAggregationTest {
threadTestRule.getHandler().postAndSync(controller::getCurrentTimeline);
assertThat(currentTimeline).isEqualTo(timelineRef.get());
int currentMediaItemIndex =
threadTestRule.getHandler().postAndSync(controller::getCurrentWindowIndex);
threadTestRule.getHandler().postAndSync(controller::getCurrentMediaItemIndex);
assertThat(currentMediaItemIndex).isEqualTo(testMediaItemIndex);
MediaItem currentMediaItem =
threadTestRule.getHandler().postAndSync(controller::getCurrentMediaItem);
@ -384,7 +384,7 @@ public class MediaControllerMediaSessionCompatCallbackAggregationTest {
threadTestRule.getHandler().postAndSync(controller::getCurrentTimeline);
assertThat(currentTimeline).isEqualTo(timelineRef.get());
int currentMediaItemIndex =
threadTestRule.getHandler().postAndSync(controller::getCurrentWindowIndex);
threadTestRule.getHandler().postAndSync(controller::getCurrentMediaItemIndex);
assertThat(currentMediaItemIndex).isEqualTo(testMediaItemIndex);
MediaItem currentMediaItem =
threadTestRule.getHandler().postAndSync(controller::getCurrentMediaItem);
@ -483,7 +483,7 @@ public class MediaControllerMediaSessionCompatCallbackAggregationTest {
threadTestRule.getHandler().postAndSync(controller::getCurrentTimeline);
assertThat(currentTimeline).isEqualTo(timelineRef.get());
int currentMediaItemIndex =
threadTestRule.getHandler().postAndSync(controller::getCurrentWindowIndex);
threadTestRule.getHandler().postAndSync(controller::getCurrentMediaItemIndex);
assertThat(currentMediaItemIndex).isEqualTo(testMediaItemIndex);
MediaItem currentMediaItem =
threadTestRule.getHandler().postAndSync(controller::getCurrentMediaItem);

101
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerStateMaskingWithMediaSessionCompatTest.java
View File

@ -416,7 +416,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
}
@Test
public void seekTo_withNewWindowIndex() throws Exception {
public void seekTo_withNewMediaItemIndex() throws Exception {
List<MediaItem> mediaItems = MediaTestUtils.createMediaItems(3);
List<QueueItem> queue = MediaUtils.convertToQueueItemList(mediaItems);
long initialPosition = 8_000;
@ -543,7 +543,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
}
@Test
public void seekTo_seekBackwardWithinSameWindow_resetsBufferedPosition() throws Exception {
public void seekTo_seekBackwardWithinSameMediaItem_resetsBufferedPosition() throws Exception {
long initialPosition = 8_000L;
long initialBufferedPosition = 9_200L;
int initialIndex = 0;
@ -621,7 +621,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
}
@Test
public void seekTo_seekForwardWithinSameWindow_keepsTheBufferedPosition() throws Exception {
public void seekTo_seekForwardWithinSameMediaItem_keepsTheBufferedPosition() throws Exception {
long initialPosition = 8_000L;
long initialBufferedPosition = 9_200L;
int initialIndex = 0;
@ -703,12 +703,12 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
List<MediaItem> mediaItems = MediaTestUtils.createMediaItems("a", "b", "c");
List<QueueItem> queue = MediaUtils.convertToQueueItemList(mediaItems);
long testPosition = 200L;
int testCurrentWindowIndex = 1;
MediaItem testCurrentMediaItem = mediaItems.get(testCurrentWindowIndex);
int testCurrentMediaItemIndex = 1;
MediaItem testCurrentMediaItem = mediaItems.get(testCurrentMediaItemIndex);
session.setPlaybackState(
new PlaybackStateCompat.Builder()
.setState(PlaybackStateCompat.STATE_PAUSED, testPosition, /* playbackSpeed= */ 1.0f)
.setActiveQueueItemId(queue.get(testCurrentWindowIndex).getQueueId())
.setActiveQueueItemId(queue.get(testCurrentMediaItemIndex).getQueueId())
.build());
session.setQueue(queue);
List<MediaItem> newMediaItems = MediaTestUtils.createMediaItems("A", "B");
@ -741,7 +741,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
};
threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
AtomicInteger currentWindowIndexRef = new AtomicInteger();
AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
AtomicReference<MediaItem> currentMediaItemRef = new AtomicReference<>();
AtomicReference<Timeline> timelineFromGetterRef = new AtomicReference<>();
threadTestRule
@ -749,7 +749,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
.postAndSync(
() -> {
controller.addMediaItems(testAddIndex, newMediaItems);
currentWindowIndexRef.set(controller.getCurrentWindowIndex());
currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
currentMediaItemRef.set(controller.getCurrentMediaItem());
timelineFromGetterRef.set(controller.getCurrentTimeline());
});
@ -758,22 +758,23 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
MediaTestUtils.assertTimelineContains(timelineFromParamRef.get(), testMediaItems);
assertThat(timelineChangedReasonRef.get()).isEqualTo(TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED);
assertThat(onEventsRef.get()).isEqualTo(testEvents);
assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentWindowIndex);
assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
assertThat(currentMediaItemRef.get()).isEqualTo(testCurrentMediaItem);
MediaTestUtils.assertTimelineContains(timelineFromGetterRef.get(), testMediaItems);
}
@Test
public void addMediaItems_beforeCurrentWindowIndex_shiftsCurrentWindowIndex() throws Exception {
public void addMediaItems_beforeCurrentMediaItemIndex_shiftsCurrentMediaItemIndex()
throws Exception {
List<MediaItem> mediaItems = MediaTestUtils.createMediaItems("a", "b", "c");
List<QueueItem> queue = MediaUtils.convertToQueueItemList(mediaItems);
long testPosition = 200L;
int initialWindowIndex = 2;
MediaItem testCurrentMediaItem = mediaItems.get(initialWindowIndex);
int initialMediaItemIndex = 2;
MediaItem testCurrentMediaItem = mediaItems.get(initialMediaItemIndex);
session.setPlaybackState(
new PlaybackStateCompat.Builder()
.setState(PlaybackStateCompat.STATE_PAUSED, testPosition, /* playbackSpeed= */ 1.0f)
.setActiveQueueItemId(queue.get(initialWindowIndex).getQueueId())
.setActiveQueueItemId(queue.get(initialMediaItemIndex).getQueueId())
.build());
session.setQueue(queue);
List<MediaItem> newMediaItems = MediaTestUtils.createMediaItems("A", "B");
@ -781,7 +782,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
List<MediaItem> testMediaItems = new ArrayList<>();
testMediaItems.addAll(mediaItems);
testMediaItems.addAll(testAddIndex, newMediaItems);
int testCurrentWindowIndex = testMediaItems.indexOf(testCurrentMediaItem);
int testCurrentMediaItemIndex = testMediaItems.indexOf(testCurrentMediaItem);
Events testEvents = new Events(new FlagSet.Builder().addAll(EVENT_TIMELINE_CHANGED).build());
MediaController controller = controllerTestRule.createController(session.getSessionToken());
@ -807,7 +808,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
};
threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
AtomicInteger currentWindowIndexRef = new AtomicInteger();
AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
AtomicReference<MediaItem> currentMediaItemRef = new AtomicReference<>();
AtomicReference<Timeline> timelineFromGetterRef = new AtomicReference<>();
threadTestRule
@ -815,7 +816,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
.postAndSync(
() -> {
controller.addMediaItems(testAddIndex, newMediaItems);
currentWindowIndexRef.set(controller.getCurrentWindowIndex());
currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
currentMediaItemRef.set(controller.getCurrentMediaItem());
timelineFromGetterRef.set(controller.getCurrentTimeline());
});
@ -824,7 +825,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
MediaTestUtils.assertTimelineContains(timelineFromParamRef.get(), testMediaItems);
assertThat(timelineChangedReasonRef.get()).isEqualTo(TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED);
assertThat(onEventsRef.get()).isEqualTo(testEvents);
assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentWindowIndex);
assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
assertThat(currentMediaItemRef.get()).isEqualTo(testCurrentMediaItem);
MediaTestUtils.assertTimelineContains(timelineFromGetterRef.get(), testMediaItems);
}
@ -834,12 +835,12 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
List<MediaItem> mediaItems = MediaTestUtils.createMediaItems(5);
List<QueueItem> queue = MediaUtils.convertToQueueItemList(mediaItems);
long testPosition = 200L;
int testCurrentWindowIndex = 0;
MediaItem testCurrentMediaItem = mediaItems.get(testCurrentWindowIndex);
int testCurrentMediaItemIndex = 0;
MediaItem testCurrentMediaItem = mediaItems.get(testCurrentMediaItemIndex);
session.setPlaybackState(
new PlaybackStateCompat.Builder()
.setState(PlaybackStateCompat.STATE_PAUSED, testPosition, /* playbackSpeed= */ 1.0f)
.setActiveQueueItemId(queue.get(testCurrentWindowIndex).getQueueId())
.setActiveQueueItemId(queue.get(testCurrentMediaItemIndex).getQueueId())
.build());
session.setQueue(queue);
int fromIndex = 1;
@ -871,7 +872,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
};
threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
AtomicInteger currentWindowIndexRef = new AtomicInteger();
AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
AtomicReference<MediaItem> currentMediaItemRef = new AtomicReference<>();
AtomicReference<Timeline> timelineFromGetterRef = new AtomicReference<>();
threadTestRule
@ -879,7 +880,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
.postAndSync(
() -> {
controller.removeMediaItems(fromIndex, toIndex);
currentWindowIndexRef.set(controller.getCurrentWindowIndex());
currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
currentMediaItemRef.set(controller.getCurrentMediaItem());
timelineFromGetterRef.set(controller.getCurrentTimeline());
});
@ -888,30 +889,30 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
MediaTestUtils.assertTimelineContains(timelineFromParamRef.get(), testMediaItems);
assertThat(timelineChangedReasonRef.get()).isEqualTo(TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED);
assertThat(onEventsRef.get()).isEqualTo(testEvents);
assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentWindowIndex);
assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
assertThat(currentMediaItemRef.get()).isEqualTo(testCurrentMediaItem);
MediaTestUtils.assertTimelineContains(timelineFromGetterRef.get(), testMediaItems);
}
@Test
public void removeMediaItems_beforeCurrentWindowIndex_shiftsCurrentWindowIndex()
public void removeMediaItems_beforeCurrentMediaItemIndex_shiftsCurrentMediaItemIndex()
throws Exception {
List<MediaItem> mediaItems = MediaTestUtils.createMediaItems(5);
List<QueueItem> queue = MediaUtils.convertToQueueItemList(mediaItems);
long testPosition = 200L;
int initialWindowIndex = 4;
MediaItem testCurrentMediaItem = mediaItems.get(initialWindowIndex);
int initialMediaItemIndex = 4;
MediaItem testCurrentMediaItem = mediaItems.get(initialMediaItemIndex);
session.setPlaybackState(
new PlaybackStateCompat.Builder()
.setState(PlaybackStateCompat.STATE_PAUSED, testPosition, /* playbackSpeed= */ 1.0f)
.setActiveQueueItemId(queue.get(initialWindowIndex).getQueueId())
.setActiveQueueItemId(queue.get(initialMediaItemIndex).getQueueId())
.build());
session.setQueue(queue);
int testFromIndex = 1;
int testToIndex = 3;
List<MediaItem> testMediaItems = new ArrayList<>(mediaItems.subList(0, testFromIndex));
testMediaItems.addAll(mediaItems.subList(testToIndex, mediaItems.size()));
int testCurrentWindowIndex = testMediaItems.indexOf(testCurrentMediaItem);
int testCurrentMediaItemIndex = testMediaItems.indexOf(testCurrentMediaItem);
Events testEvents = new Events(new FlagSet.Builder().addAll(EVENT_TIMELINE_CHANGED).build());
MediaController controller = controllerTestRule.createController(session.getSessionToken());
@ -937,7 +938,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
};
threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
AtomicInteger currentWindowIndexRef = new AtomicInteger();
AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
AtomicReference<MediaItem> currentMediaItemRef = new AtomicReference<>();
AtomicReference<Timeline> timelineFromGetterRef = new AtomicReference<>();
threadTestRule
@ -945,7 +946,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
.postAndSync(
() -> {
controller.removeMediaItems(testFromIndex, testToIndex);
currentWindowIndexRef.set(controller.getCurrentWindowIndex());
currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
currentMediaItemRef.set(controller.getCurrentMediaItem());
timelineFromGetterRef.set(controller.getCurrentTimeline());
});
@ -954,7 +955,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
MediaTestUtils.assertTimelineContains(timelineFromParamRef.get(), testMediaItems);
assertThat(timelineChangedReasonRef.get()).isEqualTo(TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED);
assertThat(onEventsRef.get()).isEqualTo(testEvents);
assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentWindowIndex);
assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
assertThat(currentMediaItemRef.get()).isEqualTo(testCurrentMediaItem);
MediaTestUtils.assertTimelineContains(timelineFromGetterRef.get(), testMediaItems);
}
@ -964,19 +965,19 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
List<MediaItem> mediaItems = MediaTestUtils.createMediaItems(5);
List<QueueItem> queue = MediaUtils.convertToQueueItemList(mediaItems);
long testPosition = 200L;
int initialWindowIndex = 2;
MediaItem testCurrentMediaItem = mediaItems.get(initialWindowIndex);
int initialMediaItemIndex = 2;
MediaItem testCurrentMediaItem = mediaItems.get(initialMediaItemIndex);
session.setPlaybackState(
new PlaybackStateCompat.Builder()
.setState(PlaybackStateCompat.STATE_PAUSED, testPosition, /* playbackSpeed= */ 1.0f)
.setActiveQueueItemId(queue.get(initialWindowIndex).getQueueId())
.setActiveQueueItemId(queue.get(initialMediaItemIndex).getQueueId())
.build());
session.setQueue(queue);
int testFromIndex = 1;
int testToIndex = 3;
List<MediaItem> testMediaItems = new ArrayList<>(mediaItems.subList(0, testFromIndex));
testMediaItems.addAll(mediaItems.subList(testToIndex, mediaItems.size()));
int testCurrentWindowIndex = testFromIndex;
int testCurrentMediaItemIndex = testFromIndex;
Events testEvents = new Events(new FlagSet.Builder().addAll(EVENT_TIMELINE_CHANGED).build());
MediaController controller = controllerTestRule.createController(session.getSessionToken());
@ -1002,14 +1003,14 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
};
threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
AtomicInteger currentWindowIndexRef = new AtomicInteger();
AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
AtomicReference<Timeline> timelineFromGetterRef = new AtomicReference<>();
threadTestRule
.getHandler()
.postAndSync(
() -> {
controller.removeMediaItems(testFromIndex, testToIndex);
currentWindowIndexRef.set(controller.getCurrentWindowIndex());
currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
timelineFromGetterRef.set(controller.getCurrentTimeline());
});
@ -1017,7 +1018,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
MediaTestUtils.assertTimelineContains(timelineFromParamRef.get(), testMediaItems);
assertThat(timelineChangedReasonRef.get()).isEqualTo(TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED);
assertThat(onEventsRef.get()).isEqualTo(testEvents);
assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentWindowIndex);
assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
MediaTestUtils.assertTimelineContains(timelineFromGetterRef.get(), testMediaItems);
}
@ -1026,12 +1027,12 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
List<MediaItem> mediaItems = MediaTestUtils.createMediaItems(5);
List<QueueItem> queue = MediaUtils.convertToQueueItemList(mediaItems);
long testPosition = 200L;
int testCurrentWindowIndex = 0;
MediaItem testCurrentMediaItem = mediaItems.get(testCurrentWindowIndex);
int testCurrentMediaItemIndex = 0;
MediaItem testCurrentMediaItem = mediaItems.get(testCurrentMediaItemIndex);
session.setPlaybackState(
new PlaybackStateCompat.Builder()
.setState(PlaybackStateCompat.STATE_PAUSED, testPosition, /* playbackSpeed= */ 1.0f)
.setActiveQueueItemId(queue.get(testCurrentWindowIndex).getQueueId())
.setActiveQueueItemId(queue.get(testCurrentMediaItemIndex).getQueueId())
.build());
session.setQueue(queue);
int testFromIndex = 1;
@ -1064,7 +1065,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
};
threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
AtomicInteger currentWindowIndexRef = new AtomicInteger();
AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
AtomicReference<MediaItem> currentMediaItemRef = new AtomicReference<>();
AtomicReference<Timeline> timelineFromGetterRef = new AtomicReference<>();
threadTestRule
@ -1072,7 +1073,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
.postAndSync(
() -> {
controller.moveMediaItems(testFromIndex, testToIndex, testNewIndex);
currentWindowIndexRef.set(controller.getCurrentWindowIndex());
currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
currentMediaItemRef.set(controller.getCurrentMediaItem());
timelineFromGetterRef.set(controller.getCurrentTimeline());
});
@ -1081,7 +1082,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
MediaTestUtils.assertTimelineContains(timelineFromParamRef.get(), testMediaItems);
assertThat(timelineChangedReasonRef.get()).isEqualTo(TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED);
assertThat(onEventsRef.get()).isEqualTo(testEvents);
assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentWindowIndex);
assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
assertThat(currentMediaItemRef.get()).isEqualTo(testCurrentMediaItem);
MediaTestUtils.assertTimelineContains(timelineFromGetterRef.get(), testMediaItems);
}
@ -1091,11 +1092,11 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
List<MediaItem> mediaItems = MediaTestUtils.createMediaItems(5);
List<QueueItem> queue = MediaUtils.convertToQueueItemList(mediaItems);
long testPosition = 200L;
int initialCurrentWindowIndex = 1;
int initialCurrentMediaItemIndex = 1;
session.setPlaybackState(
new PlaybackStateCompat.Builder()
.setState(PlaybackStateCompat.STATE_PAUSED, testPosition, /* playbackSpeed= */ 1.0f)
.setActiveQueueItemId(queue.get(initialCurrentWindowIndex).getQueueId())
.setActiveQueueItemId(queue.get(initialCurrentMediaItemIndex).getQueueId())
.build());
session.setQueue(queue);
int testFromIndex = 1;
@ -1106,7 +1107,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
Events testEvents = new Events(new FlagSet.Builder().addAll(EVENT_TIMELINE_CHANGED).build());
// The item at testToIndex becomes current media item after removed,
// and it remains as current media item when removed items are inserted back.
int testCurrentWindowIndex = testMediaItems.indexOf(mediaItems.get(testToIndex));
int testCurrentMediaItemIndex = testMediaItems.indexOf(mediaItems.get(testToIndex));
MediaController controller = controllerTestRule.createController(session.getSessionToken());
CountDownLatch latch = new CountDownLatch(2);
@ -1131,14 +1132,14 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
};
threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
AtomicInteger currentWindowIndexRef = new AtomicInteger();
AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
AtomicReference<Timeline> timelineFromGetterRef = new AtomicReference<>();
threadTestRule
.getHandler()
.postAndSync(
() -> {
controller.moveMediaItems(testFromIndex, testToIndex, testNewIndex);
currentWindowIndexRef.set(controller.getCurrentWindowIndex());
currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
timelineFromGetterRef.set(controller.getCurrentTimeline());
});
@ -1146,7 +1147,7 @@ public class MediaControllerStateMaskingWithMediaSessionCompatTest {
MediaTestUtils.assertTimelineContains(timelineFromParamRef.get(), testMediaItems);
assertThat(timelineChangedReasonRef.get()).isEqualTo(TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED);
assertThat(onEventsRef.get()).isEqualTo(testEvents);
assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentWindowIndex);
assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
MediaTestUtils.assertTimelineContains(timelineFromGetterRef.get(), testMediaItems);
}
}

45
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerWithMediaSessionCompatTest.java
View File

@ -624,76 +624,77 @@ public class MediaControllerWithMediaSessionCompatTest {
}
@Test
public void seekToDefaultPosition_withWindowIndex_updatesExpectedWindowIndex() throws Exception {
public void seekToDefaultPosition_withMediaItemIndex_updatesExpectedMediaItemIndex()
throws Exception {
List<MediaItem> testList = MediaTestUtils.createMediaItems(3);
List<QueueItem> testQueue = MediaUtils.convertToQueueItemList(testList);
session.setQueue(testQueue);
session.setPlaybackState(/* state= */ null);
int testWindowIndex = 2;
int testMediaItemIndex = 2;
MediaController controller = controllerTestRule.createController(session.getSessionToken());
CountDownLatch latch = new CountDownLatch(1);
AtomicInteger currentWindowIndexRef = new AtomicInteger();
AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
Player.Listener listener =
new Player.Listener() {
@Override
public void onPositionDiscontinuity(
PositionInfo oldPosition, PositionInfo newPosition, @DiscontinuityReason int reason) {
currentWindowIndexRef.set(controller.getCurrentWindowIndex());
currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
latch.countDown();
}
};
threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
threadTestRule
.getHandler()
.postAndSync(() -> controller.seekToDefaultPosition(testWindowIndex));
.postAndSync(() -> controller.seekToDefaultPosition(testMediaItemIndex));
session.setPlaybackState(
new PlaybackStateCompat.Builder()
.setActiveQueueItemId(testQueue.get(testWindowIndex).getQueueId())
.setActiveQueueItemId(testQueue.get(testMediaItemIndex).getQueueId())
.build());
assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
assertThat(currentWindowIndexRef.get()).isEqualTo(testWindowIndex);
assertThat(currentMediaItemIndexRef.get()).isEqualTo(testMediaItemIndex);
}
@Test
public void seekTo_withWindowIndex_updatesExpectedWindowIndex() throws Exception {
public void seekTo_withMediaItemIndex_updatesExpectedMediaItemIndex() throws Exception {
List<MediaItem> testList = MediaTestUtils.createMediaItems(3);
List<QueueItem> testQueue = MediaUtils.convertToQueueItemList(testList);
session.setQueue(testQueue);
session.setPlaybackState(/* state= */ null);
long testPositionMs = 23L;
int testWindowIndex = 2;
int testMediaItemIndex = 2;
MediaController controller = controllerTestRule.createController(session.getSessionToken());
CountDownLatch latch = new CountDownLatch(1);
AtomicInteger windowIndexFromParamRef = new AtomicInteger();
AtomicInteger windowIndexFromGetterRef = new AtomicInteger();
AtomicInteger mediaItemIndexFromParamRef = new AtomicInteger();
AtomicInteger mediaItemIndexFromGetterRef = new AtomicInteger();
Player.Listener listener =
new Player.Listener() {
@Override
public void onPositionDiscontinuity(
PositionInfo oldPosition, PositionInfo newPosition, @DiscontinuityReason int reason) {
windowIndexFromParamRef.set(newPosition.mediaItemIndex);
windowIndexFromGetterRef.set(controller.getCurrentWindowIndex());
mediaItemIndexFromParamRef.set(newPosition.mediaItemIndex);
mediaItemIndexFromGetterRef.set(controller.getCurrentMediaItemIndex());
latch.countDown();
}
};
threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
threadTestRule
.getHandler()
.postAndSync(() -> controller.seekTo(testWindowIndex, testPositionMs));
.postAndSync(() -> controller.seekTo(testMediaItemIndex, testPositionMs));
session.setPlaybackState(
new PlaybackStateCompat.Builder()
.setActiveQueueItemId(testQueue.get(testWindowIndex).getQueueId())
.setActiveQueueItemId(testQueue.get(testMediaItemIndex).getQueueId())
.build());
assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
assertThat(windowIndexFromParamRef.get()).isEqualTo(testWindowIndex);
assertThat(windowIndexFromGetterRef.get()).isEqualTo(testWindowIndex);
assertThat(mediaItemIndexFromParamRef.get()).isEqualTo(testMediaItemIndex);
assertThat(mediaItemIndexFromGetterRef.get()).isEqualTo(testMediaItemIndex);
}
@Test
@ -790,7 +791,7 @@ public class MediaControllerWithMediaSessionCompatTest {
}
@Test
public void getCurrentWindowIndex_withInvalidQueueIdWithMetadata_returnsEndOfList()
public void getCurrentMediaItemIndex_withInvalidQueueIdWithMetadata_returnsEndOfList()
throws Exception {
List<MediaItem> testList = MediaTestUtils.createMediaItems(3);
List<QueueItem> testQueue = MediaUtils.convertToQueueItemList(testList);
@ -801,8 +802,9 @@ public class MediaControllerWithMediaSessionCompatTest {
session.setMetadata(testMetadataCompat);
MediaController controller = controllerTestRule.createController(session.getSessionToken());
int windowIndex = threadTestRule.getHandler().postAndSync(controller::getCurrentWindowIndex);
assertThat(windowIndex).isEqualTo(testList.size());
int mediaItemIndex =
threadTestRule.getHandler().postAndSync(controller::getCurrentMediaItemIndex);
assertThat(mediaItemIndex).isEqualTo(testList.size());
}
@Test
@ -942,7 +944,8 @@ public class MediaControllerWithMediaSessionCompatTest {
session.setPlaybackState(builder.build());
assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
int currentIndex = threadTestRule.getHandler().postAndSync(controller::getCurrentWindowIndex);
int currentIndex =
threadTestRule.getHandler().postAndSync(controller::getCurrentMediaItemIndex);
assertThat(currentIndex).isEqualTo(newItemIndex);
MediaTestUtils.assertMediaIdEquals(testList.get(newItemIndex), itemRef.get());
assertThat(mediaItemTransitionReasonRef.get()).isEqualTo(MEDIA_ITEM_TRANSITION_REASON_AUTO);

4
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionAndControllerTest.java
View File

@ -93,9 +93,9 @@ public class MediaSessionAndControllerTest {
MainLooperTestRule.runOnMainSync(() -> player.notifyPlaybackStateChanged(state));
controller.seekTo(0);
MainLooperTestRule.runOnMainSync(() -> player.notifyPlaybackStateChanged(state));
controller.seekToNextWindow();
controller.seekToNextMediaItem();
MainLooperTestRule.runOnMainSync(() -> player.notifyPlaybackStateChanged(state));
controller.seekToPreviousWindow();
controller.seekToPreviousMediaItem();
}
});
}

8
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MockPlayerTest.java
View File

@ -295,14 +295,14 @@ public class MockPlayerTest {
}
@Test
public void seekToPreviousWindow() {
player.seekToPreviousWindow();
public void seekToPreviousMediaItem() {
player.seekToPreviousMediaItem();
assertThat(player.seekToPreviousMediaItemCalled).isTrue();
}
@Test
public void seekToNextWindow() {
player.seekToNextWindow();
public void seekToNextMediaItem() {
player.seekToNextMediaItem();
assertThat(player.seekToNextMediaItemCalled).isTrue();
}

61
libraries/test_utils/src/main/java/androidx/media3/test/utils/Action.java
View File

@ -123,7 +123,7 @@ public abstract class Action {
/** Calls {@link Player#seekTo(long)} or {@link Player#seekTo(int, long)}. */
public static final class Seek extends Action {
@Nullable private final Integer windowIndex;
@Nullable private final Integer mediaItemIndex;
private final long positionMs;
private final boolean catchIllegalSeekException;
@ -135,7 +135,7 @@ public abstract class Action {
*/
public Seek(String tag, long positionMs) {
super(tag, "Seek:" + positionMs);
this.windowIndex = null;
this.mediaItemIndex = null;
this.positionMs = positionMs;
catchIllegalSeekException = false;
}
@ -144,14 +144,15 @@ public abstract class Action {
* Action calls {@link Player#seekTo(int, long)}.
*
* @param tag A tag to use for logging.
* @param windowIndex The window to seek to.
* @param mediaItemIndex The media item to seek to.
* @param positionMs The seek position.
* @param catchIllegalSeekException Whether {@link IllegalSeekPositionException} should be
* silently caught or not.
*/
public Seek(String tag, int windowIndex, long positionMs, boolean catchIllegalSeekException) {
public Seek(
String tag, int mediaItemIndex, long positionMs, boolean catchIllegalSeekException) {
super(tag, "Seek:" + positionMs);
this.windowIndex = windowIndex;
this.mediaItemIndex = mediaItemIndex;
this.positionMs = positionMs;
this.catchIllegalSeekException = catchIllegalSeekException;
}
@ -160,10 +161,10 @@ public abstract class Action {
protected void doActionImpl(
ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) {
try {
if (windowIndex == null) {
if (mediaItemIndex == null) {
player.seekTo(positionMs);
} else {
player.seekTo(windowIndex, positionMs);
player.seekTo(mediaItemIndex, positionMs);
}
} catch (IllegalSeekPositionException e) {
if (!catchIllegalSeekException) {
@ -176,20 +177,20 @@ public abstract class Action {
/** Calls {@link ExoPlayer#setMediaSources(List, int, long)}. */
public static final class SetMediaItems extends Action {
private final int windowIndex;
private final int mediaItemIndex;
private final long positionMs;
private final MediaSource[] mediaSources;
/**
* @param tag A tag to use for logging.
* @param windowIndex The window index to start playback from.
* @param mediaItemIndex The media item index to start playback from.
* @param positionMs The position in milliseconds to start playback from.
* @param mediaSources The media sources to populate the playlist with.
*/
public SetMediaItems(
String tag, int windowIndex, long positionMs, MediaSource... mediaSources) {
String tag, int mediaItemIndex, long positionMs, MediaSource... mediaSources) {
super(tag, "SetMediaItems");
this.windowIndex = windowIndex;
this.mediaItemIndex = mediaItemIndex;
this.positionMs = positionMs;
this.mediaSources = mediaSources;
}
@ -197,7 +198,7 @@ public abstract class Action {
@Override
protected void doActionImpl(
ExoPlayer player, DefaultTrackSelector trackSelector, @Nullable Surface surface) {
player.setMediaSources(Arrays.asList(mediaSources), windowIndex, positionMs);
player.setMediaSources(Arrays.asList(mediaSources), mediaItemIndex, positionMs);
}
}
@ -555,7 +556,7 @@ public abstract class Action {
public static final class SendMessages extends Action {
private final Target target;
private final int windowIndex;
private final int mediaItemIndex;
private final long positionMs;
private final boolean deleteAfterDelivery;
@ -568,7 +569,7 @@ public abstract class Action {
this(
tag,
target,
/* windowIndex= */ C.INDEX_UNSET,
/* mediaItemIndex= */ C.INDEX_UNSET,
positionMs,
/* deleteAfterDelivery= */ true);
}
@ -576,16 +577,20 @@ public abstract class Action {
/**
* @param tag A tag to use for logging.
* @param target A message target.
* @param windowIndex The window index at which the message should be sent, or {@link
* C#INDEX_UNSET} for the current window.
* @param mediaItemIndex The media item index at which the message should be sent, or {@link
* C#INDEX_UNSET} for the current media item.
* @param positionMs The position at which the message should be sent, in milliseconds.
* @param deleteAfterDelivery Whether the message will be deleted after delivery.
*/
public SendMessages(
String tag, Target target, int windowIndex, long positionMs, boolean deleteAfterDelivery) {
String tag,
Target target,
int mediaItemIndex,
long positionMs,
boolean deleteAfterDelivery) {
super(tag, "SendMessages");
this.target = target;
this.windowIndex = windowIndex;
this.mediaItemIndex = mediaItemIndex;
this.positionMs = positionMs;
this.deleteAfterDelivery = deleteAfterDelivery;
}
@ -597,8 +602,8 @@ public abstract class Action {
((PlayerTarget) target).setPlayer(player);
}
PlayerMessage message = player.createMessage(target);
if (windowIndex != C.INDEX_UNSET) {
message.setPosition(windowIndex, positionMs);
if (mediaItemIndex != C.INDEX_UNSET) {
message.setPosition(mediaItemIndex, positionMs);
} else {
message.setPosition(positionMs);
}
@ -663,17 +668,17 @@ public abstract class Action {
*/
public static final class PlayUntilPosition extends Action {
private final int windowIndex;
private final int mediaItemIndex;
private final long positionMs;
/**
* @param tag A tag to use for logging.
* @param windowIndex The window index at which the player should be paused again.
* @param positionMs The position in that window at which the player should be paused again.
* @param mediaItemIndex The media item index at which the player should be paused again.
* @param positionMs The position in that media item at which the player should be paused again.
*/
public PlayUntilPosition(String tag, int windowIndex, long positionMs) {
super(tag, "PlayUntilPosition:" + windowIndex + ":" + positionMs);
this.windowIndex = windowIndex;
public PlayUntilPosition(String tag, int mediaItemIndex, long positionMs) {
super(tag, "PlayUntilPosition:" + mediaItemIndex + ":" + positionMs);
this.mediaItemIndex = mediaItemIndex;
this.positionMs = positionMs;
}
@ -706,7 +711,7 @@ public abstract class Action {
// Ignore.
}
})
.setPosition(windowIndex, positionMs)
.setPosition(mediaItemIndex, positionMs)
.send();
if (nextAction != null) {
// Schedule another message on this test thread to continue action schedule.
@ -714,7 +719,7 @@ public abstract class Action {
.createMessage(
(messageType, payload) ->
nextAction.schedule(player, trackSelector, surface, handler))
.setPosition(windowIndex, positionMs)
.setPosition(mediaItemIndex, positionMs)
.setLooper(applicationLooper)
.send();
}

67
libraries/test_utils/src/main/java/androidx/media3/test/utils/ActionSchedule.java
View File

@ -163,24 +163,25 @@ public final class ActionSchedule {
/**
* Schedules a seek action.
*
* @param windowIndex The window to seek to.
* @param mediaItemIndex The media item to seek to.
* @param positionMs The seek position.
* @return The builder, for convenience.
*/
public Builder seek(int windowIndex, long positionMs) {
return apply(new Seek(tag, windowIndex, positionMs, /* catchIllegalSeekException= */ false));
public Builder seek(int mediaItemIndex, long positionMs) {
return apply(
new Seek(tag, mediaItemIndex, positionMs, /* catchIllegalSeekException= */ false));
}
/**
* Schedules a seek action to be executed.
*
* @param windowIndex The window to seek to.
* @param mediaItemIndex The media item to seek to.
* @param positionMs The seek position.
* @param catchIllegalSeekException Whether an illegal seek position should be caught or not.
* @return The builder, for convenience.
*/
public Builder seek(int windowIndex, long positionMs, boolean catchIllegalSeekException) {
return apply(new Seek(tag, windowIndex, positionMs, catchIllegalSeekException));
public Builder seek(int mediaItemIndex, long positionMs, boolean catchIllegalSeekException) {
return apply(new Seek(tag, mediaItemIndex, positionMs, catchIllegalSeekException));
}
/**
@ -249,23 +250,23 @@ public final class ActionSchedule {
* Schedules a play action, waits until the player reaches the specified position, and pauses
* the player again.
*
* @param windowIndex The window index at which the player should be paused again.
* @param positionMs The position in that window at which the player should be paused again.
* @param mediaItemIndex The media item index at which the player should be paused again.
* @param positionMs The position in that media item at which the player should be paused again.
* @return The builder, for convenience.
*/
public Builder playUntilPosition(int windowIndex, long positionMs) {
return apply(new PlayUntilPosition(tag, windowIndex, positionMs));
public Builder playUntilPosition(int mediaItemIndex, long positionMs) {
return apply(new PlayUntilPosition(tag, mediaItemIndex, positionMs));
}
/**
* Schedules a play action, waits until the player reaches the start of the specified window,
* and pauses the player again.
* Schedules a play action, waits until the player reaches the start of the specified media
* item, and pauses the player again.
*
* @param windowIndex The window index at which the player should be paused again.
* @param mediaItemIndex The media item index at which the player should be paused again.
* @return The builder, for convenience.
*/
public Builder playUntilStartOfWindow(int windowIndex) {
return apply(new PlayUntilPosition(tag, windowIndex, /* positionMs= */ 0));
public Builder playUntilStartOfMediaItem(int mediaItemIndex) {
return apply(new PlayUntilPosition(tag, mediaItemIndex, /* positionMs= */ 0));
}
/**
@ -325,16 +326,16 @@ public final class ActionSchedule {
/**
* Schedules a set media items action to be executed.
*
* @param windowIndex The window index to start playback from or {@link C#INDEX_UNSET} if the
* playback position should not be reset.
* @param mediaItemIndex The media item index to start playback from or {@link C#INDEX_UNSET} if
* the playback position should not be reset.
* @param positionMs The position in milliseconds from where playback should start. If {@link
* C#TIME_UNSET} is passed the default position is used. In any case, if {@code windowIndex}
* is set to {@link C#INDEX_UNSET} the position is not reset at all and this parameter is
* ignored.
* C#TIME_UNSET} is passed the default position is used. In any case, if {@code
* mediaItemIndex} is set to {@link C#INDEX_UNSET} the position is not reset at all and this
* parameter is ignored.
* @return The builder, for convenience.
*/
public Builder setMediaSources(int windowIndex, long positionMs, MediaSource... sources) {
return apply(new Action.SetMediaItems(tag, windowIndex, positionMs, sources));
public Builder setMediaSources(int mediaItemIndex, long positionMs, MediaSource... sources) {
return apply(new Action.SetMediaItems(tag, mediaItemIndex, positionMs, sources));
}
/**
@ -356,7 +357,10 @@ public final class ActionSchedule {
public Builder setMediaSources(MediaSource... mediaSources) {
return apply(
new Action.SetMediaItems(
tag, /* windowIndex= */ C.INDEX_UNSET, /* positionMs= */ C.TIME_UNSET, mediaSources));
tag,
/* mediaItemIndex= */ C.INDEX_UNSET,
/* positionMs= */ C.TIME_UNSET,
mediaSources));
}
/**
* Schedules a add media items action to be executed.
@ -449,8 +453,8 @@ public final class ActionSchedule {
/**
* Schedules sending a {@link PlayerMessage}.
*
* @param positionMs The position in the current window at which the message should be sent, in
* milliseconds.
* @param positionMs The position in the current media item at which the message should be sent,
* in milliseconds.
* @return The builder, for convenience.
*/
public Builder sendMessage(Target target, long positionMs) {
@ -461,27 +465,28 @@ public final class ActionSchedule {
* Schedules sending a {@link PlayerMessage}.
*
* @param target A message target.
* @param windowIndex The window index at which the message should be sent.
* @param mediaItemIndex The media item index at which the message should be sent.
* @param positionMs The position at which the message should be sent, in milliseconds.
* @return The builder, for convenience.
*/
public Builder sendMessage(Target target, int windowIndex, long positionMs) {
public Builder sendMessage(Target target, int mediaItemIndex, long positionMs) {
return apply(
new SendMessages(tag, target, windowIndex, positionMs, /* deleteAfterDelivery= */ true));
new SendMessages(
tag, target, mediaItemIndex, positionMs, /* deleteAfterDelivery= */ true));
}
/**
* Schedules to send a {@link PlayerMessage}.
*
* @param target A message target.
* @param windowIndex The window index at which the message should be sent.
* @param mediaItemIndex The media item index at which the message should be sent.
* @param positionMs The position at which the message should be sent, in milliseconds.
* @param deleteAfterDelivery Whether the message will be deleted after delivery.
* @return The builder, for convenience.
*/
public Builder sendMessage(
Target target, int windowIndex, long positionMs, boolean deleteAfterDelivery) {
return apply(new SendMessages(tag, target, windowIndex, positionMs, deleteAfterDelivery));
Target target, int mediaItemIndex, long positionMs, boolean deleteAfterDelivery) {
return apply(new SendMessages(tag, target, mediaItemIndex, positionMs, deleteAfterDelivery));
}
/**

22
libraries/test_utils/src/main/java/androidx/media3/test/utils/ExoPlayerTestRunner.java
View File

@ -87,7 +87,7 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul
private AnalyticsListener analyticsListener;
private Integer expectedPlayerEndedCount;
private boolean pauseAtEndOfMediaItems;
private int initialWindowIndex;
private int initialMediaItemIndex;
private long initialPositionMs;
private boolean skipSettingMediaSources;
@ -95,7 +95,7 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul
testPlayerBuilder = new TestExoPlayerBuilder(context);
mediaSources = new ArrayList<>();
supportedFormats = new Format[] {VIDEO_FORMAT};
initialWindowIndex = C.INDEX_UNSET;
initialMediaItemIndex = C.INDEX_UNSET;
initialPositionMs = C.TIME_UNSET;
}
@ -135,12 +135,12 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul
/**
* Seeks before setting the media sources and preparing the player.
*
* @param windowIndex The window index to seek to.
* @param mediaItemIndex The media item index to seek to.
* @param positionMs The position in milliseconds to seek to.
* @return This builder.
*/
public Builder initialSeek(int windowIndex, long positionMs) {
this.initialWindowIndex = windowIndex;
public Builder initialSeek(int mediaItemIndex, long positionMs) {
this.initialMediaItemIndex = mediaItemIndex;
this.initialPositionMs = positionMs;
return this;
}
@ -345,7 +345,7 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul
testPlayerBuilder,
mediaSources,
skipSettingMediaSources,
initialWindowIndex,
initialMediaItemIndex,
initialPositionMs,
surface,
actionSchedule,
@ -359,7 +359,7 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul
private final TestExoPlayerBuilder playerBuilder;
private final List<MediaSource> mediaSources;
private final boolean skipSettingMediaSources;
private final int initialWindowIndex;
private final int initialMediaItemIndex;
private final long initialPositionMs;
@Nullable private final Surface surface;
@Nullable private final ActionSchedule actionSchedule;
@ -388,7 +388,7 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul
TestExoPlayerBuilder playerBuilder,
List<MediaSource> mediaSources,
boolean skipSettingMediaSources,
int initialWindowIndex,
int initialMediaItemIndex,
long initialPositionMs,
@Nullable Surface surface,
@Nullable ActionSchedule actionSchedule,
@ -399,7 +399,7 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul
this.playerBuilder = playerBuilder;
this.mediaSources = mediaSources;
this.skipSettingMediaSources = skipSettingMediaSources;
this.initialWindowIndex = initialWindowIndex;
this.initialMediaItemIndex = initialMediaItemIndex;
this.initialPositionMs = initialPositionMs;
this.surface = surface;
this.actionSchedule = actionSchedule;
@ -468,8 +468,8 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul
handler,
/* callback= */ ExoPlayerTestRunner.this);
}
if (initialWindowIndex != C.INDEX_UNSET) {
player.seekTo(initialWindowIndex, initialPositionMs);
if (initialMediaItemIndex != C.INDEX_UNSET) {
player.seekTo(initialMediaItemIndex, initialPositionMs);
}
if (!skipSettingMediaSources) {
player.setMediaSources(mediaSources, /* resetPosition= */ false);

2
libraries/test_utils/src/main/java/androidx/media3/test/utils/StubExoPlayer.java
View File

@ -164,7 +164,7 @@ public class StubExoPlayer extends StubPlayer implements ExoPlayer {
@Override
public void setMediaSources(
List<MediaSource> mediaSources, int startWindowIndex, long startPositionMs) {
List<MediaSource> mediaSources, int startMediaItemIndex, long startPositionMs) {
throw new UnsupportedOperationException();
}

17
libraries/test_utils_robolectric/src/main/java/androidx/media3/test/utils/robolectric/TestPlayerRunHelper.java
View File

@ -286,12 +286,12 @@ public class TestPlayerRunHelper {
* <p>If a playback error occurs it will be thrown wrapped in an {@link IllegalStateException}.
*
* @param player The {@link Player}.
* @param windowIndex The window.
* @param positionMs The position within the window, in milliseconds.
* @param mediaItemIndex The index of the media item.
* @param positionMs The position within the media item, in milliseconds.
* @throws TimeoutException If the {@link RobolectricUtil#DEFAULT_TIMEOUT_MS default timeout} is
* exceeded.
*/
public static void playUntilPosition(ExoPlayer player, int windowIndex, long positionMs)
public static void playUntilPosition(ExoPlayer player, int mediaItemIndex, long positionMs)
throws TimeoutException {
verifyMainTestThread(player);
Looper applicationLooper = Util.getCurrentOrMainLooper();
@ -317,7 +317,7 @@ public class TestPlayerRunHelper {
// Ignore.
}
})
.setPosition(windowIndex, positionMs)
.setPosition(mediaItemIndex, positionMs)
.send();
player.play();
runMainLooperUntil(() -> messageHandled.get() || player.getPlayerError() != null);
@ -328,18 +328,19 @@ public class TestPlayerRunHelper {
/**
* Calls {@link Player#play()}, runs tasks of the main {@link Looper} until the {@code player}
* reaches the specified window or a playback error occurs, and then pauses the {@code player}.
* reaches the specified media item or a playback error occurs, and then pauses the {@code
* player}.
*
* <p>If a playback error occurs it will be thrown wrapped in an {@link IllegalStateException}.
*
* @param player The {@link Player}.
* @param windowIndex The window.
* @param mediaItemIndex The index of the media item.
* @throws TimeoutException If the {@link RobolectricUtil#DEFAULT_TIMEOUT_MS default timeout} is
* exceeded.
*/
public static void playUntilStartOfWindow(ExoPlayer player, int windowIndex)
public static void playUntilStartOfMediaItem(ExoPlayer player, int mediaItemIndex)
throws TimeoutException {
playUntilPosition(player, windowIndex, /* positionMs= */ 0);
playUntilPosition(player, mediaItemIndex, /* positionMs= */ 0);
}
/**

6
libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java
View File

@ -952,7 +952,7 @@ public class PlayerControlView extends FrameLayout {
int adGroupCount = 0;
Timeline timeline = player.getCurrentTimeline();
if (!timeline.isEmpty()) {
int currentWindowIndex = player.getCurrentWindowIndex();
int currentWindowIndex = player.getCurrentMediaItemIndex();
int firstWindowIndex = multiWindowTimeBar ? 0 : currentWindowIndex;
int lastWindowIndex = multiWindowTimeBar ? timeline.getWindowCount() - 1 : currentWindowIndex;
for (int i = firstWindowIndex; i <= lastWindowIndex; i++) {
@ -1112,7 +1112,7 @@ public class PlayerControlView extends FrameLayout {
windowIndex++;
}
} else {
windowIndex = player.getCurrentWindowIndex();
windowIndex = player.getCurrentMediaItemIndex();
}
seekTo(player, windowIndex, positionMs);
updateProgress();
@ -1230,7 +1230,7 @@ public class PlayerControlView extends FrameLayout {
if (state == Player.STATE_IDLE) {
player.prepare();
} else if (state == Player.STATE_ENDED) {
seekTo(player, player.getCurrentWindowIndex(), C.TIME_UNSET);
seekTo(player, player.getCurrentMediaItemIndex(), C.TIME_UNSET);
}
player.play();
}

10
libraries/ui/src/main/java/androidx/media3/ui/PlayerNotificationManager.java
View File

@ -607,9 +607,9 @@ public class PlayerNotificationManager {
public static final String ACTION_PLAY = "androidx.media3.ui.notification.play";
/** The action which pauses playback. */
public static final String ACTION_PAUSE = "androidx.media3.ui.notification.pause";
/** The action which skips to the previous window. */
/** The action which skips to the previous media item. */
public static final String ACTION_PREVIOUS = "androidx.media3.ui.notification.prev";
/** The action which skips to the next window. */
/** The action which skips to the next media item. */
public static final String ACTION_NEXT = "androidx.media3.ui.notification.next";
/** The action which fast forwards. */
public static final String ACTION_FAST_FORWARD = "androidx.media3.ui.notification.ffwd";
@ -1097,7 +1097,7 @@ public class PlayerNotificationManager {
*
* <ul>
* <li>The media is {@link Player#isPlaying() actively playing}.
* <li>The media is not {@link Player#isCurrentWindowDynamic() dynamically changing its
* <li>The media is not {@link Player#isCurrentMediaItemDynamic() dynamically changing its
* duration} (like for example a live stream).
* <li>The media is not {@link Player#isPlayingAd() interrupted by an ad}.
* <li>The media is played at {@link Player#getPlaybackParameters() regular speed}.
@ -1255,7 +1255,7 @@ public class PlayerNotificationManager {
&& useChronometer
&& player.isPlaying()
&& !player.isPlayingAd()
&& !player.isCurrentWindowDynamic()
&& !player.isCurrentMediaItemDynamic()
&& player.getPlaybackParameters().speed == 1f) {
builder
.setWhen(System.currentTimeMillis() - player.getContentPosition())
@ -1533,7 +1533,7 @@ public class PlayerNotificationManager {
if (player.getPlaybackState() == Player.STATE_IDLE) {
player.prepare();
} else if (player.getPlaybackState() == Player.STATE_ENDED) {
player.seekToDefaultPosition(player.getCurrentWindowIndex());
player.seekToDefaultPosition(player.getCurrentMediaItemIndex());
}
player.play();
} else if (ACTION_PAUSE.equals(action)) {

4
libraries/ui/src/main/java/androidx/media3/ui/PlayerView.java
View File

@ -1504,8 +1504,8 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
if (lastPeriodIndexWithTracks != C.INDEX_UNSET) {
int lastWindowIndexWithTracks =
timeline.getPeriod(lastPeriodIndexWithTracks, period).windowIndex;
if (player.getCurrentWindowIndex() == lastWindowIndexWithTracks) {
// We're in the same window. Suppress the update.
if (player.getCurrentMediaItemIndex() == lastWindowIndexWithTracks) {
// We're in the same media item. Suppress the update.
return;
}
}

7
libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerControlView.java
View File

@ -1271,7 +1271,7 @@ public class StyledPlayerControlView extends FrameLayout {
int adGroupCount = 0;
Timeline timeline = player.getCurrentTimeline();
if (!timeline.isEmpty()) {
int currentWindowIndex = player.getCurrentWindowIndex();
int currentWindowIndex = player.getCurrentMediaItemIndex();
int firstWindowIndex = multiWindowTimeBar ? 0 : currentWindowIndex;
int lastWindowIndex = multiWindowTimeBar ? timeline.getWindowCount() - 1 : currentWindowIndex;
for (int i = firstWindowIndex; i <= lastWindowIndex; i++) {
@ -1455,7 +1455,7 @@ public class StyledPlayerControlView extends FrameLayout {
windowIndex++;
}
} else {
windowIndex = player.getCurrentWindowIndex();
windowIndex = player.getCurrentMediaItemIndex();
}
seekTo(player, windowIndex, positionMs);
updateProgress();
@ -1618,13 +1618,12 @@ public class StyledPlayerControlView extends FrameLayout {
}
}
@SuppressWarnings("deprecation")
private void dispatchPlay(Player player) {
@State int state = player.getPlaybackState();
if (state == Player.STATE_IDLE) {
player.prepare();
} else if (state == Player.STATE_ENDED) {
seekTo(player, player.getCurrentWindowIndex(), C.TIME_UNSET);
seekTo(player, player.getCurrentMediaItemIndex(), C.TIME_UNSET);
}
player.play();
}

4
libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerView.java
View File

@ -1543,8 +1543,8 @@ public class StyledPlayerView extends FrameLayout implements AdViewProvider {
if (lastPeriodIndexWithTracks != C.INDEX_UNSET) {
int lastWindowIndexWithTracks =
timeline.getPeriod(lastPeriodIndexWithTracks, period).windowIndex;
if (player.getCurrentWindowIndex() == lastWindowIndexWithTracks) {
// We're in the same window. Suppress the update.
if (player.getCurrentMediaItemIndex() == lastWindowIndexWithTracks) {
// We're in the same media item. Suppress the update.
return;
}
}

2
libraries/ui_leanback/src/main/java/androidx/media3/ui/leanback/LeanbackPlayerAdapter.java
View File

@ -143,7 +143,7 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
if (player.getPlaybackState() == Player.STATE_IDLE) {
player.prepare();
} else if (player.getPlaybackState() == Player.STATE_ENDED) {
player.seekToDefaultPosition(player.getCurrentWindowIndex());
player.seekToDefaultPosition(player.getCurrentMediaItemIndex());
}
if (player.isCommandAvailable(Player.COMMAND_PLAY_PAUSE)) {
player.play();