Merge pull request #3124 from drewbharris/master

on level load, check current level details as well as new when determ…
video-dev · Oct 19, 2020 · a7ad4ab · a7ad4ab
2 parents 70fae53 + 24309ed
commit a7ad4ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/controller/audio-stream-controller.js b/src/controller/audio-stream-controller.js
@@ -417,13 +417,13 @@ class AudioStreamController extends BaseStreamController {
     let newDetails = data.details,
       trackId = data.id,
       track = this.tracks[trackId],
+      curDetails = track.details,
       duration = newDetails.totalduration,
       sliding = 0;
 
     logger.log(`track ${trackId} loaded [${newDetails.startSN},${newDetails.endSN}],duration:${duration}`);
 
-    if (newDetails.live) {
-      let curDetails = track.details;
+    if (newDetails.live || (curDetails && curDetails.live)) {
       if (curDetails && newDetails.fragments.length > 0) {
         // we already have details for that level, merge them
         LevelHelper.mergeDetails(curDetails, newDetails);

diff --git a/src/controller/stream-controller.js b/src/controller/stream-controller.js
@@ -783,7 +783,7 @@ class StreamController extends BaseStreamController {
 
     logger.log(`level ${newLevelId} loaded [${newDetails.startSN},${newDetails.endSN}],duration:${duration}`);
 
-    if (newDetails.live) {
+    if (newDetails.live || (curLevel.details && curLevel.details.live)) {
       let curDetails = curLevel.details;
       if (curDetails && newDetails.fragments.length > 0) {
         // we already have details for that level, merge them