Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(dash-playlist-loader): clear out timers on dispose #472

Merged
merged 4 commits into from
Apr 16, 2019
Merged

fix(dash-playlist-loader): clear out timers on dispose #472

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60e6c2e
fix(dash-playlist-loader): clear out timers on dispose
gkatsev Apr 16, 2019
f104838
clear pending timeout before setting a new one
gkatsev Apr 16, 2019
611c36b
update clearTimeout
gkatsev Apr 16, 2019
5b2b59f
remove clearTimeout
gkatsev Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/dash-playlist-loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ export default class DashPlaylistLoader extends EventTarget {
dispose() {
this.stopRequest();
this.loadedPlaylists_ = {};
window.clearTimeout(this.minimumUpdatePeriodTimeout_);
window.clearTimeout(this.mediaRequest_);
window.clearTimeout(this.mediaUpdateTimeout);
}

Expand Down Expand Up @@ -404,6 +406,7 @@ export default class DashPlaylistLoader extends EventTarget {
pause() {
this.stopRequest();
window.clearTimeout(this.mediaUpdateTimeout);
window.clearTimeout(this.minimumUpdatePeriodTimeout_);
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.
Expand All @@ -413,6 +416,7 @@ export default class DashPlaylistLoader extends EventTarget {

load(isFinalRendition) {
window.clearTimeout(this.mediaUpdateTimeout);
window.clearTimeout(this.minimumUpdatePeriodTimeout_);

const media = this.media();

Expand Down Expand Up @@ -626,7 +630,7 @@ export default class DashPlaylistLoader extends EventTarget {
// would be to update the manifest at the same rate that the media playlists
// are "refreshed", i.e. every targetDuration.
if (this.master && this.master.minimumUpdatePeriod) {
window.setTimeout(() => {
this.minimumUpdatePeriodTimeout_ = window.setTimeout(() => {
this.trigger('minimumUpdatePeriod');
}, this.master.minimumUpdatePeriod);
}
Expand Down Expand Up @@ -698,7 +702,7 @@ export default class DashPlaylistLoader extends EventTarget {
// update loader's sidxMapping with parsed sidx box
this.sidxMapping_[sidxKey].sidx = sidx;

window.setTimeout(() => {
this.minimumUpdatePeriodTimeout_ = window.setTimeout(() => {
this.trigger('minimumUpdatePeriod');
}, this.master.minimumUpdatePeriod);

Expand All @@ -714,7 +718,7 @@ export default class DashPlaylistLoader extends EventTarget {
}
}

window.setTimeout(() => {
this.minimumUpdatePeriodTimeout_ = window.setTimeout(() => {
this.trigger('minimumUpdatePeriod');
}, this.master.minimumUpdatePeriod);
});
Expand Down