changes

src/flash-media-source.js

@@ -22,22 +22,13 @@ export default class FlashMediaSource extends videojs.EventTarget {
     this.sourceBuffers = [];
     this.readyState = 'closed';
 
-    this.onPlayerSeeked_ = () => {
-      this.sourceBuffers.forEach((sourceBuffer) => {
-        if (sourceBuffer.transmuxer_) {
-          sourceBuffer.transmuxer_.seeked();
-        }
-      });
-    };
-
     this.on(['sourceopen', 'webkitsourceopen'], (event) => {
       // find the swf where we will push media data
       this.swfObj = document.getElementById(event.swfId);
       this.player_ = videojs(this.swfObj.parentNode);
       this.tech_ = this.swfObj.tech;
       this.readyState = 'open';
 
-      this.player_.on('seeked', this.onPlayerSeeked_);
       this.tech_.on('seeking', () => {
         let i = this.sourceBuffers.length;
 
@@ -58,12 +49,6 @@ export default class FlashMediaSource extends videojs.EventTarget {
       }
     });
 
-    this.on('sourceclose', () => {
-      if (this.player_.el_) {
-        this.player_.off('seeked', this.onPlayerSeeked_);
-      }
-    });
-
   }
 
   /**

src/flash-source-buffer.js

@@ -178,6 +178,7 @@ export default class FlashSourceBuffer extends videojs.EventTarget {
     // On a seek we remove all text track data since flash has no concept
     // of a buffered-range and everything else is reset on seek
     this.mediaSource_.player_.on('seeked', () => {
+      this.resetCaptionsIfAppropriate();
       removeCuesFromTrack(0, Infinity, this.metadataTrack_);
       removeCuesFromTrack(0, Infinity, this.inbandTextTrack_);
     });
@@ -187,6 +188,15 @@ export default class FlashSourceBuffer extends videojs.EventTarget {
     });
   }
 
+  resetCaptionsIfAppropriate() {
+    let range = this.player_.buffered();
+    let current = this.player_.currentTime();
+
+    if (range.length && current >= range.end(0) || current <= range.start(0)) {
+      this.transmuxer_.postMessage({action: 'resetCaptions'});
+    }
+  }
+
   /**
    * Append bytes to the sourcebuffers buffer, in this case we
    * have to append it to swf object.

src/flash-transmuxer-worker.js

@@ -77,8 +77,8 @@ class MessageHandlers {
     this.transmuxer.flush();
   }
 
-  seeked() {
-    this.transmuxer.seeked();
+  resetCaptions() {
+    this.transmuxer.resetCaptions();
   }
 }
 

src/html-media-source.js

@@ -159,10 +159,15 @@ export default class HtmlMediaSource extends videojs.EventTarget {
       });
     };
 
-    this.onPlayerSeeked_ = () => {
+    this.onPlayerSeeking_ = (event) => {
       this.sourceBuffers.forEach((sourceBuffer) => {
         if (sourceBuffer.transmuxer_) {
-          sourceBuffer.transmuxer_.seeked();
+          let range = this.player_.buffered();
+          let current = this.player_.currentTime();
+
+          if (current >= range.end(0) || current <= range.start(0)) {
+            sourceBuffer.transmuxer_.postMessage({action: 'resetCaptions'});
+          }
         }
       });
     };
@@ -195,7 +200,7 @@ export default class HtmlMediaSource extends videojs.EventTarget {
       }
 
       this.player_.on('mediachange', this.onPlayerMediachange_);
-      this.player_.on('seeked', this.onPlayerSeeked_);
+      this.player_.on('seeking', this.onPlayerSeeking_);
     });
 
     this.on('sourceended', (event) => {
@@ -239,7 +244,7 @@ export default class HtmlMediaSource extends videojs.EventTarget {
       // event handlers left to unbind anyway
       if (this.player_.el_) {
         this.player_.off('mediachange', this.onPlayerMediachange_);
-        this.player_.off('seeked', this.onPlayerSeeked_);
+        this.player_.off('seeking', this.onPlayerSeeking_);
       }
     });
   }

src/transmuxer-worker.js

@@ -133,8 +133,8 @@ class MessageHandlers {
     this.transmuxer.flush();
   }
 
-  seeked() {
-    this.transmuxer.seeked();
+  resetCaptions() {
+    this.transmuxer.resetCaptions();
   }
 }