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: appendsdone abort and handle multiple id3 sections. #971

Merged
merged 3 commits into from
Oct 6, 2020
Merged

fix: appendsdone abort and handle multiple id3 sections. #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
975fa7c
fix: appendsdone abort causing pendingSegment null
brandonocasey Oct 5, 2020
fdc6e11
netlify build
brandonocasey Oct 5, 2020
0178f40
fix: handle multiple id3 sections
brandonocasey Oct 6, 2020
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
12 changes: 6 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@
],
"dependencies": {
"@babel/runtime": "^7.5.5",
"@videojs/vhs-utils": "^2.2.0",
"@videojs/vhs-utils": "^2.2.1",
"aes-decrypter": "3.0.2",
"global": "^4.3.2",
"m3u8-parser": "4.4.3",
"mpd-parser": "0.12.0",
"mux.js": "5.6.6",
"mux.js": "5.6.7",
"video.js": "^6 || ^7"
},
"devDependencies": {
Expand Down
7 changes: 5 additions & 2 deletions src/segment-loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2529,6 +2529,11 @@ export default class SegmentLoader extends videojs.EventTarget {
* @private
*/
handleAppendsDone_() {
// appendsdone can cause an abort
if (this.pendingSegment_) {
this.trigger('appendsdone');
gkatsev marked this conversation as resolved.
Show resolved Hide resolved
}

if (!this.pendingSegment_) {
this.state = 'READY';
// TODO should this move into this.checkForAbort to speed up requests post abort in
Expand All @@ -2539,8 +2544,6 @@ export default class SegmentLoader extends videojs.EventTarget {
return;
}

this.trigger('appendsdone');

const segmentInfo = this.pendingSegment_;

// Now that the end of the segment has been reached, we can set the end time. It's
Expand Down