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

Split media1/media3 conversion methods out of MediaUtils

Browse Source 
Android Studio removed some nested imports, but I think the extra
qualification at the usage site is actually mostly helpful, so I'm
leaving it as-is.

PiperOrigin-RevId: 578518880
This commit is contained in:
ibaker 2023-11-01 08:02:33 -07:00 committed by Copybara-Service
parent 27caeb8038
commit 72b7019578
20 changed files with 2564 additions and 2450 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1366
libraries/session/src/main/java/androidx/media3/session/LegacyConversions.java Normal file
View File

File diff suppressed because it is too large Load Diff

15
libraries/session/src/main/java/androidx/media3/session/MediaBrowserImplLegacy.java
View File

@ -100,7 +100,7 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
// Already connected with the given extras. // Already connected with the given extras.
result.set(LibraryResult.ofItem(createRootMediaItem(browserCompat), null)); result.set(LibraryResult.ofItem(createRootMediaItem(browserCompat), null));
} else { } else {
Bundle rootHints = MediaUtils.convertToRootHints(params); Bundle rootHints = LegacyConversions.convertToRootHints(params);
MediaBrowserCompat newBrowser = MediaBrowserCompat newBrowser =
new MediaBrowserCompat( new MediaBrowserCompat(
getContext(), getContext(),
@ -193,7 +193,8 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
public void onItemLoaded(MediaBrowserCompat.MediaItem item) { public void onItemLoaded(MediaBrowserCompat.MediaItem item) {
if (item != null) { if (item != null) {
result.set( result.set(
LibraryResult.ofItem(MediaUtils.convertToMediaItem(item), /* params= */ null)); LibraryResult.ofItem(
LegacyConversions.convertToMediaItem(item), /* params= */ null));
} else { } else {
result.set(LibraryResult.ofError(RESULT_ERROR_BAD_VALUE)); result.set(LibraryResult.ofError(RESULT_ERROR_BAD_VALUE));
} }
@ -278,7 +279,8 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
String query, Bundle extrasSent, List<MediaBrowserCompat.MediaItem> items) { String query, Bundle extrasSent, List<MediaBrowserCompat.MediaItem> items) {
future.set( future.set(
LibraryResult.ofItemList( LibraryResult.ofItemList(
MediaUtils.convertBrowserItemListToMediaItemList(items), /* params= */ null)); LegacyConversions.convertBrowserItemListToMediaItemList(items),
/* params= */ null));
} }
@Override @Override
@ -342,7 +344,7 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
result.set( result.set(
LibraryResult.ofItem( LibraryResult.ofItem(
createRootMediaItem(browserCompat), createRootMediaItem(browserCompat),
MediaUtils.convertToLibraryParams(context, browserCompat.getExtras()))); LegacyConversions.convertToLibraryParams(context, browserCompat.getExtras())));
} }
} }
@ -414,7 +416,7 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
} }
LibraryParams params = LibraryParams params =
MediaUtils.convertToLibraryParams( LegacyConversions.convertToLibraryParams(
context, browserCompat.getNotifyChildrenChangedOptions()); context, browserCompat.getNotifyChildrenChangedOptions());
getInstance() getInstance()
.notifyBrowserListener( .notifyBrowserListener(
@ -486,7 +488,8 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
// - New API: Extra from MediaLibraryService to MediaBrowser // - New API: Extra from MediaLibraryService to MediaBrowser
future.set( future.set(
LibraryResult.ofItemList( LibraryResult.ofItemList(
MediaUtils.convertBrowserItemListToMediaItemList(children), /* params= */ null)); LegacyConversions.convertBrowserItemListToMediaItemList(children),
/* params= */ null));
} }
} }
} }

6
libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java
View File

