Merge pull request video-dev#1585 from video-dev/fix/playlist-loader-…

…handle-chunklist-404 Fixes handling network error on loading chunklist + Exception on Object.keys in FragmentTracker
plegge · Mar 2, 2018 · fcca4bd · fcca4bd
2 parents 12cfb1c + f45f692
commit fcca4bd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/helper/fragment-tracker.js b/src/helper/fragment-tracker.js
@@ -20,7 +20,7 @@ export class FragmentTracker extends EventHandler {
     this.bufferPadding = 0.2;
 
     this.fragments = Object.create(null);
-    this.timeRanges = null;
+    this.timeRanges = Object.create(null);
 
     this.config = hls.config;
   }

diff --git a/src/loader/playlist-loader.js b/src/loader/playlist-loader.js
@@ -430,7 +430,7 @@ class PlaylistLoader extends EventHandler {
     let details;
     let fatal;
 
-    const loader = context.loader;
+    const loader = this.getInternalLoader(context);
 
     switch(context.type) {
     case ContextType.MANIFEST:

diff --git a/tests/functional/auto/hlsjs.js b/tests/functional/auto/hlsjs.js
@@ -115,7 +115,7 @@ describe('testing hls.js playback in the browser on "'+browserDescription+'"', f
 
   afterEach(function() {
     var browser = this.browser;
-    browser.executeScript('return logString').then(function(return_value){
+    return browser.executeScript('return logString').then(function(return_value){
       console.log('travis_fold:start:debug_logs');
       console.log('logs');
       console.log(return_value);