jellyfin/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-23 14:09:42 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Backport pull request #5718 from jellyfin-web/release-10.9.z

Browse Source 
HtmlVideoPlayer fix and cleanup

Original-merge: 18061ce247

Merged-by: thornbill <thornbill@users.noreply.github.com>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
dmitrylyzo 2024-06-24 20:30:57 -04:00 committed by Joshua M. Boniface
parent 2cbc9e4abf
commit f30343cfca
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/htmlVideoPlayer/plugin.js
View File

@ -209,10 +209,6 @@ export class HtmlVideoPlayer {
* @type {number | null} * @type {number | null}
*/ */
#audioTrackIndexToSetOnPlaying; #audioTrackIndexToSetOnPlaying;
/**
* @type {null | undefined}
*/
#currentClock;
/** /**
* @type {any | null | undefined} * @type {any | null | undefined}
*/ */
@ -862,6 +858,8 @@ export class HtmlVideoPlayer {
videoElement.parentNode.removeChild(videoElement); videoElement.parentNode.removeChild(videoElement);
} }
this._currentAspectRatio = null;
const dlg = this.#videoDialog; const dlg = this.#videoDialog;
if (dlg) { if (dlg) {
this.#videoDialog = null; this.#videoDialog = null;
@ -1169,9 +1167,6 @@ export class HtmlVideoPlayer {
this.destroyNativeTracks(videoElement, targetTrackIndex); this.destroyNativeTracks(videoElement, targetTrackIndex);
this.destroyStoredTrackInfo(targetTrackIndex); this.destroyStoredTrackInfo(targetTrackIndex);
this.#currentClock = null;
this._currentAspectRatio = null;
const octopus = this.#currentAssRenderer; const octopus = this.#currentAssRenderer;
if (octopus) { if (octopus) {
octopus.dispose(); octopus.dispose();
@ -1499,16 +1494,6 @@ export class HtmlVideoPlayer {
* @private * @private
*/ */
updateSubtitleText(timeMs) { updateSubtitleText(timeMs) {
const clock = this.#currentClock;
if (clock) {
try {
clock.seek(timeMs / 1000);
} catch (err) {
console.error(`error in libjass: ${err}`);
}
return;
}
const allTrackEvents = [this.#currentTrackEvents, this.#currentSecondaryTrackEvents]; const allTrackEvents = [this.#currentTrackEvents, this.#currentSecondaryTrackEvents];
const subtitleTextElements = [this.#videoSubtitlesElem, this.#videoSecondarySubtitlesElem]; const subtitleTextElements = [this.#videoSubtitlesElem, this.#videoSecondarySubtitlesElem];