@ -314,7 +314,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
ListenableFuture<SessionResult> future = ListenableFuture<SessionResult> future =
dispatchRemoteSessionTask(iSession, task, /* addToPendingMaskingOperations= */ true); dispatchRemoteSessionTask(iSession, task, /* addToPendingMaskingOperations= */ true);
try { try {
MediaUtils.getFutureResult(future, /* timeoutMs= */ 3_000); LegacyConversions.getFutureResult(future, /* timeoutMs= */ 3_000);
} catch (ExecutionException e) { } catch (ExecutionException e) {
// Never happens because future.setException will not be called. // Never happens because future.setException will not be called.
throw new IllegalStateException(e); throw new IllegalStateException(e);
@ -1937,8 +1937,8 @@ import org.checkerframework.checker.nullness.qual.NonNull;
List<Window> windows = new ArrayList<>(); List<Window> windows = new ArrayList<>();
List<Period> periods = new ArrayList<>(); List<Period> periods = new ArrayList<>();
for (int i = 0; i < mediaItems.size(); i++) { for (int i = 0; i < mediaItems.size(); i++) {
windows.add(MediaUtils.convertToWindow(mediaItems.get(i), i)); windows.add(LegacyConversions.convertToWindow(mediaItems.get(i), i));
periods.add(MediaUtils.convertToPeriod(i)); periods.add(LegacyConversions.convertToPeriod(i));
} }
Timeline newTimeline = createMaskingTimeline(windows, periods); Timeline newTimeline = createMaskingTimeline(windows, periods);

81
libraries/session/src/main/java/androidx/media3/session/MediaControllerImplLegacy.java
View File

@ -503,14 +503,18 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
String currentMediaItemMediaId = String currentMediaItemMediaId =
legacyPlayerInfo.mediaMetadataCompat.getString(MediaMetadataCompat.METADATA_KEY_MEDIA_ID); legacyPlayerInfo.mediaMetadataCompat.getString(MediaMetadataCompat.METADATA_KEY_MEDIA_ID);
if (mediaId.equals(currentMediaItemMediaId)) { if (mediaId.equals(currentMediaItemMediaId)) {
controllerCompat.getTransportControls().setRating(MediaUtils.convertToRatingCompat(rating)); controllerCompat
.getTransportControls()
.setRating(LegacyConversions.convertToRatingCompat(rating));
} }
return Futures.immediateFuture(new SessionResult(SessionResult.RESULT_SUCCESS)); return Futures.immediateFuture(new SessionResult(SessionResult.RESULT_SUCCESS));
} }
@Override @Override
public ListenableFuture<SessionResult> setRating(Rating rating) { public ListenableFuture<SessionResult> setRating(Rating rating) {
controllerCompat.getTransportControls().setRating(MediaUtils.convertToRatingCompat(rating)); controllerCompat
.getTransportControls()
.setRating(LegacyConversions.convertToRatingCompat(rating));
return Futures.immediateFuture(new SessionResult(SessionResult.RESULT_SUCCESS)); return Futures.immediateFuture(new SessionResult(SessionResult.RESULT_SUCCESS));
} }
@ -936,7 +940,7 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
controllerCompat controllerCompat
.getTransportControls() .getTransportControls()
.setRepeatMode(MediaUtils.convertToPlaybackStateCompatRepeatMode(repeatMode)); .setRepeatMode(LegacyConversions.convertToPlaybackStateCompatRepeatMode(repeatMode));
} }
@Override @Override
@ -962,7 +966,8 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
controllerCompat controllerCompat
.getTransportControls() .getTransportControls()
.setShuffleMode(MediaUtils.convertToPlaybackStateCompatShuffleMode(shuffleModeEnabled)); .setShuffleMode(
LegacyConversions.convertToPlaybackStateCompatShuffleMode(shuffleModeEnabled));
} }
@Override @Override
@ -1469,7 +1474,7 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
} }
} }
controllerCompat.addQueueItem( controllerCompat.addQueueItem(
MediaUtils.convertToMediaDescriptionCompat(mediaItems.get(i), bitmap), LegacyConversions.convertToMediaDescriptionCompat(mediaItems.get(i), bitmap),
/* index= */ startIndex + i); /* index= */ startIndex + i);
} }
} }
@ -1584,7 +1589,7 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
if (!MediaUtils.areEqualError( if (!MediaUtils.areEqualError(
oldLegacyPlayerInfo.playbackStateCompat, newLegacyPlayerInfo.playbackStateCompat)) { oldLegacyPlayerInfo.playbackStateCompat, newLegacyPlayerInfo.playbackStateCompat)) {
PlaybackException error = PlaybackException error =
MediaUtils.convertToPlaybackException(newLegacyPlayerInfo.playbackStateCompat); LegacyConversions.convertToPlaybackException(newLegacyPlayerInfo.playbackStateCompat);
listeners.queueEvent( listeners.queueEvent(
Player.EVENT_PLAYER_ERROR, (listener) -> listener.onPlayerErrorChanged(error)); Player.EVENT_PLAYER_ERROR, (listener) -> listener.onPlayerErrorChanged(error));
if (error != null) { if (error != null) {
@ -1899,18 +1904,20 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
long oldActiveQueueId = getActiveQueueId(oldLegacyPlayerInfo.playbackStateCompat); long oldActiveQueueId = getActiveQueueId(oldLegacyPlayerInfo.playbackStateCompat);
long newActiveQueueId = getActiveQueueId(newLegacyPlayerInfo.playbackStateCompat); long newActiveQueueId = getActiveQueueId(newLegacyPlayerInfo.playbackStateCompat);
boolean isCurrentActiveQueueIdChanged = (oldActiveQueueId != newActiveQueueId) || initialUpdate; boolean isCurrentActiveQueueIdChanged = (oldActiveQueueId != newActiveQueueId) || initialUpdate;
long durationMs = MediaUtils.convertToDurationMs(newLegacyPlayerInfo.mediaMetadataCompat); long durationMs =
LegacyConversions.convertToDurationMs(newLegacyPlayerInfo.mediaMetadataCompat);
if (isMetadataCompatChanged || isCurrentActiveQueueIdChanged || isQueueChanged) { if (isMetadataCompatChanged || isCurrentActiveQueueIdChanged || isQueueChanged) {
currentMediaItemIndex = findQueueItemIndex(newLegacyPlayerInfo.queue, newActiveQueueId); currentMediaItemIndex = findQueueItemIndex(newLegacyPlayerInfo.queue, newActiveQueueId);
boolean hasMediaMetadataCompat = newLegacyPlayerInfo.mediaMetadataCompat != null; boolean hasMediaMetadataCompat = newLegacyPlayerInfo.mediaMetadataCompat != null;
if (hasMediaMetadataCompat && isMetadataCompatChanged) { if (hasMediaMetadataCompat && isMetadataCompatChanged) {
mediaMetadata = mediaMetadata =
MediaUtils.convertToMediaMetadata(newLegacyPlayerInfo.mediaMetadataCompat, ratingType); LegacyConversions.convertToMediaMetadata(
newLegacyPlayerInfo.mediaMetadataCompat, ratingType);
} else if (!hasMediaMetadataCompat && isCurrentActiveQueueIdChanged) { } else if (!hasMediaMetadataCompat && isCurrentActiveQueueIdChanged) {
mediaMetadata = mediaMetadata =
(currentMediaItemIndex == C.INDEX_UNSET) (currentMediaItemIndex == C.INDEX_UNSET)
? MediaMetadata.EMPTY ? MediaMetadata.EMPTY
: MediaUtils.convertToMediaMetadata( : LegacyConversions.convertToMediaMetadata(
newLegacyPlayerInfo.queue.get(currentMediaItemIndex).getDescription(), newLegacyPlayerInfo.queue.get(currentMediaItemIndex).getDescription(),
ratingType); ratingType);
} else { } else {
@ -1924,7 +1931,8 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
+ " the active queue id and current Timeline should have currently playing" + " the active queue id and current Timeline should have currently playing"
+ " MediaItem."); + " MediaItem.");
MediaItem fakeMediaItem = MediaItem fakeMediaItem =
MediaUtils.convertToMediaItem(newLegacyPlayerInfo.mediaMetadataCompat, ratingType); LegacyConversions.convertToMediaItem(
newLegacyPlayerInfo.mediaMetadataCompat, ratingType);
currentTimeline = currentTimeline.copyWithFakeMediaItem(fakeMediaItem, durationMs); currentTimeline = currentTimeline.copyWithFakeMediaItem(fakeMediaItem, durationMs);
currentMediaItemIndex = currentTimeline.getWindowCount() - 1; currentMediaItemIndex = currentTimeline.getWindowCount() - 1;
} else { } else {
@ -1938,7 +1946,7 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
currentTimeline = currentTimeline.copyWithClearedFakeMediaItem(); currentTimeline = currentTimeline.copyWithClearedFakeMediaItem();
if (hasMediaMetadataCompat) { if (hasMediaMetadataCompat) {
MediaItem mediaItem = MediaItem mediaItem =
MediaUtils.convertToMediaItem( LegacyConversions.convertToMediaItem(
checkNotNull(currentTimeline.getMediaItemAt(currentMediaItemIndex)).mediaId, checkNotNull(currentTimeline.getMediaItemAt(currentMediaItemIndex)).mediaId,
newLegacyPlayerInfo.mediaMetadataCompat, newLegacyPlayerInfo.mediaMetadataCompat,
ratingType); ratingType);
@ -1960,14 +1968,16 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
playlistMetadata = playlistMetadata =
oldLegacyPlayerInfo.queueTitle == newLegacyPlayerInfo.queueTitle oldLegacyPlayerInfo.queueTitle == newLegacyPlayerInfo.queueTitle
? oldControllerInfo.playerInfo.playlistMetadata ? oldControllerInfo.playerInfo.playlistMetadata
: MediaUtils.convertToMediaMetadata(newLegacyPlayerInfo.queueTitle); : LegacyConversions.convertToMediaMetadata(newLegacyPlayerInfo.queueTitle);
repeatMode = MediaUtils.convertToRepeatMode(newLegacyPlayerInfo.repeatMode); repeatMode = LegacyConversions.convertToRepeatMode(newLegacyPlayerInfo.repeatMode);
shuffleModeEnabled = MediaUtils.convertToShuffleModeEnabled(newLegacyPlayerInfo.shuffleMode); shuffleModeEnabled =
LegacyConversions.convertToShuffleModeEnabled(newLegacyPlayerInfo.shuffleMode);
if (oldLegacyPlayerInfo.playbackStateCompat != newLegacyPlayerInfo.playbackStateCompat) { if (oldLegacyPlayerInfo.playbackStateCompat != newLegacyPlayerInfo.playbackStateCompat) {
availableSessionCommands = availableSessionCommands =
MediaUtils.convertToSessionCommands( LegacyConversions.convertToSessionCommands(
newLegacyPlayerInfo.playbackStateCompat, isSessionReady); newLegacyPlayerInfo.playbackStateCompat, isSessionReady);
customLayout = MediaUtils.convertToCustomLayout(newLegacyPlayerInfo.playbackStateCompat); customLayout =
LegacyConversions.convertToCustomLayout(newLegacyPlayerInfo.playbackStateCompat);
} else { } else {
availableSessionCommands = oldControllerInfo.availableSessionCommands; availableSessionCommands = oldControllerInfo.availableSessionCommands;
customLayout = oldControllerInfo.customLayout; customLayout = oldControllerInfo.customLayout;
@ -1980,53 +1990,58 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
? newLegacyPlayerInfo.playbackInfoCompat.getVolumeControl() ? newLegacyPlayerInfo.playbackInfoCompat.getVolumeControl()
: VolumeProviderCompat.VOLUME_CONTROL_FIXED; : VolumeProviderCompat.VOLUME_CONTROL_FIXED;
availablePlayerCommands = availablePlayerCommands =
MediaUtils.convertToPlayerCommands( LegacyConversions.convertToPlayerCommands(
newLegacyPlayerInfo.playbackStateCompat, newLegacyPlayerInfo.playbackStateCompat,
volumeControlType, volumeControlType,
sessionFlags, sessionFlags,
isSessionReady); isSessionReady);
PlaybackException playerError = PlaybackException playerError =
MediaUtils.convertToPlaybackException(newLegacyPlayerInfo.playbackStateCompat); LegacyConversions.convertToPlaybackException(newLegacyPlayerInfo.playbackStateCompat);
long currentPositionMs = long currentPositionMs =
MediaUtils.convertToCurrentPositionMs( LegacyConversions.convertToCurrentPositionMs(
newLegacyPlayerInfo.playbackStateCompat, newLegacyPlayerInfo.playbackStateCompat,
newLegacyPlayerInfo.mediaMetadataCompat, newLegacyPlayerInfo.mediaMetadataCompat,
timeDiffMs); timeDiffMs);
long bufferedPositionMs = long bufferedPositionMs =
MediaUtils.convertToBufferedPositionMs( LegacyConversions.convertToBufferedPositionMs(
newLegacyPlayerInfo.playbackStateCompat, newLegacyPlayerInfo.playbackStateCompat,
newLegacyPlayerInfo.mediaMetadataCompat, newLegacyPlayerInfo.mediaMetadataCompat,
timeDiffMs); timeDiffMs);
int bufferedPercentage = int bufferedPercentage =
MediaUtils.convertToBufferedPercentage( LegacyConversions.convertToBufferedPercentage(
newLegacyPlayerInfo.playbackStateCompat, newLegacyPlayerInfo.playbackStateCompat,
newLegacyPlayerInfo.mediaMetadataCompat, newLegacyPlayerInfo.mediaMetadataCompat,
timeDiffMs); timeDiffMs);
long totalBufferedDurationMs = long totalBufferedDurationMs =
MediaUtils.convertToTotalBufferedDurationMs( LegacyConversions.convertToTotalBufferedDurationMs(
newLegacyPlayerInfo.playbackStateCompat, newLegacyPlayerInfo.playbackStateCompat,
newLegacyPlayerInfo.mediaMetadataCompat, newLegacyPlayerInfo.mediaMetadataCompat,
timeDiffMs); timeDiffMs);
boolean isPlayingAd = MediaUtils.convertToIsPlayingAd(newLegacyPlayerInfo.mediaMetadataCompat); boolean isPlayingAd =
LegacyConversions.convertToIsPlayingAd(newLegacyPlayerInfo.mediaMetadataCompat);
PlaybackParameters playbackParameters = PlaybackParameters playbackParameters =
MediaUtils.convertToPlaybackParameters(newLegacyPlayerInfo.playbackStateCompat); LegacyConversions.convertToPlaybackParameters(newLegacyPlayerInfo.playbackStateCompat);
AudioAttributes audioAttributes = AudioAttributes audioAttributes =
MediaUtils.convertToAudioAttributes(newLegacyPlayerInfo.playbackInfoCompat); LegacyConversions.convertToAudioAttributes(newLegacyPlayerInfo.playbackInfoCompat);
boolean playWhenReady = boolean playWhenReady =
MediaUtils.convertToPlayWhenReady(newLegacyPlayerInfo.playbackStateCompat); LegacyConversions.convertToPlayWhenReady(newLegacyPlayerInfo.playbackStateCompat);
@Player.State @Player.State
int playbackState = int playbackState =
MediaUtils.convertToPlaybackState( LegacyConversions.convertToPlaybackState(
newLegacyPlayerInfo.playbackStateCompat, newLegacyPlayerInfo.playbackStateCompat,
newLegacyPlayerInfo.mediaMetadataCompat, newLegacyPlayerInfo.mediaMetadataCompat,
timeDiffMs); timeDiffMs);
boolean isPlaying = MediaUtils.convertToIsPlaying(newLegacyPlayerInfo.playbackStateCompat); boolean isPlaying =
LegacyConversions.convertToIsPlaying(newLegacyPlayerInfo.playbackStateCompat);
DeviceInfo deviceInfo = DeviceInfo deviceInfo =
MediaUtils.convertToDeviceInfo(newLegacyPlayerInfo.playbackInfoCompat, routingControllerId); LegacyConversions.convertToDeviceInfo(
int deviceVolume = MediaUtils.convertToDeviceVolume(newLegacyPlayerInfo.playbackInfoCompat); newLegacyPlayerInfo.playbackInfoCompat, routingControllerId);
boolean deviceMuted = MediaUtils.convertToIsDeviceMuted(newLegacyPlayerInfo.playbackInfoCompat); int deviceVolume =
LegacyConversions.convertToDeviceVolume(newLegacyPlayerInfo.playbackInfoCompat);
boolean deviceMuted =
LegacyConversions.convertToIsDeviceMuted(newLegacyPlayerInfo.playbackInfoCompat);
long seekBackIncrementMs = oldControllerInfo.playerInfo.seekBackIncrementMs; long seekBackIncrementMs = oldControllerInfo.playerInfo.seekBackIncrementMs;
long seekForwardIncrementMs = oldControllerInfo.playerInfo.seekForwardIncrementMs; long seekForwardIncrementMs = oldControllerInfo.playerInfo.seekForwardIncrementMs;
@ -2100,12 +2115,12 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
} else if (oldCurrentMediaItem.equals(newControllerInfo.playerInfo.getCurrentMediaItem())) { } else if (oldCurrentMediaItem.equals(newControllerInfo.playerInfo.getCurrentMediaItem())) {
// Current item is the same. // Current item is the same.
long oldCurrentPosition = long oldCurrentPosition =
MediaUtils.convertToCurrentPositionMs( LegacyConversions.convertToCurrentPositionMs(
oldLegacyPlayerInfo.playbackStateCompat, oldLegacyPlayerInfo.playbackStateCompat,
oldLegacyPlayerInfo.mediaMetadataCompat, oldLegacyPlayerInfo.mediaMetadataCompat,
timeDiffMs); timeDiffMs);
long newCurrentPosition = long newCurrentPosition =
MediaUtils.convertToCurrentPositionMs( LegacyConversions.convertToCurrentPositionMs(
newLegacyPlayerInfo.playbackStateCompat, newLegacyPlayerInfo.playbackStateCompat,
newLegacyPlayerInfo.mediaMetadataCompat, newLegacyPlayerInfo.mediaMetadataCompat,
timeDiffMs); timeDiffMs);

22
libraries/session/src/main/java/androidx/media3/session/MediaLibraryServiceLegacyStub.java
View File

@ -98,7 +98,7 @@ import java.util.concurrent.atomic.AtomicReference;
} }
@Nullable @Nullable
LibraryParams params = LibraryParams params =
MediaUtils.convertToLibraryParams(librarySessionImpl.getContext(), rootHints); LegacyConversions.convertToLibraryParams(librarySessionImpl.getContext(), rootHints);
AtomicReference<ListenableFuture<LibraryResult<MediaItem>>> futureReference = AtomicReference<ListenableFuture<LibraryResult<MediaItem>>> futureReference =
new AtomicReference<>(); new AtomicReference<>();
ConditionVariable haveFuture = new ConditionVariable(); ConditionVariable haveFuture = new ConditionVariable();
@ -118,7 +118,9 @@ import java.util.concurrent.atomic.AtomicReference;
if (result != null && result.resultCode == RESULT_SUCCESS && result.value != null) { if (result != null && result.resultCode == RESULT_SUCCESS && result.value != null) {
@Nullable @Nullable
Bundle extras = Bundle extras =
result.params != null ? MediaUtils.convertToRootHints(result.params) : new Bundle(); result.params != null
? LegacyConversions.convertToRootHints(result.params)
: new Bundle();
boolean isSearchSessionCommandAvailable = boolean isSearchSessionCommandAvailable =
getConnectedControllersManager() getConnectedControllersManager()
.isSessionCommandAvailable(controller, SessionCommand.COMMAND_CODE_LIBRARY_SEARCH); .isSessionCommandAvailable(controller, SessionCommand.COMMAND_CODE_LIBRARY_SEARCH);
@ -157,7 +159,7 @@ import java.util.concurrent.atomic.AtomicReference;
} }
@Nullable @Nullable
LibraryParams params = LibraryParams params =
MediaUtils.convertToLibraryParams(librarySessionImpl.getContext(), option); LegacyConversions.convertToLibraryParams(librarySessionImpl.getContext(), option);
ignoreFuture(librarySessionImpl.onSubscribeOnHandler(controller, id, params)); ignoreFuture(librarySessionImpl.onSubscribeOnHandler(controller, id, params));
}); });
} }
@ -224,7 +226,8 @@ import java.util.concurrent.atomic.AtomicReference;
// Requesting the list of children through pagination. // Requesting the list of children through pagination.
@Nullable @Nullable
LibraryParams params = LibraryParams params =
MediaUtils.convertToLibraryParams(librarySessionImpl.getContext(), options); LegacyConversions.convertToLibraryParams(
librarySessionImpl.getContext(), options);
ListenableFuture<LibraryResult<ImmutableList<MediaItem>>> future = ListenableFuture<LibraryResult<ImmutableList<MediaItem>>> future =
librarySessionImpl.onGetChildrenOnHandler( librarySessionImpl.onGetChildrenOnHandler(
controller, parentId, page, pageSize, params); controller, parentId, page, pageSize, params);
@ -315,7 +318,7 @@ import java.util.concurrent.atomic.AtomicReference;
cb.registerSearchRequest(controller, query, extras, result); cb.registerSearchRequest(controller, query, extras, result);
@Nullable @Nullable
LibraryParams params = LibraryParams params =
MediaUtils.convertToLibraryParams(librarySessionImpl.getContext(), extras); LegacyConversions.convertToLibraryParams(librarySessionImpl.getContext(), extras);
ignoreFuture(librarySessionImpl.onSearchOnHandler(controller, query, params)); ignoreFuture(librarySessionImpl.onSearchOnHandler(controller, query, params));
// Actual search result will be sent by notifySearchResultChanged(). // Actual search result will be sent by notifySearchResultChanged().
}); });
@ -483,7 +486,7 @@ import java.util.concurrent.atomic.AtomicReference;
Log.d(TAG, "Failed to get bitmap", e); Log.d(TAG, "Failed to get bitmap", e);
} }
} }
outputMediaItems.add(MediaUtils.convertToBrowserItem(mediaItems.get(i), bitmap)); outputMediaItems.add(LegacyConversions.convertToBrowserItem(mediaItems.get(i), bitmap));
} }
outputFuture.set(outputMediaItems); outputFuture.set(outputMediaItems);
} }
@ -510,7 +513,8 @@ import java.util.concurrent.atomic.AtomicReference;
MediaItem mediaItem = result.value; MediaItem mediaItem = result.value;
MediaMetadata metadata = mediaItem.mediaMetadata; MediaMetadata metadata = mediaItem.mediaMetadata;
if (metadata.artworkData == null) { if (metadata.artworkData == null) {
outputFuture.set(MediaUtils.convertToBrowserItem(mediaItem, /* artworkBitmap= */ null)); outputFuture.set(
LegacyConversions.convertToBrowserItem(mediaItem, /* artworkBitmap= */ null));
return outputFuture; return outputFuture;
} }
@ -531,7 +535,7 @@ import java.util.concurrent.atomic.AtomicReference;
} catch (CancellationException | ExecutionException e) { } catch (CancellationException | ExecutionException e) {
Log.d(TAG, "failed to get bitmap", e); Log.d(TAG, "failed to get bitmap", e);
} }
outputFuture.set(MediaUtils.convertToBrowserItem(mediaItem, bitmap)); outputFuture.set(LegacyConversions.convertToBrowserItem(mediaItem, bitmap));
}, },
MoreExecutors.directExecutor()); MoreExecutors.directExecutor());
return outputFuture; return outputFuture;
@ -634,7 +638,7 @@ import java.util.concurrent.atomic.AtomicReference;
} }
@Nullable @Nullable
LibraryParams libraryParams = LibraryParams libraryParams =
MediaUtils.convertToLibraryParams( LegacyConversions.convertToLibraryParams(
librarySessionImpl.getContext(), request.extras); librarySessionImpl.getContext(), request.extras);
ListenableFuture<LibraryResult<ImmutableList<MediaItem>>> future = ListenableFuture<LibraryResult<ImmutableList<MediaItem>>> future =
librarySessionImpl.onGetSearchResultOnHandler( librarySessionImpl.onGetSearchResultOnHandler(

28
libraries/session/src/main/java/androidx/media3/session/MediaSessionLegacyStub.java
View File

@ -504,7 +504,7 @@ import org.checkerframework.checker.initialization.qual.Initialized;
@Override @Override
public void onSetRating(RatingCompat ratingCompat, @Nullable Bundle unusedExtras) { public void onSetRating(RatingCompat ratingCompat, @Nullable Bundle unusedExtras) {
@Nullable Rating rating = MediaUtils.convertToRating(ratingCompat); @Nullable Rating rating = LegacyConversions.convertToRating(ratingCompat);
if (rating == null) { if (rating == null) {
Log.w(TAG, "Ignoring invalid RatingCompat " + ratingCompat); Log.w(TAG, "Ignoring invalid RatingCompat " + ratingCompat);
return; return;
@ -535,7 +535,8 @@ import org.checkerframework.checker.initialization.qual.Initialized;
controller -> controller ->
sessionImpl sessionImpl
.getPlayerWrapper() .getPlayerWrapper()
.setRepeatMode(MediaUtils.convertToRepeatMode(playbackStateCompatRepeatMode)), .setRepeatMode(
LegacyConversions.convertToRepeatMode(playbackStateCompatRepeatMode)),
sessionCompat.getCurrentControllerInfo()); sessionCompat.getCurrentControllerInfo());
} }
@ -546,7 +547,7 @@ import org.checkerframework.checker.initialization.qual.Initialized;
controller -> controller ->
sessionImpl sessionImpl
.getPlayerWrapper() .getPlayerWrapper()
.setShuffleModeEnabled(MediaUtils.convertToShuffleModeEnabled(shuffleMode)), .setShuffleModeEnabled(LegacyConversions.convertToShuffleModeEnabled(shuffleMode)),
sessionCompat.getCurrentControllerInfo()); sessionCompat.getCurrentControllerInfo());
} }
@ -861,7 +862,7 @@ import org.checkerframework.checker.initialization.qual.Initialized;
Log.w(TAG, "onAddQueueItem(): Media ID shouldn't be empty"); Log.w(TAG, "onAddQueueItem(): Media ID shouldn't be empty");
return; return;
} }
MediaItem mediaItem = MediaUtils.convertToMediaItem(description); MediaItem mediaItem = LegacyConversions.convertToMediaItem(description);
ListenableFuture<List<MediaItem>> mediaItemsFuture = ListenableFuture<List<MediaItem>> mediaItemsFuture =
sessionImpl.onAddMediaItemsOnHandler(controller, ImmutableList.of(mediaItem)); sessionImpl.onAddMediaItemsOnHandler(controller, ImmutableList.of(mediaItem));
Futures.addCallback( Futures.addCallback(
@ -1143,7 +1144,7 @@ import org.checkerframework.checker.initialization.qual.Initialized;
sessionCompat.setRatingType(RatingCompat.RATING_NONE); sessionCompat.setRatingType(RatingCompat.RATING_NONE);
} else { } else {
sessionCompat.setRatingType( sessionCompat.setRatingType(
MediaUtils.getRatingCompatStyle(mediaItem.mediaMetadata.userRating)); LegacyConversions.getRatingCompatStyle(mediaItem.mediaMetadata.userRating));
} }
updateLegacySessionPlaybackState(sessionImpl.getPlayerWrapper()); updateLegacySessionPlaybackState(sessionImpl.getPlayerWrapper());
} }
@ -1167,7 +1168,7 @@ import org.checkerframework.checker.initialization.qual.Initialized;
setQueue(sessionCompat, /* queue= */ null); setQueue(sessionCompat, /* queue= */ null);
return; return;
} }
List<MediaItem> mediaItemList = MediaUtils.convertToMediaItemList(timeline); List<MediaItem> mediaItemList = LegacyConversions.convertToMediaItemList(timeline);
List<@NullableType ListenableFuture<Bitmap>> bitmapFutures = new ArrayList<>(); List<@NullableType ListenableFuture<Bitmap>> bitmapFutures = new ArrayList<>();
final AtomicInteger resultCount = new AtomicInteger(0); final AtomicInteger resultCount = new AtomicInteger(0);
Runnable handleBitmapFuturesTask = Runnable handleBitmapFuturesTask =
@ -1209,7 +1210,7 @@ import org.checkerframework.checker.initialization.qual.Initialized;
Log.d(TAG, "Failed to get bitmap", e); Log.d(TAG, "Failed to get bitmap", e);
} }
} }
queueItemList.add(MediaUtils.convertToQueueItem(mediaItems.get(i), i, bitmap)); queueItemList.add(LegacyConversions.convertToQueueItem(mediaItems.get(i), i, bitmap));
} }
if (Util.SDK_INT < 21) { if (Util.SDK_INT < 21) {
@ -1245,12 +1246,13 @@ import org.checkerframework.checker.initialization.qual.Initialized;
public void onShuffleModeEnabledChanged(int seq, boolean shuffleModeEnabled) public void onShuffleModeEnabledChanged(int seq, boolean shuffleModeEnabled)
throws RemoteException { throws RemoteException {
sessionCompat.setShuffleMode( sessionCompat.setShuffleMode(
MediaUtils.convertToPlaybackStateCompatShuffleMode(shuffleModeEnabled)); LegacyConversions.convertToPlaybackStateCompatShuffleMode(shuffleModeEnabled));
} }
@Override @Override
public void onRepeatModeChanged(int seq, @RepeatMode int repeatMode) throws RemoteException { public void onRepeatModeChanged(int seq, @RepeatMode int repeatMode) throws RemoteException {
sessionCompat.setRepeatMode(MediaUtils.convertToPlaybackStateCompatRepeatMode(repeatMode)); sessionCompat.setRepeatMode(
LegacyConversions.convertToPlaybackStateCompatRepeatMode(repeatMode));
} }
@Override @Override
@ -1258,7 +1260,7 @@ import org.checkerframework.checker.initialization.qual.Initialized;
@DeviceInfo.PlaybackType @DeviceInfo.PlaybackType
int playbackType = sessionImpl.getPlayerWrapper().getDeviceInfo().playbackType; int playbackType = sessionImpl.getPlayerWrapper().getDeviceInfo().playbackType;
if (playbackType == DeviceInfo.PLAYBACK_TYPE_LOCAL) { if (playbackType == DeviceInfo.PLAYBACK_TYPE_LOCAL) {
int legacyStreamType = MediaUtils.getLegacyStreamType(audioAttributes); int legacyStreamType = LegacyConversions.getLegacyStreamType(audioAttributes);
sessionCompat.setPlaybackToLocal(legacyStreamType); sessionCompat.setPlaybackToLocal(legacyStreamType);
} }
} }
@ -1269,7 +1271,7 @@ import org.checkerframework.checker.initialization.qual.Initialized;
volumeProviderCompat = player.createVolumeProviderCompat(); volumeProviderCompat = player.createVolumeProviderCompat();
if (volumeProviderCompat == null) { if (volumeProviderCompat == null) {
int streamType = int streamType =
MediaUtils.getLegacyStreamType(player.getAudioAttributesWithCommandCheck()); LegacyConversions.getLegacyStreamType(player.getAudioAttributesWithCommandCheck());
sessionCompat.setPlaybackToLocal(streamType); sessionCompat.setPlaybackToLocal(streamType);
} else { } else {
sessionCompat.setPlaybackToRemote(volumeProviderCompat); sessionCompat.setPlaybackToRemote(volumeProviderCompat);
@ -1340,7 +1342,7 @@ import org.checkerframework.checker.initialization.qual.Initialized;
} }
setMetadata( setMetadata(
sessionCompat, sessionCompat,
MediaUtils.convertToMediaMetadataCompat( LegacyConversions.convertToMediaMetadataCompat(
newMediaMetadata, newMediaMetadata,
newMediaId, newMediaId,
newMediaUri, newMediaUri,
@ -1365,7 +1367,7 @@ import org.checkerframework.checker.initialization.qual.Initialized;
} }
setMetadata( setMetadata(
sessionCompat, sessionCompat,
MediaUtils.convertToMediaMetadataCompat( LegacyConversions.convertToMediaMetadataCompat(
newMediaMetadata, newMediaId, newMediaUri, newDurationMs, artworkBitmap)); newMediaMetadata, newMediaId, newMediaUri, newDurationMs, artworkBitmap));
} }
} }

