Fix for google issue google#9347 and our WSIPCL11050 (google#170)

Once the MaskingMediaPeriod completes `prepare()` (when the masked HlsMediaPeriod reports the first real Timeline with a duration and window start position) it should not use it again. The bug is a track selection causes a jump to live if you are at position 0 in the timeline, even after playback was started from the live point (the prepare position override).
psharma676 · Sep 2, 2021 · 109232e · 109232e
1 parent 05d9ee2
commit 109232e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MaskingMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MaskingMediaPeriod.java
@@ -178,10 +178,6 @@ public long selectTracks(
       @NullableType SampleStream[] streams,
       boolean[] streamResetFlags,
       long positionUs) {
-    if (preparePositionOverrideUs != C.TIME_UNSET && positionUs == preparePositionUs) {
-      positionUs = preparePositionOverrideUs;
-      preparePositionOverrideUs = C.TIME_UNSET;
-    }
     return castNonNull(mediaPeriod)
         .selectTracks(selections, mayRetainStreamFlags, streams, streamResetFlags, positionUs);
   }

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MaskingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MaskingMediaSource.java
@@ -150,11 +150,6 @@ protected void onChildSourceInfoRefreshed(
     @Nullable MediaPeriodId idForMaskingPeriodPreparation = null;
     if (isPrepared) {
       timeline = timeline.cloneWithUpdatedTimeline(newTimeline);
-      if (unpreparedMaskingMediaPeriod != null) {
-        // Reset override in case the duration changed and we need to update our override.
-        setPreparePositionOverrideToUnpreparedMaskingPeriod(
-            unpreparedMaskingMediaPeriod.getPreparePositionOverrideUs());
-      }
     } else if (newTimeline.isEmpty()) {
       timeline =
           hasRealTimeline