sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix DashMediaSource NPE

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=182534505
This commit is contained in:
olly 2018-01-19 07:54:04 -08:00 committed by Oliver Woodman
parent fe1e4fa1f2
commit 24f866e788
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View file

@ -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
+ ", " + ", "