Fix default position masking period index calculation

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=157095116

Fix default position masking period index calculation
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=157095116
eb3a31c8 · andrewlewis · Oliver Woodman · f16967cd · eb3a31c8
Commit eb3a31c8 authored May 25, 2017 by andrewlewis Committed by Oliver Woodman May 25, 2017
Showing with 3 additions and 3 deletions
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -213,10 +213,10 @@ import java.util.concurrent.CopyOnWriteArraySet;
      maskingPeriodIndex = 0;
    } else {
      timeline.getWindow(windowIndex, window);
-      long resolvedPositionMs =
+      long resolvedPositionUs =
-          positionMs == C.TIME_UNSET ? window.getDefaultPositionUs() : positionMs;
+          positionMs == C.TIME_UNSET ? window.getDefaultPositionUs() : C.msToUs(positionMs);
      int periodIndex = window.firstPeriodIndex;
-      long periodPositionUs = window.getPositionInFirstPeriodUs() + C.msToUs(resolvedPositionMs);
+      long periodPositionUs = window.getPositionInFirstPeriodUs() + resolvedPositionUs;
      long periodDurationUs = timeline.getPeriod(periodIndex, period).getDurationUs();
      while (periodDurationUs != C.TIME_UNSET && periodPositionUs >= periodDurationUs
          && periodIndex < window.lastPeriodIndex) {