Subtitle-stream-controller: Load fragments in sync with streaming and…

… resolve via PTS/PDT (video-dev#1882)
rasata · Nov 26, 2018 · b2d0daa · b2d0daa
1 parent f7a4089
commit b2d0daa
Show file tree

Hide file tree

Showing 9 changed files with 319 additions and 147 deletions.
diff --git a/src/config.js b/src/config.js
@@ -15,7 +15,7 @@ import AudioStreamController from './controller/audio-stream-controller';
 import * as Cues from './utils/cues';
 import TimelineController from './controller/timeline-controller';
 import SubtitleTrackController from './controller/subtitle-track-controller';
-import SubtitleStreamController from './controller/subtitle-stream-controller';
+import { SubtitleStreamController } from './controller/subtitle-stream-controller';
 import EMEController from './controller/eme-controller';
 
 import { requestMediaKeySystemAccess } from './utils/mediakeys-helper';

diff --git a/src/controller/audio-stream-controller.js b/src/controller/audio-stream-controller.js
@@ -34,6 +34,8 @@ const State = {
   WAITING_INIT_PTS: 'WAITING_INIT_PTS'
 };
 
+const TICK_INTERVAL = 100; // how often to tick in ms
+
 class AudioStreamController extends TaskLoop {
   constructor (hls, fragmentTracker) {
     super(hls,
@@ -95,7 +97,7 @@ class AudioStreamController extends TaskLoop {
     if (this.tracks) {
       let lastCurrentTime = this.lastCurrentTime;
       this.stopLoad();
-      this.setInterval(100);
+      this.setInterval(TICK_INTERVAL);
       this.fragLoadError = 0;
       if (lastCurrentTime > 0 && startPosition === -1) {
         logger.log(`audio:override startPosition with lastCurrentTime @${lastCurrentTime.toFixed(3)}`);
@@ -476,7 +478,7 @@ class AudioStreamController extends TaskLoop {
       }
     } else {
       // switching to audio track, start timer if not already started
-      this.setInterval(100);
+      this.setInterval(TICK_INTERVAL);
     }
 
     // should we switch tracks ?

diff --git a/src/controller/stream-controller.js b/src/controller/stream-controller.js
@@ -32,6 +32,8 @@ export const State = {
   ERROR: 'ERROR'
 };
 
+const TICK_INTERVAL = 100; // how often to tick in ms
+
 class StreamController extends TaskLoop {
   constructor (hls, fragmentTracker) {
     super(hls,
@@ -76,7 +78,7 @@ class StreamController extends TaskLoop {
     if (this.levels) {
       let lastCurrentTime = this.lastCurrentTime, hls = this.hls;
       this.stopLoad();
-      this.setInterval(100);
+      this.setInterval(TICK_INTERVAL);
       this.level = -1;
       this.fragLoadError = 0;
       if (!this.startFragRequested) {