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) { if (savedInstanceState != null) {
trackSelectionParameters = trackSelectionParameters =
TrackSelectionParameters.CREATOR.fromBundle( TrackSelectionParameters.fromBundle(
savedInstanceState.getBundle(KEY_TRACK_SELECTION_PARAMETERS)); savedInstanceState.getBundle(KEY_TRACK_SELECTION_PARAMETERS));
startAutoPlay = savedInstanceState.getBoolean(KEY_AUTO_PLAY); startAutoPlay = savedInstanceState.getBoolean(KEY_AUTO_PLAY);
startItemIndex = savedInstanceState.getInt(KEY_ITEM_INDEX); 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(); new TrackSelectionParameters.Builder(getApplicationContext()).addOverride(override).build();
TrackSelectionParameters fromBundle = TrackSelectionParameters fromBundle =
TrackSelectionParameters.CREATOR.fromBundle(trackSelectionParameters.toBundle()); TrackSelectionParameters.fromBundle(trackSelectionParameters.toBundle());
assertThat(fromBundle).isEqualTo(trackSelectionParameters); assertThat(fromBundle).isEqualTo(trackSelectionParameters);
assertThat(trackSelectionParameters.overrides) 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; TrackSelectionParameters trackSelectionParameters;
try { try {
trackSelectionParameters = trackSelectionParameters =
TrackSelectionParameters.CREATOR.fromBundle(trackSelectionParametersBundle); TrackSelectionParameters.fromBundle(trackSelectionParametersBundle);
} catch (RuntimeException e) { } catch (RuntimeException e) {
Log.w(TAG, "Ignoring malformed Bundle for TrackSelectionParameters", e); Log.w(TAG, "Ignoring malformed Bundle for TrackSelectionParameters", e);
return; 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); bundle.getLong(keyForField(FIELD_SEEK_FORWARD_INCREMENT_MS), /* defaultValue= */ 0);
long maxSeekToPreviousPosition = long maxSeekToPreviousPosition =
bundle.getLong(keyForField(FIELD_MAX_SEEK_TO_PREVIOUS_POSITION_MS), /* defaultValue= */ 0); bundle.getLong(keyForField(FIELD_MAX_SEEK_TO_PREVIOUS_POSITION_MS), /* defaultValue= */ 0);
@Nullable
Bundle trackSelectionParametersBundle =
bundle.getBundle(keyForField(FIELD_TRACK_SELECTION_PARAMETERS));
TrackSelectionParameters trackSelectionParameters = TrackSelectionParameters trackSelectionParameters =
BundleableUtil.fromNullableBundle( trackSelectionParametersBundle == null
TrackSelectionParameters.CREATOR, ? TrackSelectionParameters.DEFAULT_WITHOUT_CONTEXT
bundle.getBundle(keyForField(FIELD_TRACK_SELECTION_PARAMETERS)), : TrackSelectionParameters.fromBundle(trackSelectionParametersBundle);
TrackSelectionParameters.DEFAULT_WITHOUT_CONTEXT);
return new PlayerInfo( return new PlayerInfo(
playerError, playerError,
mediaItemTransitionReason, 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( runOnHandler(
() -> { () -> {
MediaController controller = mediaControllerMap.get(controllerId); MediaController controller = mediaControllerMap.get(controllerId);
controller.setTrackSelectionParameters( controller.setTrackSelectionParameters(TrackSelectionParameters.fromBundle(parameters));
TrackSelectionParameters.CREATOR.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); MediaMetadata.CREATOR, config.getBundle(KEY_MEDIA_METADATA), player.mediaMetadata);
player.maxSeekToPreviousPositionMs = player.maxSeekToPreviousPositionMs =
config.getLong(KEY_MAX_SEEK_TO_PREVIOUS_POSITION_MS, 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 = player.trackSelectionParameters =
BundleableUtil.fromNullableBundle( TrackSelectionParameters.fromBundle(trackSelectionParametersBundle);
TrackSelectionParameters.CREATOR, }
config.getBundle(KEY_TRACK_SELECTION_PARAMETERS),
player.trackSelectionParameters);
return player; return player;
} }
@ -770,8 +771,7 @@ public class MediaSessionProviderService extends Service {
() -> { () -> {
MediaSession session = sessionMap.get(sessionId); MediaSession session = sessionMap.get(sessionId);
MockPlayer player = (MockPlayer) session.getPlayer(); MockPlayer player = (MockPlayer) session.getPlayer();
player.trackSelectionParameters = player.trackSelectionParameters = TrackSelectionParameters.fromBundle(parameters);
TrackSelectionParameters.CREATOR.fromBundle(parameters);
}); });
} }
@ -951,8 +951,7 @@ public class MediaSessionProviderService extends Service {
@Override @Override
public void notifyTrackSelectionParametersChanged(String sessionId, Bundle parametersBundle) public void notifyTrackSelectionParametersChanged(String sessionId, Bundle parametersBundle)
throws RemoteException { throws RemoteException {
TrackSelectionParameters parameters = TrackSelectionParameters parameters = TrackSelectionParameters.fromBundle(parametersBundle);
TrackSelectionParameters.CREATOR.fromBundle(parametersBundle);
runOnHandler( runOnHandler(
() -> { () -> {
MediaSession session = sessionMap.get(sessionId); MediaSession session = sessionMap.get(sessionId);