Commit 24f866e7 by olly Committed by Oliver Woodman

Fix DashMediaSource NPE

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=182534505
parent fe1e4fa1
...@@ -605,13 +605,13 @@ public final class DashMediaSource implements MediaSource { ...@@ -605,13 +605,13 @@ public final class DashMediaSource implements MediaSource {
// If we receive a dynamic manifest that's older than expected (i.e. its publish time has // If we receive a dynamic manifest that's older than expected (i.e. its publish time has
// expired, or it's dynamic and we know the presentation has ended), then ignore it and load // expired, or it's dynamic and we know the presentation has ended), then ignore it and load
// again up to a specified number of times. // again up to a specified number of times.
if (manifest.dynamic if (newManifest.dynamic
&& (dynamicMediaPresentationEnded && (dynamicMediaPresentationEnded
|| manifest.publishTimeMs <= expiredManifestPublishTimeUs)) { || newManifest.publishTimeMs <= expiredManifestPublishTimeUs)) {
Log.w( Log.w(
TAG, TAG,
"Loaded stale dynamic manifest: " "Loaded stale dynamic manifest: "
+ manifest.publishTimeMs + newManifest.publishTimeMs
+ ", " + ", "
+ dynamicMediaPresentationEnded + dynamicMediaPresentationEnded
+ ", " + ", "
......
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