From e1c90dac1e5435d23f497b43886e73168a8364cc Mon Sep 17 00:00:00 2001
From: gnattu <gnattuoc@me.com>
Date: Wed, 27 Mar 2024 12:24:55 +0800
Subject: [PATCH 1/2] fix: add clear help text for encoding format options

These options are misunderstood as part of the hardware encoding options, but they are actually not. Add a helper text and make it in its own section.
---
 src/controllers/dashboard/encodingsettings.html | 4 +++-
 src/controllers/dashboard/encodingsettings.js   | 2 --
 src/strings/en-us.json                          | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
index c9dac5e44b..9324e5a5d2 100644
--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@@ -123,13 +123,15 @@
                 </div>
 
                 <div class="checkboxListContainer">
+                    <h3 class="checkboxListLabel">${LabelEncodingFormatOptions}</h3>
+                    <div class="fieldDescription">${EncodingFormatHelp}</div>
                     <div class="checkboxList">
                         <label>
                             <input type="checkbox" is="emby-checkbox" id="chkAllowHevcEncoding" />
                             <span>${AllowHevcEncoding}</span>
                         </label>
                     </div>
-                    <div class="checkboxList allowAv1EncodingOption">
+                    <div class="checkboxList">
                         <label>
                             <input type="checkbox" is="emby-checkbox" id="chkAllowAv1Encoding" />
                             <span>${AllowAv1Encoding}</span>
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index 6e254ced46..cbe479fcb3 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -227,10 +227,8 @@ $(document).on('pageinit', '#encodingSettingsPage', function () {
 
         if (this.value === 'videotoolbox') {
             page.querySelector('.videoToolboxTonemappingOptions').classList.remove('hide');
-            page.querySelector('.allowAv1EncodingOption').classList.add('hide');
         } else {
             page.querySelector('.videoToolboxTonemappingOptions').classList.add('hide');
-            page.querySelector('.allowAv1EncodingOption').classList.remove('hide');
         }
 
         if (systemInfo.OperatingSystem.toLowerCase() === 'linux' && (this.value == 'qsv' || this.value == 'vaapi')) {
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 11b833f6c8..eccd1f699f 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1602,6 +1602,8 @@
     "EnableIntelLowPowerHevcHwEncoder": "Enable Intel Low-Power HEVC hardware encoder",
     "IntelLowPowerEncHelp": "Low-Power Encoding can keep unnecessary CPU-GPU sync. On Linux they must be disabled if the i915 HuC firmware is not configured.",
     "LabelHardwareEncodingOptions": "Hardware encoding options",
+    "LabelEncodingFormatOptions": "Encoding format options",
+    "EncodingFormatHelp": "Select the video encoding that Jellyfin should transcode to. Jellyfin will use software encoding when hardware acceleration for the selected format is not available.",
     "AudioIsExternal": "The audio stream is external",
     "VideoBitrateNotSupported": "The video's bitrate is not supported",
     "UnknownVideoStreamInfo": "The video stream info is unknown",

From 8bb103e7b7ecc7e53b7f529257d20189cae0840f Mon Sep 17 00:00:00 2001
From: gnattu <gnattuoc@me.com>
Date: Thu, 28 Mar 2024 02:44:53 +0800
Subject: [PATCH 2/2] fix: add additional helper text on H264

---
 src/strings/en-us.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index eccd1f699f..3288b8e778 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1603,7 +1603,7 @@
     "IntelLowPowerEncHelp": "Low-Power Encoding can keep unnecessary CPU-GPU sync. On Linux they must be disabled if the i915 HuC firmware is not configured.",
     "LabelHardwareEncodingOptions": "Hardware encoding options",
     "LabelEncodingFormatOptions": "Encoding format options",
-    "EncodingFormatHelp": "Select the video encoding that Jellyfin should transcode to. Jellyfin will use software encoding when hardware acceleration for the selected format is not available.",
+    "EncodingFormatHelp": "Select the video encoding that Jellyfin should transcode to. Jellyfin will use software encoding when hardware acceleration for the selected format is not available. H264 encoding will always be enabled.",
     "AudioIsExternal": "The audio stream is external",
     "VideoBitrateNotSupported": "The video's bitrate is not supported",
     "UnknownVideoStreamInfo": "The video stream info is unknown",