fix: don't clear DASH minimum update period timeout on pause of a media loader

src/dash-playlist-loader.js

@@ -517,9 +517,11 @@ export default class DashPlaylistLoader extends EventTarget {
  }
  this.stopRequest();
  window.clearTimeout(this.mediaUpdateTimeout);
- window.clearTimeout(this.masterPlaylistLoader_.minimumUpdatePeriodTimeout_);
- this.masterPlaylistLoader_.minimumUpdatePeriodTimeout_ = null;
  this.mediaUpdateTimeout = null;
+ if (this.isMaster_) {
+ window.clearTimeout(this.masterPlaylistLoader_.minimumUpdatePeriodTimeout_);
+ this.masterPlaylistLoader_.minimumUpdatePeriodTimeout_ = null;
+ }
  if (this.state === 'HAVE_NOTHING') {
  // If we pause the loader before any data has been retrieved, its as if we never
  // started, so reset to an unstarted state.
@@ -548,6 +550,15 @@ export default class DashPlaylistLoader extends EventTarget {
  }
 
  if (media && !media.endList) {
+ // Check to see if this is the master loader and the MUP was cleared (this happens
+ // when the loader was paused). `media` should be set at this point since one is always
+ // set during `start()`.
+ if (this.isMaster_ && !this.minimumUpdatePeriodTimeout_) {
+ // Trigger minimumUpdatePeriod to refresh the master manifest
+ this.trigger('minimumUpdatePeriod');
+ // Since there was no prior minimumUpdatePeriodTimeout it should be recreated
+ this.updateMinimumUpdatePeriodTimeout_();
+ }
  this.trigger('mediaupdatetimeout');
  } else {
  this.trigger('loadedplaylist');

test/dash-playlist-loader.test.js

@@ -2690,3 +2690,71 @@ QUnit.test('load does not resume the media update timer for non live playlists',
 
  assert.notOk(loader.mediaUpdateTimeout, 'media update timeout not set');
 });
+
+QUnit.test('pause removes minimum update period timeout', function(assert) {
+ const loader = new DashPlaylistLoader('dash-live.mpd', this.fakeVhs);
+
+ loader.load();
+ this.standardXHRResponse(this.requests.shift());
+ this.clock.tick(1);
+
+ assert.ok(loader.minimumUpdatePeriodTimeout_, 'minimum update period timeout set');
+
+ loader.pause();
+
+ assert.notOk(
+ loader.minimumUpdatePeriodTimeout_,
+ 'minimum update period timeout not set'
+ );
+});
+
+QUnit.test('load resumes minimum update period timeout for live', function(assert) {
+ const loader = new DashPlaylistLoader('dash-live.mpd', this.fakeVhs);
+
+ loader.load();
+ this.standardXHRResponse(this.requests.shift());
+ this.clock.tick(1);
+
+ // media should be selected at this point
+ loader.media(loader.master.playlists[0]);
+
+ assert.ok(loader.minimumUpdatePeriodTimeout_, 'minimum update period timeout set');
+
+ loader.pause();
+
+ assert.notOk(
+ loader.minimumUpdatePeriodTimeout_,
+ 'minimum update period timeout not set'
+ );
+
+ loader.load();
+
+ assert.ok(loader.minimumUpdatePeriodTimeout_, 'minimum update period timeout set');
+});
+
+QUnit.test('pause does not remove minimum update period timeout when not master', function(assert) {
+ const masterLoader = new DashPlaylistLoader('dash-live.mpd', this.fakeVhs);
+
+ masterLoader.load();
+ this.standardXHRResponse(this.requests.shift());
+ this.clock.tick(1);
+
+ const media = masterLoader.master.playlists[0];
+ // media should be selected at this point
+
+ masterLoader.media(media);
+
+ const mediaLoader = new DashPlaylistLoader(media, this.fakeVhs, {}, masterLoader);
+
+ assert.ok(
+ masterLoader.minimumUpdatePeriodTimeout_,
+ 'minimum update period timeout set'
+ );
+
+ mediaLoader.pause();
+
+ assert.ok(
+ masterLoader.minimumUpdatePeriodTimeout_,
+ 'minimum update period timeout set'
+ );
+});