From c4a93b6420a7348e22d94e6546b3a101b80e9d72 Mon Sep 17 00:00:00 2001 From: tonihei Date: Fri, 27 Mar 2020 10:47:52 +0000 Subject: [PATCH] Simplify/avoid usages of onSeekProcessed in ExoPlayer code. This callback will be deprecated, so moving all usages to better callbacks. Some usages are still remaining that are less straight-forward to update. PiperOrigin-RevId: 303298834 --- .../exoplayer2/analytics/AnalyticsCollector.java | 12 ++++++------ .../google/android/exoplayer2/util/EventLogger.java | 5 ----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java index 82201ca24e..2af577fc4b 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java @@ -522,6 +522,9 @@ public class AnalyticsCollector @Override public final void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) { + if (reason == Player.DISCONTINUITY_REASON_SEEK) { + isSeeking = false; + } mediaPeriodQueueTracker.onPositionDiscontinuity(Assertions.checkNotNull(player)); EventTime eventTime = generateCurrentPlayerMediaPeriodEventTime(); for (AnalyticsListener listener : listeners) { @@ -553,12 +556,9 @@ public class AnalyticsCollector @Override public final void onSeekProcessed() { - if (isSeeking) { - isSeeking = false; - EventTime eventTime = generateCurrentPlayerMediaPeriodEventTime(); - for (AnalyticsListener listener : listeners) { - listener.onSeekProcessed(eventTime); - } + EventTime eventTime = generateCurrentPlayerMediaPeriodEventTime(); + for (AnalyticsListener listener : listeners) { + listener.onSeekProcessed(eventTime); } } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java b/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java index 494ada5382..3136556f2c 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java @@ -289,11 +289,6 @@ public class EventLogger implements AnalyticsListener { logd("]"); } - @Override - public void onSeekProcessed(EventTime eventTime) { - logd(eventTime, "seekProcessed"); - } - @Override public void onMetadata(EventTime eventTime, Metadata metadata) { logd("metadata [" + getEventTimeString(eventTime));