From 527563da31e9d1b4abcdb38591d02d9fc51f7b93 Mon Sep 17 00:00:00 2001 From: bachinger Date: Wed, 11 Mar 2020 23:45:11 +0000 Subject: [PATCH] remove deprecated usage of PlaybackParameter Removes usage of PlaybackParameters where it seems to be trivial. PiperOrigin-RevId: 300435199 --- .../ext/mediasession/MediaSessionConnector.java | 11 +++++------ .../exoplayer2/analytics/PlaybackStatsListener.java | 7 +++---- .../android/exoplayer2/ui/PlayerControlView.java | 2 +- .../exoplayer2/ui/PlayerNotificationManager.java | 3 +-- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java index 61b82347ea..913c1d86c0 100644 --- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java +++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java @@ -38,7 +38,6 @@ import com.google.android.exoplayer2.ControlDispatcher; import com.google.android.exoplayer2.DefaultControlDispatcher; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayerLibraryInfo; -import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.util.Assertions; @@ -129,7 +128,7 @@ public final class MediaSessionConnector { /** * The name of the {@link PlaybackStateCompat} float extra with the value of {@link - * PlaybackParameters#speed}. + * Player#getPlaybackSpeed()}. */ public static final String EXTRAS_SPEED = "EXO_SPEED"; @@ -766,9 +765,9 @@ public final class MediaSessionConnector { queueNavigator != null ? queueNavigator.getActiveQueueItemId(player) : MediaSessionCompat.QueueItem.UNKNOWN_ID; - PlaybackParameters playbackParameters = player.getPlaybackParameters(); - extras.putFloat(EXTRAS_SPEED, playbackParameters.speed); - float sessionPlaybackSpeed = player.isPlaying() ? playbackParameters.speed : 0f; + float playbackSpeed = player.getPlaybackSpeed(); + extras.putFloat(EXTRAS_SPEED, playbackSpeed); + float sessionPlaybackSpeed = player.isPlaying() ? playbackSpeed : 0f; builder .setActions(buildPrepareActions() | buildPlaybackActions(player)) .setActiveQueueItemId(activeQueueItemId) @@ -1133,7 +1132,7 @@ public final class MediaSessionConnector { } @Override - public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) { + public void onPlaybackSpeedChanged(float playbackSpeed) { invalidateMediaSessionPlaybackState(); } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java index 350822fc36..8b4e907482 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java @@ -20,7 +20,6 @@ import androidx.annotation.Nullable; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.Format; -import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline.Period; @@ -133,6 +132,7 @@ public final class PlaybackStatsListener */ @Nullable public PlaybackStats getPlaybackStats() { + @Nullable PlaybackStatsTracker activeStatsTracker = activeAdPlayback != null ? playbackStatsTrackers.get(activeAdPlayback) @@ -323,9 +323,8 @@ public final class PlaybackStatsListener } @Override - public void onPlaybackParametersChanged( - EventTime eventTime, PlaybackParameters playbackParameters) { - playbackSpeed = playbackParameters.speed; + public void onPlaybackSpeedChanged(EventTime eventTime, float playbackSpeed) { + this.playbackSpeed = playbackSpeed; sessionManager.updateSessions(eventTime); for (PlaybackStatsTracker tracker : playbackStatsTrackers.values()) { tracker.onPlaybackSpeedChanged(eventTime, playbackSpeed); diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java index 341381b8de..778f033f0c 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java @@ -1008,7 +1008,7 @@ public class PlayerControlView extends FrameLayout { mediaTimeDelayMs = Math.min(mediaTimeDelayMs, mediaTimeUntilNextFullSecondMs); // Calculate the delay until the next update in real time, taking playbackSpeed into account. - float playbackSpeed = player.getPlaybackParameters().speed; + float playbackSpeed = player.getPlaybackSpeed(); long delayMs = playbackSpeed > 0 ? (long) (mediaTimeDelayMs / playbackSpeed) : MAX_UPDATE_INTERVAL_MS; diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java index 42fcd50c58..ca1406727a 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java @@ -37,7 +37,6 @@ import androidx.media.app.NotificationCompat.MediaStyle; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ControlDispatcher; import com.google.android.exoplayer2.DefaultControlDispatcher; -import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.PlaybackPreparer; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Timeline; @@ -1333,7 +1332,7 @@ public class PlayerNotificationManager { } @Override - public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) { + public void onPlaybackSpeedChanged(float playbackSpeed) { postStartOrUpdateNotification(); }