Backport pull request jellyfin#6291 from jellyfin-web/release-10.10.z

Update dependency libpgs to v0.8.0 Original-merge: 22ae941 Merged-by: thornbill <[email protected]> Backported-by: Joshua M. Boniface <[email protected]>
SHestres · Nov 19, 2024 · c3d7401 · c3d7401
1 parent 1c69ad4
commit c3d7401
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -106,7 +106,7 @@
     "jquery": "3.7.1",
     "jstree": "3.3.17",
     "libarchive.js": "2.0.2",
-    "libpgs": "0.6.0",
+    "libpgs": "0.8.0",
     "lodash-es": "4.17.21",
     "markdown-it": "14.1.0",
     "material-design-icons-iconfont": "6.7.0",

diff --git a/src/plugins/htmlVideoPlayer/plugin.js b/src/plugins/htmlVideoPlayer/plugin.js
@@ -1339,7 +1339,8 @@ export class HtmlVideoPlayer {
                 video: videoElement,
                 subUrl: getTextTrackUrl(track, item),
                 workerUrl: `${appRouter.baseUrl()}/libraries/libpgs.worker.js`,
-                timeOffset: (this._currentPlayOptions.transcodingOffsetTicks || 0) / 10000000
+                timeOffset: (this._currentPlayOptions.transcodingOffsetTicks || 0) / 10000000,
+                aspectRatio: this._currentAspectRatio === 'auto' ? 'contain' : this._currentAspectRatio
             };
             this.#currentPgsRenderer = new libpgs.PgsRenderer(options);
         });
@@ -2089,6 +2090,14 @@ export class HtmlVideoPlayer {
                 mediaElement.style['object-fit'] = val;
             }
         }
+        const pgsRenderer = this.#currentPgsRenderer;
+        if (pgsRenderer) {
+            if (val === 'auto') {
+                pgsRenderer.aspectRatio = 'contain';
+            } else {
+                pgsRenderer.aspectRatio = val;
+            }
+        }
         this._currentAspectRatio = val;
     }