Skip to content

Commit

Permalink
fix: Fix exceptions in StreamingEngine when reloading (#6466)
Browse files Browse the repository at this point in the history
When reloading MediaSourceEngine via StreamingEngine, some logic executed before the reload cancels operations and aligns StreamingEngine state with MediaSourceEngine.

However, additional logic was executed after setStreamProperties, which caused a race condition that broke StreamingEngine state by manipulating it out of the usual sequence and outside the usual methods, leading to exceptions and failed assertions.  This removes that unnecessary logic and leaves subtle state management to the functions that are meant to do it.

Closes #6458
  • Loading branch information
joeyparrish committed May 7, 2024
1 parent e7540b2 commit 552255b
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 deletions lib/media/streaming_engine.js
Original file line number Diff line number Diff line change
Expand Up @@ -1733,9 +1733,16 @@ shaka.media.StreamingEngine = class {
otherState = this.mediaStates_.get(ContentType.VIDEO);
}
if (otherState) {
// First, abort all operations in progress on the other stream.
await this.abortOperations_(otherState).catch(() => {});
// Then clear our cache of the last init segment, since MSE will be
// reloaded and no init segment will be there post-reload.
otherState.lastInitSegmentReference = null;
// Now force the existing buffer to be cleared. It is not necessary
// to perform the MSE clear operation, but this has the side-effect
// that our state for that stream will then match MSE's post-reload
// state.
this.forceClearBuffer_(otherState);
this.abortOperations_(otherState).catch(() => {});
}
}

Expand Down Expand Up @@ -1766,19 +1773,6 @@ shaka.media.StreamingEngine = class {
appendWindowEnd, ignoreTimestampOffset,
reference.mimeType || mediaState.stream.mimeType,
reference.codecs || mediaState.stream.codecs, streamsByType);
if (isResetMediaSourceNecessary) {
let otherState = null;
if (mediaState.type === ContentType.VIDEO) {
otherState = this.mediaStates_.get(ContentType.AUDIO);
} else if (mediaState.type === ContentType.AUDIO) {
otherState = this.mediaStates_.get(ContentType.VIDEO);
}
if (otherState) {
otherState.waitingToClearBuffer = false;
otherState.performingUpdate = false;
this.forceClearBuffer_(otherState);
}
}
} catch (error) {
mediaState.lastAppendWindowStart = null;
mediaState.lastAppendWindowEnd = null;
Expand Down

0 comments on commit 552255b

Please sign in to comment.