Skip to content
This repository has been archived by the owner on Jan 12, 2019. It is now read-only.

make sure text tracks added by hls are properly disposed #1228

Merged
merged 1 commit into from
Aug 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/master-playlist-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ export class MasterPlaylistController extends videojs.EventTarget {
this.segmentMetadataTrack_ = tech.addRemoteTextTrack({
kind: 'metadata',
label: 'segment-metadata'
}, true).track;
}, false).track;

this.decrypter_ = worker(Decrypter);

Expand Down Expand Up @@ -804,7 +804,7 @@ export class MasterPlaylistController extends videojs.EventTarget {
enabled: false,
language: properties.language,
label
}, true).track;
}, false).track;

this.subtitleGroups_.tracks[label] = track;
}
Expand Down
10 changes: 10 additions & 0 deletions test/master-playlist-controller.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1631,6 +1631,16 @@ QUnit.test('adds subtitle tracks when a media playlist is loaded', function(asse
assert.equal(textTracks[1].mode, 'disabled', 'track starts disabled');
assert.equal(textTracks[2].mode, 'disabled', 'track starts disabled');
assert.equal(hlsWebvttEvents, 1, 'there is webvtt detected in the rendition');

// change source to make sure tracks are cleaned up
this.player.src({
src: 'http://example.com/media.mp4',
type: 'video/mp4'
});

this.clock.tick(1);

assert.equal(this.player.textTracks().length, 0, 'text tracks cleaned');
});

QUnit.test('switches off subtitles on subtitle errors', function(assert) {
Expand Down