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

Handle remove cues from track properly if cues is null #112

Merged
merged 1 commit into from
Nov 21, 2016
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: 4 additions & 0 deletions src/remove-cues-from-track.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ const removeCuesFromTrack = function(start, end, track) {
return;
}

if (!track.cues) {
return;
}

i = track.cues.length;

while (i--) {
Expand Down
29 changes: 29 additions & 0 deletions test/html.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,35 @@ function() {
);
});

QUnit.test(
'calling remove property handles absence of cues (null)',
function() {
let mediaSource = new videojs.MediaSource();
let sourceBuffer = mediaSource.addSourceBuffer('video/mp2t');

initializeNativeSourceBuffers(sourceBuffer);

sourceBuffer.inbandTextTrack_ = {
cues: null
};

mediaSource.videoBuffer_.remove = function(start, end) {
// pass
};
mediaSource.audioBuffer_.remove = function(start, end) {
// pass
};

// this call should not raise an exception
sourceBuffer.remove(3, 10);

QUnit.equal(
sourceBuffer.inbandTextTrack_.cues,
null,
'cues are still null'
);
});

QUnit.test('removing works even with audio disabled', function() {
let mediaSource = new videojs.MediaSource();
let muxedBuffer = mediaSource.addSourceBuffer('video/mp2t');
Expand Down