1329
libraries/session/src/main/java/androidx/media3/session/MediaUtils.java
View File

File diff suppressed because it is too large Load Diff

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

@ -998,7 +998,8 @@ import java.util.List;
.build(); .build();
} }
@Nullable PlaybackException playerError = getPlayerError(); @Nullable PlaybackException playerError = getPlayerError();
int state = MediaUtils.convertToPlaybackStateCompatState(/* player= */ this, playIfSuppressed); int state =
LegacyConversions.convertToPlaybackStateCompatState(/* player= */ this, playIfSuppressed);
// Always advertise ACTION_SET_RATING. // Always advertise ACTION_SET_RATING.
long actions = PlaybackStateCompat.ACTION_SET_RATING; long actions = PlaybackStateCompat.ACTION_SET_RATING;
Commands availableCommands = intersect(availablePlayerCommands, getAvailableCommands()); Commands availableCommands = intersect(availablePlayerCommands, getAvailableCommands());
@ -1007,7 +1008,7 @@ import java.util.List;
} }
long queueItemId = long queueItemId =
isCommandAvailable(COMMAND_GET_TIMELINE) isCommandAvailable(COMMAND_GET_TIMELINE)
? MediaUtils.convertToQueueItemId(getCurrentMediaItemIndex()) ? LegacyConversions.convertToQueueItemId(getCurrentMediaItemIndex())
: MediaSessionCompat.QueueItem.UNKNOWN_ID; : MediaSessionCompat.QueueItem.UNKNOWN_ID;
float playbackSpeed = getPlaybackParameters().speed; float playbackSpeed = getPlaybackParameters().speed;
float sessionPlaybackSpeed = isPlaying() ? playbackSpeed : 0f; float sessionPlaybackSpeed = isPlaying() ? playbackSpeed : 0f;

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

