From e5e984f4c693eaeb25faaeffe25f1700e8501bd0 Mon Sep 17 00:00:00 2001 From: olly Date: Tue, 24 Oct 2017 02:27:10 -0700 Subject: [PATCH] Re-order events into more of a natural ordering ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=173232494 --- .../android/exoplayer2/ExoPlayerImpl.java | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java index d1c643c05b..13829e2e9d 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java @@ -472,6 +472,30 @@ import java.util.concurrent.CopyOnWriteArraySet; } break; } + case ExoPlayerImplInternal.MSG_SOURCE_INFO_REFRESHED: { + SourceInfo sourceInfo = (SourceInfo) msg.obj; + pendingSeekAcks -= sourceInfo.seekAcks; + if (pendingPrepareAcks == 0) { + timeline = sourceInfo.timeline; + manifest = sourceInfo.manifest; + playbackInfo = sourceInfo.playbackInfo; + if (pendingSeekAcks == 0 && timeline.isEmpty()) { + // Update the masking variables, which are used when the timeline is empty. + maskingPeriodIndex = 0; + maskingWindowIndex = 0; + maskingWindowPositionMs = 0; + } + for (Player.EventListener listener : listeners) { + listener.onTimelineChanged(timeline, manifest); + } + } + if (pendingSeekAcks == 0 && sourceInfo.seekAcks > 0) { + for (Player.EventListener listener : listeners) { + listener.onSeekProcessed(); + } + } + break; + } case ExoPlayerImplInternal.MSG_TRACKS_CHANGED: { if (pendingPrepareAcks == 0) { TrackSelectorResult trackSelectorResult = (TrackSelectorResult) msg.obj; @@ -512,30 +536,6 @@ import java.util.concurrent.CopyOnWriteArraySet; } break; } - case ExoPlayerImplInternal.MSG_SOURCE_INFO_REFRESHED: { - SourceInfo sourceInfo = (SourceInfo) msg.obj; - pendingSeekAcks -= sourceInfo.seekAcks; - if (pendingPrepareAcks == 0) { - timeline = sourceInfo.timeline; - manifest = sourceInfo.manifest; - playbackInfo = sourceInfo.playbackInfo; - if (pendingSeekAcks == 0 && timeline.isEmpty()) { - // Update the masking variables, which are used when the timeline is empty. - maskingPeriodIndex = 0; - maskingWindowIndex = 0; - maskingWindowPositionMs = 0; - } - for (Player.EventListener listener : listeners) { - listener.onTimelineChanged(timeline, manifest); - } - } - if (pendingSeekAcks == 0 && sourceInfo.seekAcks > 0) { - for (Player.EventListener listener : listeners) { - listener.onSeekProcessed(); - } - } - break; - } case ExoPlayerImplInternal.MSG_PLAYBACK_PARAMETERS_CHANGED: { PlaybackParameters playbackParameters = (PlaybackParameters) msg.obj; if (!this.playbackParameters.equals(playbackParameters)) {