Skip to content

SDK / exoplayer

Go to a project
Commit c9e21e35 by ibaker Committed by Tofunmi Adigun-Hameed
Options

Remove deprecated `onSeekProcessed` 

This change removes it from `Player.Listener` and `AnalyticsListener`,
use `onPositionDiscontinuity` with `DISCONTINUITY_REASON_SEEK` instead.

#minor-release

PiperOrigin-RevId: 534757426
(cherry picked from commit 624ab259f06673940849e71bc335cfa17bcab887)
parent 08d7aa3b
Inline Side-by-side
Showing with 3 additions and 77 deletions
extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
...@@ -392,8 +392,9 @@ public final class CastPlayer extends BasePlayer { ...@@ -392,8 +392,9 @@ public final class CastPlayer extends BasePlayer {
return playWhenReady.value; return playWhenReady.value;
} }
// We still call Listener#onSeekProcessed() for backwards compatibility with listeners that // We still call Listener#onPositionDiscontinuity(@DiscontinuityReason int) for backwards
// don't implement onPositionDiscontinuity(). // compatibility with listeners that don't implement
// onPositionDiscontinuity(PositionInfo, PositionInfo, @DiscontinuityReason int).
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@Override @Override
@VisibleForTesting(otherwise = PROTECTED) @VisibleForTesting(otherwise = PROTECTED)
...@@ -447,8 +448,6 @@ public final class CastPlayer extends BasePlayer { ...@@ -447,8 +448,6 @@ public final class CastPlayer extends BasePlayer {
} }
} }
updateAvailableCommandsAndNotifyIfChanged(); updateAvailableCommandsAndNotifyIfChanged();
} else if (pendingSeekCount == 0) {
listeners.queueEvent(/* eventFlag= */ C.INDEX_UNSET, Listener::onSeekProcessed);
} }
listeners.flushEvents(); listeners.flushEvents();
} }
...@@ -1435,9 +1434,6 @@ public final class CastPlayer extends BasePlayer { ...@@ -1435,9 +1434,6 @@ public final class CastPlayer extends BasePlayer {
private final class SeekResultCallback implements ResultCallback<MediaChannelResult> { private final class SeekResultCallback implements ResultCallback<MediaChannelResult> {
// We still call Listener#onSeekProcessed() for backwards compatibility with listeners that
// don't implement onPositionDiscontinuity().
@SuppressWarnings("deprecation")
@Override @Override
public void onResult(MediaChannelResult result) { public void onResult(MediaChannelResult result) {
int statusCode = result.getStatus().getStatusCode(); int statusCode = result.getStatus().getStatusCode();
...@@ -1450,7 +1446,6 @@ public final class CastPlayer extends BasePlayer { ...@@ -1450,7 +1446,6 @@ public final class CastPlayer extends BasePlayer {
currentWindowIndex = pendingSeekWindowIndex; currentWindowIndex = pendingSeekWindowIndex;
pendingSeekWindowIndex = C.INDEX_UNSET; pendingSeekWindowIndex = C.INDEX_UNSET;
pendingSeekPositionMs = C.TIME_UNSET; pendingSeekPositionMs = C.TIME_UNSET;
listeners.sendEvent(/* eventFlag= */ C.INDEX_UNSET, Listener::onSeekProcessed);
} }
} }
} }
......
library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java
...@@ -1069,12 +1069,6 @@ public class ForwardingPlayer implements Player { ...@@ -1069,12 +1069,6 @@ public class ForwardingPlayer implements Player {
} }
@Override @Override
@SuppressWarnings("deprecation")
public void onSeekProcessed() {
listener.onSeekProcessed();
}
@Override
public void onVideoSizeChanged(VideoSize videoSize) { public void onVideoSizeChanged(VideoSize videoSize) {
listener.onVideoSizeChanged(videoSize); listener.onVideoSizeChanged(videoSize);
} }
......
library/common/src/main/java/com/google/android/exoplayer2/Player.java
...@@ -1011,14 +1011,6 @@ public interface Player { ...@@ -1011,14 +1011,6 @@ public interface Player {
default void onMaxSeekToPreviousPositionChanged(long maxSeekToPreviousPositionMs) {} default void onMaxSeekToPreviousPositionChanged(long maxSeekToPreviousPositionMs) {}
/** /**
* @deprecated Seeks are processed without delay. Listen to {@link
* #onPositionDiscontinuity(PositionInfo, PositionInfo, int)} with reason {@link
* #DISCONTINUITY_REASON_SEEK} instead.
*/
@Deprecated
default void onSeekProcessed() {}
/**
* Called when the audio session ID changes. * Called when the audio session ID changes.
* *
* <p>{@link #onEvents(Player, Events)} will also be called to report this event along with * <p>{@link #onEvents(Player, Events)} will also be called to report this event along with
......
library/common/src/main/java/com/google/android/exoplayer2/SimpleBasePlayer.java
...@@ -3441,9 +3441,6 @@ public abstract class SimpleBasePlayer extends BasePlayer { ...@@ -3441,9 +3441,6 @@ public abstract class SimpleBasePlayer extends BasePlayer {
listeners.queueEvent( listeners.queueEvent(
Player.EVENT_METADATA, listener -> listener.onMetadata(newState.timedMetadata)); Player.EVENT_METADATA, listener -> listener.onMetadata(newState.timedMetadata));
} }
if (positionDiscontinuityReason == Player.DISCONTINUITY_REASON_SEEK) {
listeners.queueEvent(/* eventFlag= */ C.INDEX_UNSET, Listener::onSeekProcessed);
}
if (!previousState.availableCommands.equals(newState.availableCommands)) { if (!previousState.availableCommands.equals(newState.availableCommands)) {
listeners.queueEvent( listeners.queueEvent(
Player.EVENT_AVAILABLE_COMMANDS_CHANGED, Player.EVENT_AVAILABLE_COMMANDS_CHANGED,
......
library/common/src/test/java/com/google/android/exoplayer2/SimpleBasePlayerTest.java
...@@ -1402,7 +1402,6 @@ public class SimpleBasePlayerTest { ...@@ -1402,7 +1402,6 @@ public class SimpleBasePlayerTest {
/* adIndexInAdGroup= */ C.INDEX_UNSET), /* adIndexInAdGroup= */ C.INDEX_UNSET),
Player.DISCONTINUITY_REASON_SEEK); Player.DISCONTINUITY_REASON_SEEK);
verify(listener).onMediaItemTransition(mediaItem1, Player.MEDIA_ITEM_TRANSITION_REASON_SEEK); verify(listener).onMediaItemTransition(mediaItem1, Player.MEDIA_ITEM_TRANSITION_REASON_SEEK);
verify(listener).onSeekProcessed();
verify(listener) verify(listener)
.onEvents( .onEvents(
player, player,
...@@ -6918,7 +6917,6 @@ public class SimpleBasePlayerTest { ...@@ -6918,7 +6917,6 @@ public class SimpleBasePlayerTest {
verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK); verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK);
verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK)); verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK));
verify(listener).onMediaItemTransition(newMediaItem, Player.MEDIA_ITEM_TRANSITION_REASON_SEEK); verify(listener).onMediaItemTransition(newMediaItem, Player.MEDIA_ITEM_TRANSITION_REASON_SEEK);
verify(listener).onSeekProcessed();
verifyNoMoreInteractions(listener); verifyNoMoreInteractions(listener);
} }
...@@ -6969,7 +6967,6 @@ public class SimpleBasePlayerTest { ...@@ -6969,7 +6967,6 @@ public class SimpleBasePlayerTest {
verify(listener).onMediaItemTransition(newMediaItem, Player.MEDIA_ITEM_TRANSITION_REASON_SEEK); verify(listener).onMediaItemTransition(newMediaItem, Player.MEDIA_ITEM_TRANSITION_REASON_SEEK);
verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK); verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK);
verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK)); verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK));
verify(listener).onSeekProcessed();
verifyNoMoreInteractions(listener); verifyNoMoreInteractions(listener);
future.set(null); future.set(null);
...@@ -7029,7 +7026,6 @@ public class SimpleBasePlayerTest { ...@@ -7029,7 +7026,6 @@ public class SimpleBasePlayerTest {
verify(listener).onMediaItemTransition(newMediaItem, Player.MEDIA_ITEM_TRANSITION_REASON_SEEK); verify(listener).onMediaItemTransition(newMediaItem, Player.MEDIA_ITEM_TRANSITION_REASON_SEEK);
verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK); verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK);
verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK)); verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK));
verify(listener).onSeekProcessed();
verifyNoMoreInteractions(listener); verifyNoMoreInteractions(listener);
future.set(null); future.set(null);
...@@ -7081,7 +7077,6 @@ public class SimpleBasePlayerTest { ...@@ -7081,7 +7077,6 @@ public class SimpleBasePlayerTest {
assertThat(player.getTotalBufferedDuration()).isEqualTo(0); assertThat(player.getTotalBufferedDuration()).isEqualTo(0);
verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK); verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK);
verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK)); verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK));
verify(listener).onSeekProcessed();
verifyNoMoreInteractions(listener); verifyNoMoreInteractions(listener);
future.set(null); future.set(null);
...@@ -7133,7 +7128,6 @@ public class SimpleBasePlayerTest { ...@@ -7133,7 +7128,6 @@ public class SimpleBasePlayerTest {
assertThat(player.getTotalBufferedDuration()).isEqualTo(0); assertThat(player.getTotalBufferedDuration()).isEqualTo(0);
verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK); verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK);
verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK)); verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK));
verify(listener).onSeekProcessed();
verifyNoMoreInteractions(listener); verifyNoMoreInteractions(listener);
future.set(null); future.set(null);
...@@ -7185,7 +7179,6 @@ public class SimpleBasePlayerTest { ...@@ -7185,7 +7179,6 @@ public class SimpleBasePlayerTest {
assertThat(player.getTotalBufferedDuration()).isEqualTo(0); assertThat(player.getTotalBufferedDuration()).isEqualTo(0);
verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK); verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK);
verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK)); verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK));
verify(listener).onSeekProcessed();
verifyNoMoreInteractions(listener); verifyNoMoreInteractions(listener);
future.set(null); future.set(null);
...@@ -7237,7 +7230,6 @@ public class SimpleBasePlayerTest { ...@@ -7237,7 +7230,6 @@ public class SimpleBasePlayerTest {
assertThat(player.getTotalBufferedDuration()).isEqualTo(7000); assertThat(player.getTotalBufferedDuration()).isEqualTo(7000);
verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK); verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK);
verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK)); verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK));
verify(listener).onSeekProcessed();
verifyNoMoreInteractions(listener); verifyNoMoreInteractions(listener);
future.set(null); future.set(null);
...@@ -7289,7 +7281,6 @@ public class SimpleBasePlayerTest { ...@@ -7289,7 +7281,6 @@ public class SimpleBasePlayerTest {
assertThat(player.getTotalBufferedDuration()).isEqualTo(3000); assertThat(player.getTotalBufferedDuration()).isEqualTo(3000);
verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK); verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK);
verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK)); verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK));
verify(listener).onSeekProcessed();
verifyNoMoreInteractions(listener); verifyNoMoreInteractions(listener);
future.set(null); future.set(null);
...@@ -7347,7 +7338,6 @@ public class SimpleBasePlayerTest { ...@@ -7347,7 +7338,6 @@ public class SimpleBasePlayerTest {
verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK); verify(listener).onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK);
verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK)); verify(listener).onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_SEEK));
verify(listener).onMediaItemTransition(mediaItem, Player.MEDIA_ITEM_TRANSITION_REASON_SEEK); verify(listener).onMediaItemTransition(mediaItem, Player.MEDIA_ITEM_TRANSITION_REASON_SEEK);
verify(listener).onSeekProcessed();
verifyNoMoreInteractions(listener); verifyNoMoreInteractions(listener);
future.set(null); future.set(null);
......
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
...@@ -536,7 +536,6 @@ import java.util.concurrent.TimeoutException; ...@@ -536,7 +536,6 @@ import java.util.concurrent.TimeoutException;
playbackInfo, playbackInfo,
/* ignored */ TIMELINE_CHANGE_REASON_SOURCE_UPDATE, /* ignored */ TIMELINE_CHANGE_REASON_SOURCE_UPDATE,
/* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST, /* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST,
/* seekProcessed= */ false,
/* positionDiscontinuity= */ false, /* positionDiscontinuity= */ false,
/* ignored */ DISCONTINUITY_REASON_INTERNAL, /* ignored */ DISCONTINUITY_REASON_INTERNAL,
/* ignored */ C.TIME_UNSET, /* ignored */ C.TIME_UNSET,
...@@ -655,7 +654,6 @@ import java.util.concurrent.TimeoutException; ...@@ -655,7 +654,6 @@ import java.util.concurrent.TimeoutException;
newPlaybackInfo, newPlaybackInfo,
/* timelineChangeReason= */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED, /* timelineChangeReason= */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED,
/* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST, /* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST,
/* seekProcessed= */ false,
/* positionDiscontinuity= */ false, /* positionDiscontinuity= */ false,
/* ignored */ DISCONTINUITY_REASON_INTERNAL, /* ignored */ DISCONTINUITY_REASON_INTERNAL,
/* ignored */ C.TIME_UNSET, /* ignored */ C.TIME_UNSET,
...@@ -680,7 +678,6 @@ import java.util.concurrent.TimeoutException; ...@@ -680,7 +678,6 @@ import java.util.concurrent.TimeoutException;
newPlaybackInfo, newPlaybackInfo,
/* timelineChangeReason= */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED, /* timelineChangeReason= */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED,
/* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST, /* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST,
/* seekProcessed= */ false,
positionDiscontinuity, positionDiscontinuity,
DISCONTINUITY_REASON_REMOVE, DISCONTINUITY_REASON_REMOVE,
/* discontinuityWindowStartPositionUs= */ getCurrentPositionUsInternal(newPlaybackInfo), /* discontinuityWindowStartPositionUs= */ getCurrentPositionUsInternal(newPlaybackInfo),
...@@ -717,7 +714,6 @@ import java.util.concurrent.TimeoutException; ...@@ -717,7 +714,6 @@ import java.util.concurrent.TimeoutException;
newPlaybackInfo, newPlaybackInfo,
/* timelineChangeReason= */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED, /* timelineChangeReason= */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED,
/* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST, /* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST,
/* seekProcessed= */ false,
/* positionDiscontinuity= */ false, /* positionDiscontinuity= */ false,
/* ignored */ DISCONTINUITY_REASON_INTERNAL, /* ignored */ DISCONTINUITY_REASON_INTERNAL,
/* ignored */ C.TIME_UNSET, /* ignored */ C.TIME_UNSET,
...@@ -742,7 +738,6 @@ import java.util.concurrent.TimeoutException; ...@@ -742,7 +738,6 @@ import java.util.concurrent.TimeoutException;
newPlaybackInfo, newPlaybackInfo,
/* timelineChangeReason= */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED, /* timelineChangeReason= */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED,
/* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST, /* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST,
/* seekProcessed= */ false,
/* positionDiscontinuity= */ false, /* positionDiscontinuity= */ false,
/* ignored */ DISCONTINUITY_REASON_INTERNAL, /* ignored */ DISCONTINUITY_REASON_INTERNAL,
/* ignored */ C.TIME_UNSET, /* ignored */ C.TIME_UNSET,
...@@ -867,7 +862,6 @@ import java.util.concurrent.TimeoutException; ...@@ -867,7 +862,6 @@ import java.util.concurrent.TimeoutException;
newPlaybackInfo, newPlaybackInfo,
/* ignored */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED, /* ignored */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED,
/* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST, /* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST,
/* seekProcessed= */ true,
/* positionDiscontinuity= */ true, /* positionDiscontinuity= */ true,
/* positionDiscontinuityReason= */ DISCONTINUITY_REASON_SEEK, /* positionDiscontinuityReason= */ DISCONTINUITY_REASON_SEEK,
/* discontinuityWindowStartPositionUs= */ getCurrentPositionUsInternal(newPlaybackInfo), /* discontinuityWindowStartPositionUs= */ getCurrentPositionUsInternal(newPlaybackInfo),
...@@ -909,7 +903,6 @@ import java.util.concurrent.TimeoutException; ...@@ -909,7 +903,6 @@ import java.util.concurrent.TimeoutException;
newPlaybackInfo, newPlaybackInfo,
/* ignored */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED, /* ignored */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED,
/* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST, /* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST,
/* seekProcessed= */ false,
/* positionDiscontinuity= */ false, /* positionDiscontinuity= */ false,
/* ignored */ DISCONTINUITY_REASON_INTERNAL, /* ignored */ DISCONTINUITY_REASON_INTERNAL,
/* ignored */ C.TIME_UNSET, /* ignored */ C.TIME_UNSET,
...@@ -1823,7 +1816,6 @@ import java.util.concurrent.TimeoutException; ...@@ -1823,7 +1816,6 @@ import java.util.concurrent.TimeoutException;
playbackInfo, playbackInfo,
/* ignored */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED, /* ignored */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED,
/* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST, /* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST,
/* seekProcessed= */ false,
/* positionDiscontinuity= */ false, /* positionDiscontinuity= */ false,
/* ignored */ DISCONTINUITY_REASON_INTERNAL, /* ignored */ DISCONTINUITY_REASON_INTERNAL,
/* ignored */ C.TIME_UNSET, /* ignored */ C.TIME_UNSET,
...@@ -1924,7 +1916,6 @@ import java.util.concurrent.TimeoutException; ...@@ -1924,7 +1916,6 @@ import java.util.concurrent.TimeoutException;
playbackInfoUpdate.playbackInfo, playbackInfoUpdate.playbackInfo,
TIMELINE_CHANGE_REASON_SOURCE_UPDATE, TIMELINE_CHANGE_REASON_SOURCE_UPDATE,
pendingPlayWhenReadyChangeReason, pendingPlayWhenReadyChangeReason,
/* seekProcessed= */ false,
positionDiscontinuity, positionDiscontinuity,
pendingDiscontinuityReason, pendingDiscontinuityReason,
discontinuityWindowStartPositionUs, discontinuityWindowStartPositionUs,
...@@ -1939,7 +1930,6 @@ import java.util.concurrent.TimeoutException; ...@@ -1939,7 +1930,6 @@ import java.util.concurrent.TimeoutException;
PlaybackInfo playbackInfo, PlaybackInfo playbackInfo,
@TimelineChangeReason int timelineChangeReason, @TimelineChangeReason int timelineChangeReason,
@PlayWhenReadyChangeReason int playWhenReadyChangeReason, @PlayWhenReadyChangeReason int playWhenReadyChangeReason,
boolean seekProcessed,
boolean positionDiscontinuity, boolean positionDiscontinuity,
@DiscontinuityReason int positionDiscontinuityReason, @DiscontinuityReason int positionDiscontinuityReason,
long discontinuityWindowStartPositionUs, long discontinuityWindowStartPositionUs,
...@@ -2088,9 +2078,6 @@ import java.util.concurrent.TimeoutException; ...@@ -2088,9 +2078,6 @@ import java.util.concurrent.TimeoutException;
Player.EVENT_PLAYBACK_PARAMETERS_CHANGED, Player.EVENT_PLAYBACK_PARAMETERS_CHANGED,
listener -> listener.onPlaybackParametersChanged(newPlaybackInfo.playbackParameters)); listener -> listener.onPlaybackParametersChanged(newPlaybackInfo.playbackParameters));
} }
if (seekProcessed) {
listeners.queueEvent(/* eventFlag= */ C.INDEX_UNSET, Listener::onSeekProcessed);
}
updateAvailableCommands(); updateAvailableCommands();
listeners.flushEvents(); listeners.flushEvents();
...@@ -2312,7 +2299,6 @@ import java.util.concurrent.TimeoutException; ...@@ -2312,7 +2299,6 @@ import java.util.concurrent.TimeoutException;
newPlaybackInfo, newPlaybackInfo,
/* timelineChangeReason= */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED, /* timelineChangeReason= */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED,
/* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST, /* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST,
/* seekProcessed= */ false,
/* positionDiscontinuity= */ positionDiscontinuity, /* positionDiscontinuity= */ positionDiscontinuity,
DISCONTINUITY_REASON_REMOVE, DISCONTINUITY_REASON_REMOVE,
/* discontinuityWindowStartPositionUs= */ getCurrentPositionUsInternal(newPlaybackInfo), /* discontinuityWindowStartPositionUs= */ getCurrentPositionUsInternal(newPlaybackInfo),
...@@ -2734,7 +2720,6 @@ import java.util.concurrent.TimeoutException; ...@@ -2734,7 +2720,6 @@ import java.util.concurrent.TimeoutException;
playbackInfo, playbackInfo,
/* ignored */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED, /* ignored */ TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED,
playWhenReadyChangeReason, playWhenReadyChangeReason,
/* seekProcessed= */ false,
/* positionDiscontinuity= */ false, /* positionDiscontinuity= */ false,
/* ignored */ DISCONTINUITY_REASON_INTERNAL, /* ignored */ DISCONTINUITY_REASON_INTERNAL,
/* ignored */ C.TIME_UNSET, /* ignored */ C.TIME_UNSET,
......
library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
...@@ -603,13 +603,6 @@ public interface AnalyticsListener { ...@@ -603,13 +603,6 @@ public interface AnalyticsListener {
default void onSeekStarted(EventTime eventTime) {} default void onSeekStarted(EventTime eventTime) {}
/** /**
* @deprecated Seeks are processed without delay. Use {@link #onPositionDiscontinuity(EventTime,
* int)} with reason {@link Player#DISCONTINUITY_REASON_SEEK} instead.
*/
@Deprecated
default void onSeekProcessed(EventTime eventTime) {}
/**
* Called when the playback parameters changed. * Called when the playback parameters changed.
* *
* @param eventTime The event time. * @param eventTime The event time.
......
library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollector.java
...@@ -709,14 +709,6 @@ public class DefaultAnalyticsCollector implements AnalyticsCollector { ...@@ -709,14 +709,6 @@ public class DefaultAnalyticsCollector implements AnalyticsCollector {
eventTime, AnalyticsListener.EVENT_CUES, listener -> listener.onCues(eventTime, cueGroup)); eventTime, AnalyticsListener.EVENT_CUES, listener -> listener.onCues(eventTime, cueGroup));
} }
@SuppressWarnings("deprecation") // Implementing and calling deprecated listener method.
@Override
public final void onSeekProcessed() {
EventTime eventTime = generateCurrentPlayerMediaPeriodEventTime();
sendEvent(
eventTime, /* eventFlag= */ C.INDEX_UNSET, listener -> listener.onSeekProcessed(eventTime));
}
@Override @Override
public final void onSkipSilenceEnabledChanged(boolean skipSilenceEnabled) { public final void onSkipSilenceEnabledChanged(boolean skipSilenceEnabled) {
EventTime eventTime = generateReadingMediaPeriodEventTime(); EventTime eventTime = generateReadingMediaPeriodEventTime();
......
library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollectorTest.java
...@@ -147,7 +147,6 @@ public final class DefaultAnalyticsCollectorTest { ...@@ -147,7 +147,6 @@ public final class DefaultAnalyticsCollectorTest {
// Deprecated event constants. // Deprecated event constants.
private static final long EVENT_PLAYER_STATE_CHANGED = 1L << 63; private static final long EVENT_PLAYER_STATE_CHANGED = 1L << 63;
private static final long EVENT_SEEK_STARTED = 1L << 62; private static final long EVENT_SEEK_STARTED = 1L << 62;
private static final long EVENT_SEEK_PROCESSED = 1L << 61;
private static final UUID DRM_SCHEME_UUID = private static final UUID DRM_SCHEME_UUID =
UUID.nameUUIDFromBytes(TestUtil.createByteArray(7, 8, 9)); UUID.nameUUIDFromBytes(TestUtil.createByteArray(7, 8, 9));
...@@ -471,7 +470,6 @@ public final class DefaultAnalyticsCollectorTest { ...@@ -471,7 +470,6 @@ public final class DefaultAnalyticsCollectorTest {
.inOrder(); .inOrder();
assertThat(listener.getEvents(EVENT_POSITION_DISCONTINUITY)).containsExactly(period1); assertThat(listener.getEvents(EVENT_POSITION_DISCONTINUITY)).containsExactly(period1);
assertThat(listener.getEvents(EVENT_SEEK_STARTED)).containsExactly(period0); assertThat(listener.getEvents(EVENT_SEEK_STARTED)).containsExactly(period0);
assertThat(listener.getEvents(EVENT_SEEK_PROCESSED)).containsExactly(period1);
assertThat(listener.getEvents(EVENT_IS_LOADING_CHANGED)) assertThat(listener.getEvents(EVENT_IS_LOADING_CHANGED))
.containsExactly(period0, period0) .containsExactly(period0, period0)
.inOrder(); .inOrder();
...@@ -562,7 +560,6 @@ public final class DefaultAnalyticsCollectorTest { ...@@ -562,7 +560,6 @@ public final class DefaultAnalyticsCollectorTest {
.containsExactly(period0, period1Seq2) .containsExactly(period0, period1Seq2)
.inOrder(); .inOrder();
assertThat(listener.getEvents(EVENT_SEEK_STARTED)).containsExactly(period0); assertThat(listener.getEvents(EVENT_SEEK_STARTED)).containsExactly(period0);
assertThat(listener.getEvents(EVENT_SEEK_PROCESSED)).containsExactly(period0);
assertThat(listener.getEvents(EVENT_IS_LOADING_CHANGED)) assertThat(listener.getEvents(EVENT_IS_LOADING_CHANGED))
.containsExactly(period0, period0, period0, period0) .containsExactly(period0, period0, period0, period0)
.inOrder(); .inOrder();
...@@ -763,7 +760,6 @@ public final class DefaultAnalyticsCollectorTest { ...@@ -763,7 +760,6 @@ public final class DefaultAnalyticsCollectorTest {
.containsExactly(WINDOW_0 /* prepared */, WINDOW_0 /* prepared */); .containsExactly(WINDOW_0 /* prepared */, WINDOW_0 /* prepared */);
assertThat(listener.getEvents(EVENT_POSITION_DISCONTINUITY)).containsExactly(period0Seq0); assertThat(listener.getEvents(EVENT_POSITION_DISCONTINUITY)).containsExactly(period0Seq0);
assertThat(listener.getEvents(EVENT_SEEK_STARTED)).containsExactly(period0Seq0); assertThat(listener.getEvents(EVENT_SEEK_STARTED)).containsExactly(period0Seq0);
assertThat(listener.getEvents(EVENT_SEEK_PROCESSED)).containsExactly(period0Seq0);
assertThat(listener.getEvents(EVENT_IS_LOADING_CHANGED)) assertThat(listener.getEvents(EVENT_IS_LOADING_CHANGED))
.containsExactly(period0Seq0, period0Seq0, period0Seq0, period0Seq0); .containsExactly(period0Seq0, period0Seq0, period0Seq0, period0Seq0);
assertThat(listener.getEvents(EVENT_PLAYER_ERROR)).containsExactly(period0Seq0); assertThat(listener.getEvents(EVENT_PLAYER_ERROR)).containsExactly(period0Seq0);
...@@ -1293,7 +1289,6 @@ public final class DefaultAnalyticsCollectorTest { ...@@ -1293,7 +1289,6 @@ public final class DefaultAnalyticsCollectorTest {
contentAfterMidroll /* ad transition */) contentAfterMidroll /* ad transition */)
.inOrder(); .inOrder();
assertThat(listener.getEvents(EVENT_SEEK_STARTED)).containsExactly(contentBeforeMidroll); assertThat(listener.getEvents(EVENT_SEEK_STARTED)).containsExactly(contentBeforeMidroll);
assertThat(listener.getEvents(EVENT_SEEK_PROCESSED)).containsExactly(contentAfterMidroll);
assertThat(listener.getEvents(EVENT_IS_LOADING_CHANGED)) assertThat(listener.getEvents(EVENT_IS_LOADING_CHANGED))
.containsExactly(contentBeforeMidroll, contentBeforeMidroll, midrollAd, midrollAd) .containsExactly(contentBeforeMidroll, contentBeforeMidroll, midrollAd, midrollAd)
.inOrder(); .inOrder();
...@@ -1360,7 +1355,6 @@ public final class DefaultAnalyticsCollectorTest { ...@@ -1360,7 +1355,6 @@ public final class DefaultAnalyticsCollectorTest {
populateEventIds(listener.lastReportedTimeline); populateEventIds(listener.lastReportedTimeline);
assertThat(listener.getEvents(EVENT_SEEK_STARTED)).containsExactly(period0); assertThat(listener.getEvents(EVENT_SEEK_STARTED)).containsExactly(period0);
assertThat(listener.getEvents(EVENT_SEEK_PROCESSED)).containsExactly(period0);
} }
@Test @Test
...@@ -2124,12 +2118,6 @@ public final class DefaultAnalyticsCollectorTest { ...@@ -2124,12 +2118,6 @@ public final class DefaultAnalyticsCollectorTest {
reportedEvents.add(new ReportedEvent(EVENT_SEEK_STARTED, eventTime)); reportedEvents.add(new ReportedEvent(EVENT_SEEK_STARTED, eventTime));
} }
@SuppressWarnings("deprecation") // Testing deprecated behaviour.
@Override
public void onSeekProcessed(EventTime eventTime) {
reportedEvents.add(new ReportedEvent(EVENT_SEEK_PROCESSED, eventTime));
}
@Override @Override
public void onPlaybackParametersChanged( public void onPlaybackParametersChanged(
EventTime eventTime, PlaybackParameters playbackParameters) { EventTime eventTime, PlaybackParameters playbackParameters) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment