loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-14 11:09:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Migrate usages of the deprecated TrackSelectionParameters.CREATOR

Browse Source 
PiperOrigin-RevId: 446400192
This commit is contained in:
ibaker 2022-05-04 10:13:35 +01:00 committed by Ian Baker
parent c94035278c
commit 931bc70d5f
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,7 @@ public class PlayerActivity extends AppCompatActivity
if (savedInstanceState != null) {
trackSelectionParameters =
TrackSelectionParameters.CREATOR.fromBundle(
TrackSelectionParameters.fromBundle(
savedInstanceState.getBundle(KEY_TRACK_SELECTION_PARAMETERS));
startAutoPlay = savedInstanceState.getBoolean(KEY_AUTO_PLAY);
startItemIndex = savedInstanceState.getInt(KEY_ITEM_INDEX);

2
libraries/common/src/test/java/androidx/media3/common/TrackSelectionParametersTest.java
View File

@ -201,7 +201,7 @@ public final class TrackSelectionParametersTest {
new TrackSelectionParameters.Builder(getApplicationContext()).addOverride(override).build();
TrackSelectionParameters fromBundle =
TrackSelectionParameters.CREATOR.fromBundle(trackSelectionParameters.toBundle());
TrackSelectionParameters.fromBundle(trackSelectionParameters.toBundle());
assertThat(fromBundle).isEqualTo(trackSelectionParameters);
assertThat(trackSelectionParameters.overrides)

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

@ -1492,7 +1492,7 @@ import java.util.concurrent.ExecutionException;
TrackSelectionParameters trackSelectionParameters;
try {
trackSelectionParameters =
TrackSelectionParameters.CREATOR.fromBundle(trackSelectionParametersBundle);
TrackSelectionParameters.fromBundle(trackSelectionParametersBundle);
} catch (RuntimeException e) {
Log.w(TAG, "Ignoring malformed Bundle for TrackSelectionParameters", e);
return;

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

@ -890,11 +890,13 @@ import java.util.List;
bundle.getLong(keyForField(FIELD_SEEK_FORWARD_INCREMENT_MS), /* defaultValue= */ 0);
long maxSeekToPreviousPosition =
bundle.getLong(keyForField(FIELD_MAX_SEEK_TO_PREVIOUS_POSITION_MS), /* defaultValue= */ 0);
@Nullable
Bundle trackSelectionParametersBundle =
bundle.getBundle(keyForField(FIELD_TRACK_SELECTION_PARAMETERS));
TrackSelectionParameters trackSelectionParameters =
BundleableUtil.fromNullableBundle(
TrackSelectionParameters.CREATOR,
bundle.getBundle(keyForField(FIELD_TRACK_SELECTION_PARAMETERS)),
TrackSelectionParameters.DEFAULT_WITHOUT_CONTEXT);
trackSelectionParametersBundle == null
? TrackSelectionParameters.DEFAULT_WITHOUT_CONTEXT
: TrackSelectionParameters.fromBundle(trackSelectionParametersBundle);
return new PlayerInfo(
playerError,
mediaItemTransitionReason,

3
libraries/test_session_current/src/main/java/androidx/media3/session/MediaControllerProviderService.java
View File

@ -664,8 +664,7 @@ public class MediaControllerProviderService extends Service {
runOnHandler(
() -> {
MediaController controller = mediaControllerMap.get(controllerId);
controller.setTrackSelectionParameters(
TrackSelectionParameters.CREATOR.fromBundle(parameters));
controller.setTrackSelectionParameters(TrackSelectionParameters.fromBundle(parameters));
});
}

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

@ -332,11 +332,12 @@ public class MediaSessionProviderService extends Service {
MediaMetadata.CREATOR, config.getBundle(KEY_MEDIA_METADATA), player.mediaMetadata);
player.maxSeekToPreviousPositionMs =
config.getLong(KEY_MAX_SEEK_TO_PREVIOUS_POSITION_MS, player.maxSeekToPreviousPositionMs);
@Nullable
Bundle trackSelectionParametersBundle = config.getBundle(KEY_TRACK_SELECTION_PARAMETERS);
if (trackSelectionParametersBundle != null) {
player.trackSelectionParameters =
BundleableUtil.fromNullableBundle(
TrackSelectionParameters.CREATOR,
config.getBundle(KEY_TRACK_SELECTION_PARAMETERS),
player.trackSelectionParameters);
TrackSelectionParameters.fromBundle(trackSelectionParametersBundle);
}
return player;
}
@ -770,8 +771,7 @@ public class MediaSessionProviderService extends Service {
() -> {
MediaSession session = sessionMap.get(sessionId);
MockPlayer player = (MockPlayer) session.getPlayer();
player.trackSelectionParameters =
TrackSelectionParameters.CREATOR.fromBundle(parameters);
player.trackSelectionParameters = TrackSelectionParameters.fromBundle(parameters);
});
}
@ -951,8 +951,7 @@ public class MediaSessionProviderService extends Service {
@Override
public void notifyTrackSelectionParametersChanged(String sessionId, Bundle parametersBundle)
throws RemoteException {
TrackSelectionParameters parameters =
TrackSelectionParameters.CREATOR.fromBundle(parametersBundle);
TrackSelectionParameters parameters = TrackSelectionParameters.fromBundle(parametersBundle);
runOnHandler(
() -> {
MediaSession session = sessionMap.get(sessionId);