Skip to content

Commit

Permalink
rename retries to playlistErrors_
Browse files Browse the repository at this point in the history
  • Loading branch information
gkatsev committed Jun 11, 2021
1 parent 4ce3bbc commit 298508d
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/manifest.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export const forEachMediaGroup = (master, callback) => {
*/
export const setupMediaPlaylist = ({ playlist, uri, id }) => {
playlist.id = id;
playlist.retries = 0;
playlist.playlistErrors_ = 0;

if (uri) {
// For media playlists, m3u8-parser does not have access to a URI, as HLS media
Expand Down
4 changes: 2 additions & 2 deletions src/master-playlist-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -1135,7 +1135,7 @@ export class MasterPlaylistController extends videojs.EventTarget {
return;
}

currentPlaylist.retries++;
currentPlaylist.playlistErrors_++;

const playlists = this.masterPlaylistLoader_.master.playlists;
const enabledPlaylists = playlists.filter(isEnabled);
Expand Down Expand Up @@ -1186,7 +1186,7 @@ export class MasterPlaylistController extends videojs.EventTarget {
// Blacklist this playlist
let excludeUntil;

if (currentPlaylist.retries > this.maxPlaylistRetries) {
if (currentPlaylist.playlistErrors_ > this.maxPlaylistRetries) {
excludeUntil = Infinity;
} else {
excludeUntil = Date.now() + (blacklistDuration * 1000);
Expand Down
4 changes: 2 additions & 2 deletions test/manifest.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,14 @@ QUnit.module('manifest', function() {
const expectedPlaylist0 = {
attributes: {},
resolvedUri: urlTo('uri-0'),
retries: 0,
playlistErrors_: 0,
uri: 'uri-0',
id: '0-uri-0'
};
const expectedPlaylist1 = {
attributes: {},
resolvedUri: urlTo('uri-1'),
retries: 0,
playlistErrors_: 0,
uri: 'uri-1',
id: '1-uri-1'
};
Expand Down
8 changes: 4 additions & 4 deletions test/master-playlist-controller.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5973,7 +5973,7 @@ QUnit.test('switch playlists if current playlist gets excluded and re-include if
this.env.log.warn.callCount = 0;
});

QUnit.test('Playlist is excluded indefinitely if number of retries exceeds maxPlaylistRetries', function(assert) {
QUnit.test('Playlist is excluded indefinitely if number of playlistErrors_ exceeds maxPlaylistRetries', function(assert) {
this.requests.length = 0;
this.player.dispose();
this.player = createPlayer({ html5: { vhs: { maxPlaylistRetries: 1 } } });
Expand All @@ -5995,17 +5995,17 @@ QUnit.test('Playlist is excluded indefinitely if number of retries exceeds maxPl
const mpl = mpc.masterPlaylistLoader_;
const playlist = mpl.master.playlists[0];

assert.equal(playlist.retries, 0, 'retries starts at zero');
assert.equal(playlist.playlistErrors_, 0, 'playlistErrors_ starts at zero');

mpc.blacklistCurrentPlaylist();

assert.ok('excludeUntil' in playlist, 'playlist was excluded');
assert.equal(playlist.retries, 1, 'we incremented retry');
assert.equal(playlist.playlistErrors_, 1, 'we incremented playlistErrors_');
assert.notEqual(playlist.excludeUntil, Infinity, 'The playlist was not excluded indefinitely');

mpc.blacklistCurrentPlaylist();

assert.equal(playlist.retries, 2, 'we incremented retry');
assert.equal(playlist.playlistErrors_, 2, 'we incremented playlistErrors_');
assert.equal(playlist.excludeUntil, Infinity, 'The playlist was excluded indefinitely');
assert.equal(this.env.log.warn.callCount, 2, 'logged a warning each time a playlist was excluded');

Expand Down
8 changes: 4 additions & 4 deletions test/playlist-loader.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2020,7 +2020,7 @@ QUnit.module('Playlist Loader', function(hooks) {
assert.strictEqual(loadedMetadata, 1, 'still one loadedmetadata');
});

QUnit.test('retries are reset on a successful response', function(assert) {
QUnit.test('playlistErrors_ are reset on a successful response', function(assert) {
const loader = new PlaylistLoader('manifest/master.m3u8', this.fakeVhs);

loader.load();
Expand All @@ -2036,15 +2036,15 @@ QUnit.module('Playlist Loader', function(hooks) {
'#EXT-X-ENDLIST\n'
);

loader.master.playlists[0].retries = 3;
loader.master.playlists[0].playlistErrors_ = 3;

// playlist
this.requests.shift().respond(404);

loader.media(loader.master.playlists[1]);
loader.media(loader.master.playlists[0]);

assert.equal(loader.master.playlists[0].retries, 3, 'we have 3 retries');
assert.equal(loader.master.playlists[0].playlistErrors_, 3, 'we have 3 playlistErrors_');

this.requests[1].respond(
200, null,
Expand All @@ -2053,7 +2053,7 @@ QUnit.module('Playlist Loader', function(hooks) {
'#EXTINF:10,\n' +
'0.ts\n'
);
assert.equal(loader.master.playlists[0].retries, 0, 'retries resets to zero when a playlist sucessfully loads');
assert.equal(loader.master.playlists[0].playlistErrors_, 0, 'playlistErrors_ resets to zero when a playlist sucessfully loads');
});

QUnit.test(
Expand Down

0 comments on commit 298508d

Please sign in to comment.