From 35a0854cc0fe532a580588db527e3d2abb311d7b Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Wed, 22 Jan 2025 03:12:41 -0500
Subject: [PATCH] Backport pull request #6362 from jellyfin-web/release-10.10.z

Always do tone-mapping for HDR transcoding when software pipeline is used

Original-merge: 5b4cfbf4103c939b59c316a262a7a60fc8d7759b

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

Backported-by: thornbill <thornbill@users.noreply.github.com>
---
 src/controllers/dashboard/encodingsettings.html | 2 +-
 src/controllers/dashboard/encodingsettings.js   | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
index a94cd4129f..e9f2a03aa9 100644
--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@@ -182,7 +182,7 @@
                 </div>
 
                 <div class="tonemappingOptions hide">
-                    <div class="checkboxListContainer checkboxContainer-withDescription">
+                    <div class="checkboxListContainer checkboxContainer-withDescription fldTonemapCheckbox hide">
                         <label>
                             <input type="checkbox" is="emby-checkbox" id="chkTonemapping" />
                             <span>${EnableTonemapping}</span>
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index 0459830676..964529507b 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -207,10 +207,15 @@ $(document).on('pageinit', '#encodingSettingsPage', function () {
         }
 
         const isHwaSelected = [ 'amf', 'nvenc', 'qsv', 'vaapi', 'rkmpp', 'videotoolbox' ].includes(this.value);
-        if (this.value === 'none' || isHwaSelected) {
+        if (this.value === 'none') {
             page.querySelector('.tonemappingOptions').classList.remove('hide');
+            page.querySelector('.fldTonemapCheckbox').classList.add('hide');
+        } else if (isHwaSelected) {
+            page.querySelector('.tonemappingOptions').classList.remove('hide');
+            page.querySelector('.fldTonemapCheckbox').classList.remove('hide');
         } else {
             page.querySelector('.tonemappingOptions').classList.add('hide');
+            page.querySelector('.fldTonemapCheckbox').classList.add('hide');
         }
 
         page.querySelector('.tonemappingModeOptions').classList.toggle('hide', !isHwaSelected);