Commit 932574a3 by olly Committed by Oliver Woodman

Fix us/ms conversion error.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=129871792
parent 91c7551c
...@@ -434,7 +434,7 @@ public final class DashMediaSource implements MediaSource { ...@@ -434,7 +434,7 @@ public final class DashMediaSource implements MediaSource {
private long getNowUnixTimeUs() { private long getNowUnixTimeUs() {
if (elapsedRealtimeOffsetMs != 0) { if (elapsedRealtimeOffsetMs != 0) {
return SystemClock.elapsedRealtime() * 1000 + elapsedRealtimeOffsetMs; return (SystemClock.elapsedRealtime() + elapsedRealtimeOffsetMs) * 1000;
} else { } else {
return System.currentTimeMillis() * 1000; return System.currentTimeMillis() * 1000;
} }
......
...@@ -74,7 +74,7 @@ public class DefaultDashChunkSource implements DashChunkSource { ...@@ -74,7 +74,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
private final TrackSelection trackSelection; private final TrackSelection trackSelection;
private final RepresentationHolder[] representationHolders; private final RepresentationHolder[] representationHolders;
private final DataSource dataSource; private final DataSource dataSource;
private final long elapsedRealtimeOffsetUs; private final long elapsedRealtimeOffsetMs;
private DashManifest manifest; private DashManifest manifest;
private int periodIndex; private int periodIndex;
...@@ -102,7 +102,7 @@ public class DefaultDashChunkSource implements DashChunkSource { ...@@ -102,7 +102,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
this.trackSelection = trackSelection; this.trackSelection = trackSelection;
this.dataSource = dataSource; this.dataSource = dataSource;
this.periodIndex = periodIndex; this.periodIndex = periodIndex;
this.elapsedRealtimeOffsetUs = elapsedRealtimeOffsetMs * 1000; this.elapsedRealtimeOffsetMs = elapsedRealtimeOffsetMs;
long periodDurationUs = manifest.getPeriodDurationUs(periodIndex); long periodDurationUs = manifest.getPeriodDurationUs(periodIndex);
List<Representation> representations = getRepresentations(); List<Representation> representations = getRepresentations();
...@@ -274,8 +274,8 @@ public class DefaultDashChunkSource implements DashChunkSource { ...@@ -274,8 +274,8 @@ public class DefaultDashChunkSource implements DashChunkSource {
} }
private long getNowUnixTimeUs() { private long getNowUnixTimeUs() {
if (elapsedRealtimeOffsetUs != 0) { if (elapsedRealtimeOffsetMs != 0) {
return (SystemClock.elapsedRealtime() * 1000) + elapsedRealtimeOffsetUs; return (SystemClock.elapsedRealtime() + elapsedRealtimeOffsetMs) * 1000;
} else { } else {
return System.currentTimeMillis() * 1000; return System.currentTimeMillis() * 1000;
} }
......
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