Commit 65597e0d by olly Committed by Oliver Woodman

DashMediaSource variable name cleanup

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=182261649
parent 78c6b39a
...@@ -285,17 +285,18 @@ public final class DashMediaSource implements MediaSource { ...@@ -285,17 +285,18 @@ public final class DashMediaSource implements MediaSource {
private DataSource dataSource; private DataSource dataSource;
private Loader loader; private Loader loader;
private LoaderErrorThrower loaderErrorThrower; private LoaderErrorThrower loaderErrorThrower;
private Handler handler;
private Uri manifestUri; private Uri manifestUri;
private long manifestLoadStartTimestamp;
private long manifestLoadEndTimestamp;
private DashManifest manifest; private DashManifest manifest;
private Handler handler; private boolean manifestLoadPending;
private boolean pendingManifestLoading; private long manifestLoadStartTimestampMs;
private long manifestLoadEndTimestampMs;
private long elapsedRealtimeOffsetMs; private long elapsedRealtimeOffsetMs;
private int staleManifestReloadAttempt;
private long expiredManifestPublishTimeUs; private long expiredManifestPublishTimeUs;
private boolean dynamicMediaPresentationEnded; private boolean dynamicMediaPresentationEnded;
private int staleManifestReloadAttempt;
private int firstPeriodId; private int firstPeriodId;
...@@ -539,15 +540,15 @@ public final class DashMediaSource implements MediaSource { ...@@ -539,15 +540,15 @@ public final class DashMediaSource implements MediaSource {
@Override @Override
public void releaseSource() { public void releaseSource() {
pendingManifestLoading = false; manifestLoadPending = false;
dataSource = null; dataSource = null;
loaderErrorThrower = null; loaderErrorThrower = null;
if (loader != null) { if (loader != null) {
loader.release(); loader.release();
loader = null; loader = null;
} }
manifestLoadStartTimestamp = 0; manifestLoadStartTimestampMs = 0;
manifestLoadEndTimestamp = 0; manifestLoadEndTimestampMs = 0;
manifest = null; manifest = null;
if (handler != null) { if (handler != null) {
handler.removeCallbacksAndMessages(null); handler.removeCallbacksAndMessages(null);
...@@ -605,11 +606,11 @@ public final class DashMediaSource implements MediaSource { ...@@ -605,11 +606,11 @@ public final class DashMediaSource implements MediaSource {
return; return;
} }
manifest = newManifest; manifest = newManifest;
manifestLoadStartTimestamp = elapsedRealtimeMs - loadDurationMs; manifestLoadStartTimestampMs = elapsedRealtimeMs - loadDurationMs;
manifestLoadEndTimestamp = elapsedRealtimeMs; manifestLoadEndTimestampMs = elapsedRealtimeMs;
staleManifestReloadAttempt = 0; staleManifestReloadAttempt = 0;
if (!manifest.dynamic) { if (!manifest.dynamic) {
pendingManifestLoading = false; manifestLoadPending = false;
} }
if (manifest.location != null) { if (manifest.location != null) {
synchronized (manifestUriLock) { synchronized (manifestUriLock) {
...@@ -691,14 +692,14 @@ public final class DashMediaSource implements MediaSource { ...@@ -691,14 +692,14 @@ public final class DashMediaSource implements MediaSource {
private void startLoadingManifest() { private void startLoadingManifest() {
handler.removeCallbacks(refreshManifestRunnable); handler.removeCallbacks(refreshManifestRunnable);
if (loader.isLoading()) { if (loader.isLoading()) {
pendingManifestLoading = true; manifestLoadPending = true;
return; return;
} }
Uri manifestUri; Uri manifestUri;
synchronized (manifestUriLock) { synchronized (manifestUriLock) {
manifestUri = this.manifestUri; manifestUri = this.manifestUri;
} }
pendingManifestLoading = false; manifestLoadPending = false;
startLoading(new ParsingLoadable<>(dataSource, manifestUri, C.DATA_TYPE_MANIFEST, startLoading(new ParsingLoadable<>(dataSource, manifestUri, C.DATA_TYPE_MANIFEST,
manifestParser), manifestCallback, minLoadableRetryCount); manifestParser), manifestCallback, minLoadableRetryCount);
} }
...@@ -722,8 +723,8 @@ public final class DashMediaSource implements MediaSource { ...@@ -722,8 +723,8 @@ public final class DashMediaSource implements MediaSource {
private void resolveUtcTimingElementDirect(UtcTimingElement timingElement) { private void resolveUtcTimingElementDirect(UtcTimingElement timingElement) {
try { try {
long utcTimestamp = Util.parseXsDateTime(timingElement.value); long utcTimestampMs = Util.parseXsDateTime(timingElement.value);
onUtcTimestampResolved(utcTimestamp - manifestLoadEndTimestamp); onUtcTimestampResolved(utcTimestampMs - manifestLoadEndTimestampMs);
} catch (ParserException e) { } catch (ParserException e) {
onUtcTimestampResolutionError(e); onUtcTimestampResolutionError(e);
} }
...@@ -825,7 +826,7 @@ public final class DashMediaSource implements MediaSource { ...@@ -825,7 +826,7 @@ public final class DashMediaSource implements MediaSource {
if (windowChangingImplicitly) { if (windowChangingImplicitly) {
handler.postDelayed(simulateManifestRefreshRunnable, NOTIFY_MANIFEST_INTERVAL_MS); handler.postDelayed(simulateManifestRefreshRunnable, NOTIFY_MANIFEST_INTERVAL_MS);
} }
if (pendingManifestLoading) { if (manifestLoadPending) {
startLoadingManifest(); startLoadingManifest();
} else if (scheduleRefresh) { } else if (scheduleRefresh) {
// Schedule an explicit refresh if needed. // Schedule an explicit refresh if needed.
...@@ -852,7 +853,7 @@ public final class DashMediaSource implements MediaSource { ...@@ -852,7 +853,7 @@ public final class DashMediaSource implements MediaSource {
// http://azure.microsoft.com/blog/2014/09/13/dash-live-streaming-with-azure-media-service/ // http://azure.microsoft.com/blog/2014/09/13/dash-live-streaming-with-azure-media-service/
minUpdatePeriodMs = 5000; minUpdatePeriodMs = 5000;
} }
long nextLoadTimestamp = manifestLoadStartTimestamp + minUpdatePeriodMs; long nextLoadTimestamp = manifestLoadStartTimestampMs + minUpdatePeriodMs;
long delayUntilNextLoad = Math.max(0, nextLoadTimestamp - SystemClock.elapsedRealtime()); long delayUntilNextLoad = Math.max(0, nextLoadTimestamp - SystemClock.elapsedRealtime());
handler.postDelayed(refreshManifestRunnable, delayUntilNextLoad); handler.postDelayed(refreshManifestRunnable, delayUntilNextLoad);
} }
......
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