mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge branch 'jellyfin:master' into feature-comicposition

Browse source
This commit is contained in:
MinecraftPlaye 2021-10-04 09:46:35 +02:00 • committed by GitHub
commit 195d05d883
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/plugins/htmlVideoPlayer/plugin.js
View file

@ -675,14 +675,14 @@ function tryRemoveElement(elem) {
}
onEndedInternal(this, elem, this.onError);
if (destroyPlayer) {
this.destroy();
}
}
this.destroyCustomTrack(elem);
if (destroyPlayer) {
this.destroy();
}
return Promise.resolve();
}
@ -1062,7 +1062,13 @@ function tryRemoveElement(elem) {
workerUrl: `${appRouter.baseUrl()}/libraries/subtitles-octopus-worker.js`,
legacyWorkerUrl: `${appRouter.baseUrl()}/libraries/subtitles-octopus-worker-legacy.js`,
onError() {
onErrorInternal(htmlVideoPlayer, 'mediadecodeerror');
// HACK: Clear JavascriptSubtitlesOctopus: it gets disposed when an error occurs
htmlVideoPlayer.#currentSubtitlesOctopus = null;
// HACK: Give JavascriptSubtitlesOctopus time to dispose itself
setTimeout(() => {
onErrorInternal(htmlVideoPlayer, 'mediadecodeerror');
}, 0);
},
timeOffset: (this._currentPlayOptions.transcodingOffsetTicks || 0) / 10000000,