fix: source inconsistencies

videojs · May 9, 2018 · 428a904 · 428a904
1 parent ba2ae78
commit 428a904
Show file tree

Hide file tree

Showing 5 changed files with 190 additions and 192 deletions.
diff --git a/src/js/player.js b/src/js/player.js
@@ -2612,9 +2612,11 @@ class Player extends Component {
 
     if (!titleCaseEquals(sourceTech.tech, this.techName_)) {
       this.changingSrc_ = true;
-
       // load this technology with the chosen source
       this.loadTech_(sourceTech.tech, sourceTech.source);
+      this.tech_.ready(() => {
+        this.changingSrc_ = false;
+      });
       return false;
     }
 

diff --git a/src/js/tech/html5.js b/src/js/tech/html5.js
@@ -35,10 +35,6 @@ class Html5 extends Tech {
   constructor(options, ready) {
     super(options, ready);
 
-    if (options.enableSourceset) {
-      this.setupSourcesetHandling_();
-    }
-
     const source = options.source;
     let crossoriginTracks = false;
 
@@ -52,6 +48,11 @@ class Html5 extends Tech {
       this.handleLateInit_(this.el_);
     }
 
+    // setup sourceset after late sourceset/init
+    if (options.enableSourceset) {
+      this.setupSourcesetHandling_();
+    }
+
     if (this.el_.hasChildNodes()) {
 
       const nodes = this.el_.childNodes;
@@ -117,6 +118,9 @@ class Html5 extends Tech {
    * Dispose of `HTML5` media element and remove all tracks.
    */
   dispose() {
+    if (this.el_.resetSourceset_) {
+      this.el_.resetSourceset_();
+    }
     Html5.disposeMediaElement(this.el_);
     this.options_ = null;