Merge pull request #6043 from gnattu/fix-enum-transcode

Change encoding preset and play stats for server change
jellyfin · Sep 16, 2024 · 818f90d · 818f90d
2 parents 1bd6e96 + 2a522f7
commit 818f90d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/components/playerstats/playerstats.js b/src/components/playerstats/playerstats.js
@@ -172,12 +172,17 @@ function getTranscodingStats(session, player, displayPlayMethod) {
                 value: session.TranscodingInfo.TranscodeReasons.map(translateReason).join('<br/>')
             });
         }
-        if (session.TranscodingInfo.HardwareAccelerationType) {
-            sessionStats.push({
-                label: globalize.translate('LabelHardwareEncoding'),
-                value: session.TranscodingInfo.HardwareAccelerationType
-            });
-        }
+        // Hide this for now because it is not useful in its current state.
+        // This only reflects the configuration in the dashboard, but the actual
+        // decoder/encoder selection is more complex. As a result, the hardware
+        // encoder may not be used even if hardware acceleration is configured,
+        // making the display of hardware acceleration misleading.
+        // if (session.TranscodingInfo.HardwareAccelerationType) {
+        //     sessionStats.push({
+        //         label: globalize.translate('LabelHardwareEncoding'),
+        //         value: session.TranscodingInfo.HardwareAccelerationType
+        //     });
+        // }
     }
 
     return sessionStats;

diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
@@ -11,7 +11,7 @@ <h2 class="sectionTitle">${Transcoding}</h2>
 
                 <div class="selectContainer">
                     <select is="emby-select" id="selectVideoDecoder" label="${LabelHardwareAccelerationType}">
-                        <option value="">${None}</option>
+                        <option value="none">${None}</option>
                         <option value="amf">AMD AMF</option>
                         <option value="nvenc">Nvidia NVENC</option>
                         <option value="qsv">Intel QuickSync (QSV)</option>
@@ -312,7 +312,7 @@ <h3 class="checkboxListLabel">${LabelEncodingFormatOptions}</h3>
 
                 <div class="selectContainer">
                     <select is="emby-select" id="selectEncoderPreset" label="${LabelEncoderPreset}">
-                        <option value="">${Auto}</option>
+                        <option value="auto">${Auto}</option>
                         <option value="veryslow">veryslow</option>
                         <option value="slower">slower</option>
                         <option value="slow">slow</option>