@ -61,7 +61,7 @@ import java.util.List;
ImmutableList.Builder<QueuedMediaItem> queuedMediaItemsBuilder = new ImmutableList.Builder<>(); ImmutableList.Builder<QueuedMediaItem> queuedMediaItemsBuilder = new ImmutableList.Builder<>();
for (int i = 0; i < queue.size(); i++) { for (int i = 0; i < queue.size(); i++) {
QueueItem queueItem = queue.get(i); QueueItem queueItem = queue.get(i);
MediaItem mediaItem = MediaUtils.convertToMediaItem(queueItem); MediaItem mediaItem = LegacyConversions.convertToMediaItem(queueItem);
queuedMediaItemsBuilder.add( queuedMediaItemsBuilder.add(
new QueuedMediaItem(mediaItem, queueItem.getQueueId(), /* durationMs= */ C.TIME_UNSET)); new QueuedMediaItem(mediaItem, queueItem.getQueueId(), /* durationMs= */ C.TIME_UNSET));
} }

1062
libraries/test_session_current/src/androidTest/java/androidx/media3/session/LegacyConversionsTest.java Normal file
View File

File diff suppressed because it is too large Load Diff

14
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerCompatCallbackWithMediaSessionTest.java
View File

@ -156,7 +156,7 @@ public class MediaControllerCompatCallbackWithMediaSessionTest {
assertThat(latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)).isTrue(); assertThat(latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)).isTrue();
assertThat( assertThat(
MediaUtils.convertToPlaybackState( LegacyConversions.convertToPlaybackState(
controller.getPlaybackState(), controller.getPlaybackState(),
controller.getMetadata(), controller.getMetadata(),
/* timeDiffMs= */ C.TIME_UNSET)) /* timeDiffMs= */ C.TIME_UNSET))
@ -398,7 +398,7 @@ public class MediaControllerCompatCallbackWithMediaSessionTest {
assertThat(metadataRef.get().getLong(METADATA_KEY_DURATION)).isEqualTo(testDurationMs); assertThat(metadataRef.get().getLong(METADATA_KEY_DURATION)).isEqualTo(testDurationMs);
@PlaybackStateCompat.State @PlaybackStateCompat.State
int playbackStateFromControllerCompat = int playbackStateFromControllerCompat =
MediaUtils.convertToPlaybackState( LegacyConversions.convertToPlaybackState(
playbackStateRef.get(), metadataRef.get(), /* timeDiffMs= */ C.TIME_UNSET); playbackStateRef.get(), metadataRef.get(), /* timeDiffMs= */ C.TIME_UNSET);
assertThat(playbackStateFromControllerCompat).isEqualTo(testState); assertThat(playbackStateFromControllerCompat).isEqualTo(testState);
assertThat(metadataRef.get().getRating(METADATA_KEY_USER_RATING).hasHeart()).isTrue(); assertThat(metadataRef.get().getRating(METADATA_KEY_USER_RATING).hasHeart()).isTrue();
@ -463,7 +463,7 @@ public class MediaControllerCompatCallbackWithMediaSessionTest {
int legacyStream = AudioManager.STREAM_RING; int legacyStream = AudioManager.STREAM_RING;
AudioAttributesCompat attrsCompat = AudioAttributesCompat attrsCompat =
new AudioAttributesCompat.Builder().setLegacyStreamType(legacyStream).build(); new AudioAttributesCompat.Builder().setLegacyStreamType(legacyStream).build();
AudioAttributes attrs = MediaUtils.convertToAudioAttributes(attrsCompat); AudioAttributes attrs = LegacyConversions.convertToAudioAttributes(attrsCompat);
CountDownLatch playbackInfoNotified = new CountDownLatch(1); CountDownLatch playbackInfoNotified = new CountDownLatch(1);
MediaControllerCompat.Callback callback = MediaControllerCompat.Callback callback =
new MediaControllerCompat.Callback() { new MediaControllerCompat.Callback() {
@ -509,7 +509,7 @@ public class MediaControllerCompatCallbackWithMediaSessionTest {
int legacyStream = AudioManager.STREAM_RING; int legacyStream = AudioManager.STREAM_RING;
AudioAttributesCompat attrsCompat = AudioAttributesCompat attrsCompat =
new AudioAttributesCompat.Builder().setLegacyStreamType(legacyStream).build(); new AudioAttributesCompat.Builder().setLegacyStreamType(legacyStream).build();
AudioAttributes attrs = MediaUtils.convertToAudioAttributes(attrsCompat); AudioAttributes attrs = LegacyConversions.convertToAudioAttributes(attrsCompat);
CountDownLatch playbackInfoNotified = new CountDownLatch(1); CountDownLatch playbackInfoNotified = new CountDownLatch(1);
MediaControllerCompat.Callback callback = MediaControllerCompat.Callback callback =
new MediaControllerCompat.Callback() { new MediaControllerCompat.Callback() {
@ -967,7 +967,7 @@ public class MediaControllerCompatCallbackWithMediaSessionTest {
new MediaControllerCompat.Callback() { new MediaControllerCompat.Callback() {
@Override @Override
public void onPlaybackStateChanged(PlaybackStateCompat state) { public void onPlaybackStateChanged(PlaybackStateCompat state) {
reportedCustomLayouts.add(MediaUtils.convertToCustomLayout(state)); reportedCustomLayouts.add(LegacyConversions.convertToCustomLayout(state));
latch1.countDown(); latch1.countDown();
} }
}; };
@ -1129,9 +1129,9 @@ public class MediaControllerCompatCallbackWithMediaSessionTest {
assertThat(playbackStateRef.get().getPosition()).isEqualTo(testPosition); assertThat(playbackStateRef.get().getPosition()).isEqualTo(testPosition);
assertThat(controllerCompat.getPlaybackState().getPosition()).isEqualTo(testPosition); assertThat(controllerCompat.getPlaybackState().getPosition()).isEqualTo(testPosition);
assertThat(playbackStateRef.get().getActiveQueueItemId()) assertThat(playbackStateRef.get().getActiveQueueItemId())
.isEqualTo(MediaUtils.convertToQueueItemId(testItemIndex)); .isEqualTo(LegacyConversions.convertToQueueItemId(testItemIndex));
assertThat(controllerCompat.getPlaybackState().getActiveQueueItemId()) assertThat(controllerCompat.getPlaybackState().getActiveQueueItemId())
.isEqualTo(MediaUtils.convertToQueueItemId(testItemIndex)); .isEqualTo(LegacyConversions.convertToQueueItemId(testItemIndex));
assertThat(callbackOrder) assertThat(callbackOrder)
.containsExactly("onMetadataChanged", "onPlaybackStateChanged") .containsExactly("onMetadataChanged", "onPlaybackStateChanged")
.inOrder(); .inOrder();

10
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerCompatPlaybackStateCompatActionsWithMediaSessionTest.java
View File

@ -1477,7 +1477,7 @@ public class MediaControllerCompatPlaybackStateCompatActionsWithMediaSessionTest
connectMediaNotificationController(mediaSession); connectMediaNotificationController(mediaSession);
MediaControllerCompat controllerCompat = createMediaControllerCompat(mediaSession); MediaControllerCompat controllerCompat = createMediaControllerCompat(mediaSession);
assertThat(MediaUtils.convertToCustomLayout(controllerCompat.getPlaybackState())) assertThat(LegacyConversions.convertToCustomLayout(controllerCompat.getPlaybackState()))
.containsExactly(customLayout.get(0).copyWithIsEnabled(true)); .containsExactly(customLayout.get(0).copyWithIsEnabled(true));
mediaSession.release(); mediaSession.release();
releasePlayer(player); releasePlayer(player);
@ -1520,14 +1520,14 @@ public class MediaControllerCompatPlaybackStateCompatActionsWithMediaSessionTest
connectMediaNotificationController(mediaSession); connectMediaNotificationController(mediaSession);
MediaControllerCompat controllerCompat = createMediaControllerCompat(mediaSession); MediaControllerCompat controllerCompat = createMediaControllerCompat(mediaSession);
ImmutableList<CommandButton> initialCustomLayout = ImmutableList<CommandButton> initialCustomLayout =
MediaUtils.convertToCustomLayout(controllerCompat.getPlaybackState()); LegacyConversions.convertToCustomLayout(controllerCompat.getPlaybackState());
AtomicReference<List<CommandButton>> reportedCustomLayout = new AtomicReference<>(); AtomicReference<List<CommandButton>> reportedCustomLayout = new AtomicReference<>();
CountDownLatch latch = new CountDownLatch(1); CountDownLatch latch = new CountDownLatch(1);
controllerCompat.registerCallback( controllerCompat.registerCallback(
new MediaControllerCompat.Callback() { new MediaControllerCompat.Callback() {
@Override @Override
public void onPlaybackStateChanged(PlaybackStateCompat state) { public void onPlaybackStateChanged(PlaybackStateCompat state) {
reportedCustomLayout.set(MediaUtils.convertToCustomLayout(state)); reportedCustomLayout.set(LegacyConversions.convertToCustomLayout(state));
latch.countDown(); latch.countDown();
} }
}, },
@ -1581,14 +1581,14 @@ public class MediaControllerCompatPlaybackStateCompatActionsWithMediaSessionTest
connectMediaNotificationController(mediaSession); connectMediaNotificationController(mediaSession);
MediaControllerCompat controllerCompat = createMediaControllerCompat(mediaSession); MediaControllerCompat controllerCompat = createMediaControllerCompat(mediaSession);
ImmutableList<CommandButton> initialCustomLayout = ImmutableList<CommandButton> initialCustomLayout =
MediaUtils.convertToCustomLayout(controllerCompat.getPlaybackState()); LegacyConversions.convertToCustomLayout(controllerCompat.getPlaybackState());
AtomicReference<List<CommandButton>> reportedCustomLayout = new AtomicReference<>(); AtomicReference<List<CommandButton>> reportedCustomLayout = new AtomicReference<>();
CountDownLatch latch = new CountDownLatch(1); CountDownLatch latch = new CountDownLatch(1);
controllerCompat.registerCallback( controllerCompat.registerCallback(
new MediaControllerCompat.Callback() { new MediaControllerCompat.Callback() {
@Override @Override
public void onPlaybackStateChanged(PlaybackStateCompat state) { public void onPlaybackStateChanged(PlaybackStateCompat state) {
reportedCustomLayout.set(MediaUtils.convertToCustomLayout(state)); reportedCustomLayout.set(LegacyConversions.convertToCustomLayout(state));
latch.countDown(); latch.countDown();
} }
}, },

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

@ -322,7 +322,7 @@ public class MediaControllerListenerTest {
Timeline testTimeline = MediaTestUtils.createTimeline(/* windowCount= */ 3); Timeline testTimeline = MediaTestUtils.createTimeline(/* windowCount= */ 3);
MediaMetadata testPlaylistMetadata = new MediaMetadata.Builder().setTitle("title").build(); MediaMetadata testPlaylistMetadata = new MediaMetadata.Builder().setTitle("title").build();
AudioAttributes testAudioAttributes = AudioAttributes testAudioAttributes =
MediaUtils.convertToAudioAttributes( LegacyConversions.convertToAudioAttributes(
new AudioAttributesCompat.Builder() new AudioAttributesCompat.Builder()
.setLegacyStreamType(AudioManager.STREAM_RING) .setLegacyStreamType(AudioManager.STREAM_RING)
.build()); .build());

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

@ -102,7 +102,7 @@ public class MediaControllerMediaSessionCompatCallbackAggregationTest {
MediaMetadataCompat testMediaMetadataCompat = createMediaMetadataCompat(); MediaMetadataCompat testMediaMetadataCompat = createMediaMetadataCompat();
@RatingCompat.Style int testRatingType = RatingCompat.RATING_HEART; @RatingCompat.Style int testRatingType = RatingCompat.RATING_HEART;
MediaMetadata testMediaMetadata = MediaMetadata testMediaMetadata =
MediaUtils.convertToMediaMetadata(testMediaMetadataCompat, testRatingType); LegacyConversions.convertToMediaMetadata(testMediaMetadataCompat, testRatingType);
MediaItem testCurrentMediaItem = MediaItem testCurrentMediaItem =
new MediaItem.Builder() new MediaItem.Builder()
.setMediaId(testMediaItems.get(testMediaItemIndex).mediaId) .setMediaId(testMediaItems.get(testMediaItemIndex).mediaId)
@ -234,7 +234,7 @@ public class MediaControllerMediaSessionCompatCallbackAggregationTest {
MediaMetadataCompat testMediaMetadataCompat = createMediaMetadataCompat(); MediaMetadataCompat testMediaMetadataCompat = createMediaMetadataCompat();
@RatingCompat.Style int testRatingType = RatingCompat.RATING_HEART; @RatingCompat.Style int testRatingType = RatingCompat.RATING_HEART;
MediaMetadata testMediaMetadata = MediaMetadata testMediaMetadata =
MediaUtils.convertToMediaMetadata(testMediaMetadataCompat, testRatingType); LegacyConversions.convertToMediaMetadata(testMediaMetadataCompat, testRatingType);
Events testEvents = Events testEvents =
new Events( new Events(
new FlagSet.Builder() new FlagSet.Builder()
@ -245,7 +245,8 @@ public class MediaControllerMediaSessionCompatCallbackAggregationTest {
EVENT_TIMELINE_CHANGED) EVENT_TIMELINE_CHANGED)
.build()); .build());
int testMediaItemIndex = testSize; // Index of fake item. int testMediaItemIndex = testSize; // Index of fake item.
testMediaItems.add(MediaUtils.convertToMediaItem(testMediaMetadataCompat, testRatingType)); testMediaItems.add(
LegacyConversions.convertToMediaItem(testMediaMetadataCompat, testRatingType));
MediaController controller = controllerTestRule.createController(session.getSessionToken()); MediaController controller = controllerTestRule.createController(session.getSessionToken());
CountDownLatch latch = new CountDownLatch(5); CountDownLatch latch = new CountDownLatch(5);
@ -427,7 +428,7 @@ public class MediaControllerMediaSessionCompatCallbackAggregationTest {
MediaMetadataCompat testMediaMetadataCompat = createMediaMetadataCompat(); MediaMetadataCompat testMediaMetadataCompat = createMediaMetadataCompat();
@RatingCompat.Style int testRatingType = RatingCompat.RATING_HEART; @RatingCompat.Style int testRatingType = RatingCompat.RATING_HEART;
MediaMetadata testMediaMetadata = MediaMetadata testMediaMetadata =
MediaUtils.convertToMediaMetadata(testMediaMetadataCompat, testRatingType); LegacyConversions.convertToMediaMetadata(testMediaMetadataCompat, testRatingType);
Events testEvents = Events testEvents =
new Events( new Events(
new FlagSet.Builder() new FlagSet.Builder()
@ -439,7 +440,8 @@ public class MediaControllerMediaSessionCompatCallbackAggregationTest {
.build()); .build());
int testMediaItemIndex = 0; int testMediaItemIndex = 0;
List<MediaItem> testMediaItems = new ArrayList<>(); List<MediaItem> testMediaItems = new ArrayList<>();
testMediaItems.add(MediaUtils.convertToMediaItem(testMediaMetadataCompat, testRatingType)); testMediaItems.add(
LegacyConversions.convertToMediaItem(testMediaMetadataCompat, testRatingType));
MediaController controller = controllerTestRule.createController(session.getSessionToken()); MediaController controller = controllerTestRule.createController(session.getSessionToken());
CountDownLatch latch = new CountDownLatch(5); CountDownLatch latch = new CountDownLatch(5);
@ -547,8 +549,9 @@ public class MediaControllerMediaSessionCompatCallbackAggregationTest {
MediaItem item = mediaItems.get(i); MediaItem item = mediaItems.get(i);
@Nullable @Nullable
Bitmap bitmap = bitmapLoader.decodeBitmap(item.mediaMetadata.artworkData).get(10, SECONDS); Bitmap bitmap = bitmapLoader.decodeBitmap(item.mediaMetadata.artworkData).get(10, SECONDS);
MediaDescriptionCompat description = MediaUtils.convertToMediaDescriptionCompat(item, bitmap); MediaDescriptionCompat description =
long id = MediaUtils.convertToQueueItemId(i); LegacyConversions.convertToMediaDescriptionCompat(item, bitmap);
long id = LegacyConversions.convertToQueueItemId(i);
list.add(new MediaSessionCompat.QueueItem(description, id)); list.add(new MediaSessionCompat.QueueItem(description, id));
} }
return list; return list;

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

@ -451,7 +451,7 @@ public class MediaControllerWithMediaSessionCompatTest {
Timeline testTimeline = MediaTestUtils.createTimeline(/* windowCount= */ 2); Timeline testTimeline = MediaTestUtils.createTimeline(/* windowCount= */ 2);
List<QueueItem> testQueue = List<QueueItem> testQueue =
MediaTestUtils.convertToQueueItemsWithoutBitmap( MediaTestUtils.convertToQueueItemsWithoutBitmap(
MediaUtils.convertToMediaItemList(testTimeline)); LegacyConversions.convertToMediaItemList(testTimeline));
session.setQueue(testQueue); session.setQueue(testQueue);
assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue(); assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
@ -465,7 +465,7 @@ public class MediaControllerWithMediaSessionCompatTest {
Timeline timeline = MediaTestUtils.createTimeline(/* windowCount= */ 2); Timeline timeline = MediaTestUtils.createTimeline(/* windowCount= */ 2);
List<QueueItem> queue = List<QueueItem> queue =
MediaTestUtils.convertToQueueItemsWithoutBitmap( MediaTestUtils.convertToQueueItemsWithoutBitmap(
MediaUtils.convertToMediaItemList(timeline)); LegacyConversions.convertToMediaItemList(timeline));
session.setQueue(queue); session.setQueue(queue);
CountDownLatch latch = new CountDownLatch(1); CountDownLatch latch = new CountDownLatch(1);
@ -515,7 +515,7 @@ public class MediaControllerWithMediaSessionCompatTest {
ImmutableList.copyOf(Iterables.concat(mediaItems, mediaItems))); ImmutableList.copyOf(Iterables.concat(mediaItems, mediaItems)));
List<QueueItem> testQueue = List<QueueItem> testQueue =
MediaTestUtils.convertToQueueItemsWithoutBitmap( MediaTestUtils.convertToQueueItemsWithoutBitmap(
MediaUtils.convertToMediaItemList(testTimeline)); LegacyConversions.convertToMediaItemList(testTimeline));
session.setQueue(testQueue); session.setQueue(testQueue);
assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue(); assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
@ -823,7 +823,7 @@ public class MediaControllerWithMediaSessionCompatTest {
List<QueueItem> testQueue = MediaTestUtils.convertToQueueItemsWithoutBitmap(testList); List<QueueItem> testQueue = MediaTestUtils.convertToQueueItemsWithoutBitmap(testList);
MediaItem testRemoveMediaItem = MediaTestUtils.createMediaItem("removed"); MediaItem testRemoveMediaItem = MediaTestUtils.createMediaItem("removed");
MediaMetadataCompat testMetadataCompat = MediaMetadataCompat testMetadataCompat =
MediaUtils.convertToMediaMetadataCompat( LegacyConversions.convertToMediaMetadataCompat(
testRemoveMediaItem.mediaMetadata, testRemoveMediaItem.mediaMetadata,
"mediaId", "mediaId",
Uri.parse("http://example.com"), Uri.parse("http://example.com"),
@ -845,7 +845,7 @@ public class MediaControllerWithMediaSessionCompatTest {
List<QueueItem> testQueue = MediaTestUtils.convertToQueueItemsWithoutBitmap(testList); List<QueueItem> testQueue = MediaTestUtils.convertToQueueItemsWithoutBitmap(testList);
MediaItem testRemoveMediaItem = MediaTestUtils.createMediaItem("removed"); MediaItem testRemoveMediaItem = MediaTestUtils.createMediaItem("removed");
MediaMetadataCompat testMetadataCompat = MediaMetadataCompat testMetadataCompat =
MediaUtils.convertToMediaMetadataCompat( LegacyConversions.convertToMediaMetadataCompat(
testRemoveMediaItem.mediaMetadata, testRemoveMediaItem.mediaMetadata,
"mediaId", "mediaId",
Uri.parse("http://example.com"), Uri.parse("http://example.com"),
@ -884,7 +884,7 @@ public class MediaControllerWithMediaSessionCompatTest {
List<QueueItem> testQueue = MediaTestUtils.convertToQueueItemsWithoutBitmap(testList); List<QueueItem> testQueue = MediaTestUtils.convertToQueueItemsWithoutBitmap(testList);
MediaItem testRemoveMediaItem = MediaTestUtils.createMediaItem("removed"); MediaItem testRemoveMediaItem = MediaTestUtils.createMediaItem("removed");
MediaMetadataCompat testMetadataCompat = MediaMetadataCompat testMetadataCompat =
MediaUtils.convertToMediaMetadataCompat( LegacyConversions.convertToMediaMetadataCompat(
testRemoveMediaItem.mediaMetadata, testRemoveMediaItem.mediaMetadata,
"mediaId", "mediaId",
Uri.parse("http://example.com"), Uri.parse("http://example.com"),
@ -906,7 +906,7 @@ public class MediaControllerWithMediaSessionCompatTest {
MediaItem testMediaItem = MediaTestUtils.createMediaItem("test"); MediaItem testMediaItem = MediaTestUtils.createMediaItem("test");
MediaMetadata testMediaMetadata = testMediaItem.mediaMetadata; MediaMetadata testMediaMetadata = testMediaItem.mediaMetadata;
MediaMetadataCompat testMediaMetadataCompat = MediaMetadataCompat testMediaMetadataCompat =
MediaUtils.convertToMediaMetadataCompat( LegacyConversions.convertToMediaMetadataCompat(
testMediaMetadata, testMediaMetadata,
"mediaId", "mediaId",
Uri.parse("http://example.com"), Uri.parse("http://example.com"),
@ -928,7 +928,7 @@ public class MediaControllerWithMediaSessionCompatTest {
MediaMetadata testMediaMetadata = testMediaItem.mediaMetadata; MediaMetadata testMediaMetadata = testMediaItem.mediaMetadata;
@Nullable Bitmap artworkBitmap = getBitmapFromMetadata(testMediaMetadata); @Nullable Bitmap artworkBitmap = getBitmapFromMetadata(testMediaMetadata);
MediaMetadataCompat testMediaMetadataCompat = MediaMetadataCompat testMediaMetadataCompat =
MediaUtils.convertToMediaMetadataCompat( LegacyConversions.convertToMediaMetadataCompat(
testMediaMetadata, testMediaMetadata,
"mediaId", "mediaId",
Uri.parse("http://example.com"), Uri.parse("http://example.com"),
@ -1275,7 +1275,7 @@ public class MediaControllerWithMediaSessionCompatTest {
List<MediaItem> testPlaylist = MediaTestUtils.createMediaItems(/* size= */ 1); List<MediaItem> testPlaylist = MediaTestUtils.createMediaItems(/* size= */ 1);
MediaItem firstMediaItemInPlaylist = testPlaylist.get(0); MediaItem firstMediaItemInPlaylist = testPlaylist.get(0);
MediaMetadataCompat metadata = MediaMetadataCompat metadata =
MediaUtils.convertToMediaMetadataCompat( LegacyConversions.convertToMediaMetadataCompat(
firstMediaItemInPlaylist.mediaMetadata, firstMediaItemInPlaylist.mediaMetadata,
"mediaId", "mediaId",
Uri.parse("http://example.com"), Uri.parse("http://example.com"),
@ -1325,7 +1325,7 @@ public class MediaControllerWithMediaSessionCompatTest {
List<MediaItem> testPlaylist = MediaTestUtils.createMediaItems(1); List<MediaItem> testPlaylist = MediaTestUtils.createMediaItems(1);
MediaItem firstMediaItemInPlaylist = testPlaylist.get(0); MediaItem firstMediaItemInPlaylist = testPlaylist.get(0);
MediaMetadataCompat metadata = MediaMetadataCompat metadata =
MediaUtils.convertToMediaMetadataCompat( LegacyConversions.convertToMediaMetadataCompat(
firstMediaItemInPlaylist.mediaMetadata, firstMediaItemInPlaylist.mediaMetadata,
"mediaId", "mediaId",
Uri.parse("http://example.com"), Uri.parse("http://example.com"),

6
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionCallbackWithMediaControllerCompatTest.java
View File

@ -1147,7 +1147,7 @@ public class MediaSessionCallbackWithMediaControllerCompatTest {
() -> { () -> {
// Set stream of the session. // Set stream of the session.
AudioAttributes attrs = AudioAttributes attrs =
MediaUtils.convertToAudioAttributes( LegacyConversions.convertToAudioAttributes(
new AudioAttributesCompat.Builder().setLegacyStreamType(stream).build()); new AudioAttributesCompat.Builder().setLegacyStreamType(stream).build());
player.audioAttributes = attrs; player.audioAttributes = attrs;
player.notifyAudioAttributesChanged(attrs); player.notifyAudioAttributesChanged(attrs);
@ -1195,7 +1195,7 @@ public class MediaSessionCallbackWithMediaControllerCompatTest {
() -> { () -> {
// Set stream of the session. // Set stream of the session.
AudioAttributes attrs = AudioAttributes attrs =
MediaUtils.convertToAudioAttributes( LegacyConversions.convertToAudioAttributes(
new AudioAttributesCompat.Builder().setLegacyStreamType(stream).build()); new AudioAttributesCompat.Builder().setLegacyStreamType(stream).build());
player.audioAttributes = attrs; player.audioAttributes = attrs;
player.notifyAudioAttributesChanged(attrs); player.notifyAudioAttributesChanged(attrs);
@ -1764,7 +1764,7 @@ public class MediaSessionCallbackWithMediaControllerCompatTest {
String mediaIdOut, String mediaIdOut,
Rating ratingOut) { Rating ratingOut) {
assertThat(mediaIdOut).isEqualTo(mediaId); assertThat(mediaIdOut).isEqualTo(mediaId);
assertThat(ratingOut).isEqualTo(MediaUtils.convertToRating(rating)); assertThat(ratingOut).isEqualTo(LegacyConversions.convertToRating(rating));
latch.countDown(); latch.countDown();
return Futures.immediateFuture(new SessionResult(RESULT_SUCCESS)); return Futures.immediateFuture(new SessionResult(RESULT_SUCCESS));
} }

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

@ -717,7 +717,7 @@ public class MediaSessionCompatCallbackWithMediaControllerTest {
controller.setRating(mediaId, rating); controller.setRating(mediaId, rating);
assertThat(sessionCallback.await(TIMEOUT_MS)).isTrue(); assertThat(sessionCallback.await(TIMEOUT_MS)).isTrue();
assertThat(sessionCallback.onSetRatingCalled).isTrue(); assertThat(sessionCallback.onSetRatingCalled).isTrue();
assertThat(MediaUtils.convertToRating(sessionCallback.rating)).isEqualTo(rating); assertThat(LegacyConversions.convertToRating(sessionCallback.rating)).isEqualTo(rating);
} }
@Test @Test
@ -730,7 +730,7 @@ public class MediaSessionCompatCallbackWithMediaControllerTest {
controller.setRating(rating); controller.setRating(rating);
assertThat(sessionCallback.await(TIMEOUT_MS)).isTrue(); assertThat(sessionCallback.await(TIMEOUT_MS)).isTrue();
assertThat(sessionCallback.onSetRatingCalled).isTrue(); assertThat(sessionCallback.onSetRatingCalled).isTrue();
assertThat(MediaUtils.convertToRating(sessionCallback.rating)).isEqualTo(rating); assertThat(LegacyConversions.convertToRating(sessionCallback.rating)).isEqualTo(rating);
} }
@Test @Test

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

@ -300,7 +300,7 @@ public class MediaSessionServiceTest {
new MediaControllerCompat( new MediaControllerCompat(
ApplicationProvider.getApplicationContext(), mediaSession.getSessionCompat()); ApplicationProvider.getApplicationContext(), mediaSession.getSessionCompat());
ImmutableList<CommandButton> initialCustomLayoutInControllerCompat = ImmutableList<CommandButton> initialCustomLayoutInControllerCompat =
MediaUtils.convertToCustomLayout(mediaControllerCompat.getPlaybackState()); LegacyConversions.convertToCustomLayout(mediaControllerCompat.getPlaybackState());
// Start the service by creating a remote controller. // Start the service by creating a remote controller.
RemoteMediaController remoteController = RemoteMediaController remoteController =
@ -321,7 +321,7 @@ public class MediaSessionServiceTest {
.isEqualTo(PlaybackStateCompat.ACTION_SET_RATING); .isEqualTo(PlaybackStateCompat.ACTION_SET_RATING);
assertThat(remoteController.getCustomLayout()).containsExactly(button1, button2).inOrder(); assertThat(remoteController.getCustomLayout()).containsExactly(button1, button2).inOrder();
assertThat(initialCustomLayoutInControllerCompat).isEmpty(); assertThat(initialCustomLayoutInControllerCompat).isEmpty();
assertThat(MediaUtils.convertToCustomLayout(mediaControllerCompat.getPlaybackState())) assertThat(LegacyConversions.convertToCustomLayout(mediaControllerCompat.getPlaybackState()))
.containsExactly(button1.copyWithIsEnabled(true), button3.copyWithIsEnabled(true)) .containsExactly(button1.copyWithIsEnabled(true), button3.copyWithIsEnabled(true))
.inOrder(); .inOrder();
mediaSession.release(); mediaSession.release();

1016
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaUtilsTest.java
View File

File diff suppressed because it is too large Load Diff

5
libraries/test_session_current/src/main/java/androidx/media3/session/MediaTestUtils.java
View File

@ -241,8 +241,9 @@ public final class MediaTestUtils {
List<MediaSessionCompat.QueueItem> list = new ArrayList<>(); List<MediaSessionCompat.QueueItem> list = new ArrayList<>();
for (int i = 0; i < mediaItems.size(); i++) { for (int i = 0; i < mediaItems.size(); i++) {
MediaItem item = mediaItems.get(i); MediaItem item = mediaItems.get(i);
MediaDescriptionCompat description = MediaUtils.convertToMediaDescriptionCompat(item, null); MediaDescriptionCompat description =
long id = MediaUtils.convertToQueueItemId(i); LegacyConversions.convertToMediaDescriptionCompat(item, null);
long id = LegacyConversions.convertToQueueItemId(i);
list.add(new MediaSessionCompat.QueueItem(description, id)); list.add(new MediaSessionCompat.QueueItem(description, id));
} }
return list; return list;