chore: update segment loader

src/playlist-controller.js

@@ -1136,7 +1136,18 @@ export class PlaylistController extends videojs.EventTarget {
       this.mainSegmentLoader_.load();
     });
 
-    // don't need to reset audio as it is reset when media changes
+    if (this.mediaTypes_.AUDIO.activePlaylistLoader) {
+      this.audioSegmentLoader_.pause();
+      this.audioSegmentLoader_.resetEverything(() => {
+        this.audioSegmentLoader_.load();
+      });
+    }
+    if (this.mediaTypes_.SUBTITLES.activePlaylistLoader) {
+      this.subtitleSegmentLoader_.pause();
+      this.subtitleSegmentLoader_.resetEverything(() => {
+        this.subtitleSegmentLoader_.load();
+      });
+    }
   }
 
   /**

src/segment-loader.js

@@ -857,6 +857,7 @@ export default class SegmentLoader extends videojs.EventTarget {
       if (this.pendingSegment_) {
         this.pendingSegment_ = null;
       }
+      this.timelineChangeController_.clearPendingTimelineChange(this.loaderType_);
       return;
     }
 
@@ -1102,6 +1103,15 @@ export default class SegmentLoader extends videojs.EventTarget {
     if (!newPlaylist) {
       return;
     }
+
+    if (this.playlist_ &&
+      this.playlist_.endList &&
+      newPlaylist.endList &&
+      this.playlist_.uri === newPlaylist.uri) {
+      // skip update if both prev and new are vod and have the same URI
+      return;
+    }
+
     const oldPlaylist = this.playlist_;
     const segmentInfo = this.pendingSegment_;
 

test/segment-loader.test.js

@@ -10,8 +10,7 @@ import {
   getTroublesomeSegmentDurationMessage,
   getSyncSegmentCandidate,
   segmentInfoString,
-  shouldFixBadTimelineChanges,
-  fixBadTimelineChange
+  shouldFixBadTimelineChanges
 } from '../src/segment-loader';
 import mp4probe from 'mux.js/lib/mp4/probe';
 import {
@@ -515,37 +514,6 @@ QUnit.test('shouldFixBadTimelineChange returns false when timelineChangeControll
   assert.notOk(shouldFixBadTimelineChanges(timelineChangeController), 'should not fix a timeline change with no timelineChangeController');
 });
 
-QUnit.module('fixBadTimelineChange');
-
-QUnit.test('fixBadTimelineChange calls pause, resetEverything and load on a segmentLoader', function(assert) {
-  let pauseCalls = 0;
-  let resetEverythingCalls = 0;
-  let loadCalls = 0;
-  let mockSegmentLoader = {
-    pause() {
-      pauseCalls++;
-    },
-    resetEverything() {
-      resetEverythingCalls++;
-    },
-    load() {
-      loadCalls++;
-    }
-  };
-
-  fixBadTimelineChange(mockSegmentLoader);
-  assert.equal(pauseCalls, 1, 'calls pause once');
-  assert.equal(resetEverythingCalls, 1, 'calls resetEverything once');
-  assert.equal(loadCalls, 1, 'calls load once');
-
-  // early return if undefined. call counts remain the same.
-  mockSegmentLoader = undefined;
-  fixBadTimelineChange(mockSegmentLoader);
-  assert.equal(pauseCalls, 1, 'calls pause once');
-  assert.equal(resetEverythingCalls, 1, 'calls resetEverything once');
-  assert.equal(loadCalls, 1, 'calls load once');
-});
-
 QUnit.module('safeBackBufferTrimTime');
 
 QUnit.test('uses 30s before playhead when seekable start is 0', function(assert) {
@@ -1668,17 +1636,11 @@ QUnit.module('SegmentLoader', function(hooks) {
       loader = new SegmentLoader(LoaderCommonSettings.call(this, {
         loaderType: 'audio'
       }), {});
-      const origPause = loader.pause;
       const origLoad = loader.load;
       const origResetEverything = loader.resetEverything;
-      let pauseCalls = 0;
       let loadCalls = 0;
       let resetEverythingCalls = 0;
 
-      loader.pause = () => {
-        pauseCalls++;
-        origPause.call(loader);
-      };
       loader.load = () => {
         loadCalls++;
         origLoad.call(loader);
@@ -1701,6 +1663,14 @@ QUnit.module('SegmentLoader', function(hooks) {
         }
       };
 
+      let fixBadTimelineChangeCount = 0;
+
+      loader.timelineChangeController_.trigger = (type) => {
+        if (type === 'fixBadTimelineChange') {
+          fixBadTimelineChangeCount++;
+        }
+      };
+
       const playlist = playlistWithDuration(20);
 
       playlist.discontinuityStarts = [1];
@@ -1716,9 +1686,9 @@ QUnit.module('SegmentLoader', function(hooks) {
         loader.playlist(playlist);
         loader.load();
         this.clock.tick(1);
-        assert.equal(pauseCalls, 1, '1 pause call expected');
-        assert.equal(loadCalls, 2, '2 load calls expected');
-        assert.equal(resetEverythingCalls, 2, '1 load calls expected');
+        assert.equal(loadCalls, 1, '1 load calls expected');
+        assert.equal(resetEverythingCalls, 1, '1 load calls expected');
+        assert.equal(fixBadTimelineChangeCount, 1, '1 fixBadTimelineChangeCount triggered');
       });
     });
 
@@ -1727,17 +1697,11 @@ QUnit.module('SegmentLoader', function(hooks) {
       loader = new SegmentLoader(LoaderCommonSettings.call(this, {
         loaderType: 'main'
       }), {});
-      const origPause = loader.pause;
       const origLoad = loader.load;
       const origResetEverything = loader.resetEverything;
-      let pauseCalls = 0;
       let loadCalls = 0;
       let resetEverythingCalls = 0;
 
-      loader.pause = () => {
-        pauseCalls++;
-        origPause.call(loader);
-      };
       loader.load = () => {
         loadCalls++;
         origLoad.call(loader);
@@ -1759,6 +1723,15 @@ QUnit.module('SegmentLoader', function(hooks) {
           };
         }
       };
+
+      let fixBadTimelineChangeCount = 0;
+
+      loader.timelineChangeController_.trigger = (type) => {
+        if (type === 'fixBadTimelineChange') {
+          fixBadTimelineChangeCount++;
+        }
+      };
+
       this.sourceUpdater_.ready = () => {
         return true;
       };
@@ -1783,9 +1756,10 @@ QUnit.module('SegmentLoader', function(hooks) {
         loader.playlist(playlist);
         loader.load();
         this.clock.tick(1);
-        assert.equal(pauseCalls, 1, '1 pause call expected');
-        assert.equal(loadCalls, 2, '2 load calls expected');
-        assert.equal(resetEverythingCalls, 2, '1 load calls expected');
+        assert.equal(loadCalls, 1, '1 load calls expected');
+        assert.equal(resetEverythingCalls, 1, '1 load calls expected');
+        assert.equal(fixBadTimelineChangeCount, 1, '1 fixBadTimelineChangeCount triggered');
+
       });
     });