Skip to content

Commit

Permalink
Reset loading start on worker setup error
Browse files Browse the repository at this point in the history
Fixes #5617

(cherry picked from commit 03bafc6)
  • Loading branch information
robwalch committed Jul 3, 2023
1 parent 8c099ae commit 94cd133
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/controller/base-stream-controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1503,10 +1503,7 @@ export default class BaseStreamController
action === NetworkErrorAction.RetryRequest &&
retryConfig
) {
if (!this.loadedmetadata) {
this.startFragRequested = false;
this.nextLoadPosition = this.startPosition;
}
this.resetStartWhenNotLoaded(this.levelLastLoaded ?? frag.level);
const delay = getRetryDelay(retryConfig, retryCount);
this.warn(
`Fragment ${frag.sn} of ${filterType} ${frag.level} errored with ${
Expand Down Expand Up @@ -1639,7 +1636,7 @@ export default class BaseStreamController
`The loading context changed while buffering fragment ${chunkMeta.sn} of level ${chunkMeta.level}. This chunk will not be buffered.`
);
this.removeUnbufferedFrags();
this.resetStartWhenNotLoaded(chunkMeta.level);
this.resetStartWhenNotLoaded(this.levelLastLoaded ?? chunkMeta.level);
this.resetLoadingState();
}

Expand Down Expand Up @@ -1737,7 +1734,11 @@ export default class BaseStreamController

protected recoverWorkerError(data: ErrorData) {
if (data.event === 'demuxerWorker') {
this.fragmentTracker.removeAllFragments();
this.resetTransmuxer();
this.resetStartWhenNotLoaded(
this.levelLastLoaded ?? this.fragCurrent?.level ?? 0
);
this.resetLoadingState();
}
}
Expand Down

0 comments on commit 94cd133

Please sign in to comment.