From 7877a43482ad2e9b5f3c6a3e62df84e63db6c947 Mon Sep 17 00:00:00 2001
From: Nick <20588554+nicknsy@users.noreply.github.com>
Date: Sun, 11 Feb 2024 22:26:49 -0800
Subject: [PATCH] Handle different trickplay resolutions

---
 src/controllers/dashboard/trickplay.html |  5 ++++-
 src/controllers/playback/video/index.js  | 14 ++++++++++++--
 src/strings/en-us.json                   |  6 ++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/controllers/dashboard/trickplay.html b/src/controllers/dashboard/trickplay.html
index fb9028a010..cf0e2d44d9 100644
--- a/src/controllers/dashboard/trickplay.html
+++ b/src/controllers/dashboard/trickplay.html
@@ -9,9 +9,12 @@
                     <div class="checkboxList">
                         <label>
                             <input type="checkbox" is="emby-checkbox" id="chkEnableHwAcceleration" />
-                            <span>${TrickplayHardwareAccel}</span>
+                            <span>${LabelTrickplayAccel}</span>
                         </label>
                     </div>
+                    <div class="fieldDescription">
+                        <a is="emby-linkbutton" rel="noopener noreferrer" class="button-link" href="#/dashboard/playback/transcoding">${LabelTrickplayAccelHelp}</a>
+                    </div>
                 </div>
                 <div class="inputContainer">
                     <select is="emby-select" id="selectScanBehavior" name="Scan Behavior" label="${LabelScanBehavior}">
diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js
index 5f212bfc3e..0b0da69815 100644
--- a/src/controllers/playback/video/index.js
+++ b/src/controllers/playback/video/index.js
@@ -1770,10 +1770,20 @@ export default function (view) {
 
             if (!trickplayResolutions) return false;
 
-            // TODO: just to test. must pick proper resolution and/or check above that trickplay resolutions has at least one key.
+            // Prefer highest resolution <= 20% of total screen resolution width
+            let bestWidth;
+            const maxWidth = window.screen.width * window.devicePixelRatio * 0.2;
+            for (const [, info] of Object.entries(trickplayResolutions)) {
+                if (!bestWidth
+                    || (info.Width < bestWidth && bestWidth > maxWidth) // Objects not guaranteed to be sorted in any order, first width might be > maxWidth.
+                    || (info.Width > bestWidth && info.Width <= maxWidth)) bestWidth = info.Width;
+            }
+
+            if (!bestWidth) return false;
+
             return updateTrickplayBubbleHtml(
                 ServerConnections.getApiClient(item.ServerId),
-                trickplayResolutions[Object.keys(trickplayResolutions)[0]],
+                trickplayResolutions[bestWidth.toString()],
                 item,
                 mediaSourceId,
                 bubble,
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 4daf77243c..5d79e9a281 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1,6 +1,8 @@
 {
+    "AllowMjpegEncoding": "Allow encoding in MJPEG format (used during trickplay generation)",
     "Trickplay": "Trickplay",
-    "TrickplayHardwareAccel": "Enable hardware acceleration",
+    "LabelTrickplayAccel": "Enable hardware acceleration",
+    "LabelTrickplayAccelHelp": "Make sure to enable 'Allow MJPEG Encoding' in Transcoding if your hardware supports it.",
     "NonBlockingScan": "Non Blocking - queues generation, then returns",
     "BlockingScan": "Blocking - queues generation, blocks scan until complete",
     "LabelScanBehavior": "Scan Behavior",
@@ -25,7 +27,7 @@
     "LabelQscale": "Qscale",
     "LabelQscaleHelp": "The quality scale of images output by ffmpeg, with 2 being the highest quality and 31 being the lowest.",
     "LabelTrickplayThreads": "FFmpeg Threads",
-    "LabelTrickplayThreadsHelp": "The number of threads to pass to the \"-threads\" argument of ffmpeg.",
+    "LabelTrickplayThreadsHelp": "The number of threads to pass to the '-threads' argument of ffmpeg.",
     "OptionExtractTrickplayImage": "Enable trickplay image extraction",
     "ExtractTrickplayImagesHelp": "Trickplay images are similar to chapter images, except they span the entire length of the content and are used to show a preview when scrubbing through videos.",
     "LabelExtractTrickplayDuringLibraryScan": "Extract trickplay images during the library scan",