From 0a10676649bbba2f36535122691ad1b9c45f3f23 Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Tue, 17 Sep 2024 19:36:43 +0800
Subject: [PATCH 1/3] Add HEVC RExt HW decoding options

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
---
 src/controllers/dashboard/encodingsettings.html | 12 ++++++++++++
 src/controllers/dashboard/encodingsettings.js   | 16 ++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
index 3bb7aaf011..cec7c4ede6 100644
--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@@ -81,6 +81,18 @@
                                 <span>VP9 10bit</span>
                             </label>
                         </div>
+                        <div class="checkboxList hide fld10bitHevcRextHwDecoding">
+                            <label>
+                                <input type="checkbox" is="emby-checkbox" id="chkDecodingColorDepth10HevcRext" />
+                                <span>HEVC RExt 8/10bit</span>
+                            </label>
+                        </div>
+                        <div class="checkboxList hide fld12bitHevcRextHwDecoding">
+                            <label>
+                                <input type="checkbox" is="emby-checkbox" id="chkDecodingColorDepth12HevcRext" />
+                                <span>HEVC RExt 12bit</span>
+                            </label>
+                        </div>
                     </div>
 
                     <div class="checkboxListContainer hide fldEnhancedNvdec">
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index a1a1d25815..35452933d2 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -11,6 +11,8 @@ function loadPage(page, config, systemInfo) {
     });
     page.querySelector('#chkDecodingColorDepth10Hevc').checked = config.EnableDecodingColorDepth10Hevc;
     page.querySelector('#chkDecodingColorDepth10Vp9').checked = config.EnableDecodingColorDepth10Vp9;
+    page.querySelector('#chkDecodingColorDepth10HevcRext').checked = config.EnableDecodingColorDepth10HevcRext;
+    page.querySelector('#chkDecodingColorDepth12HevcRext').checked = config.EnableDecodingColorDepth12HevcRext;
     page.querySelector('#chkEnhancedNvdecDecoder').checked = config.EnableEnhancedNvdecDecoder;
     page.querySelector('#chkSystemNativeHwDecoder').checked = config.PreferSystemNativeHwDecoder;
     page.querySelector('#chkIntelLpH264HwEncoder').checked = config.EnableIntelLowPowerH264HwEncoder;
@@ -119,6 +121,8 @@ function onSubmit() {
             });
             config.EnableDecodingColorDepth10Hevc = form.querySelector('#chkDecodingColorDepth10Hevc').checked;
             config.EnableDecodingColorDepth10Vp9 = form.querySelector('#chkDecodingColorDepth10Vp9').checked;
+            config.EnableDecodingColorDepth10HevcRext = form.querySelector('#chkDecodingColorDepth10HevcRext').checked;
+            config.EnableDecodingColorDepth12HevcRext = form.querySelector('#chkDecodingColorDepth12HevcRext').checked;
             config.EnableEnhancedNvdecDecoder = form.querySelector('#chkEnhancedNvdecDecoder').checked;
             config.PreferSystemNativeHwDecoder = form.querySelector('#chkSystemNativeHwDecoder').checked;
             config.EnableIntelLowPowerH264HwEncoder = form.querySelector('#chkIntelLpH264HwEncoder').checked;
@@ -194,6 +198,18 @@ $(document).on('pageinit', '#encodingSettingsPage', function () {
             page.querySelector('.fld10bitHevcVp9HwDecoding').classList.add('hide');
         }
 
+        if (this.value == 'nvenc' || this.value == 'qsv' || this.value == 'vaapi' || this.value == 'videotoolbox') {
+            page.querySelector('.fld10bitHevcRextHwDecoding').classList.remove('hide');
+        } else {
+            page.querySelector('.fld10bitHevcRextHwDecoding').classList.add('hide');
+        }
+
+        if (this.value == 'nvenc' || this.value == 'qsv' || this.value == 'vaapi') {
+            page.querySelector('.fld12bitHevcRextHwDecoding').classList.remove('hide');
+        } else {
+            page.querySelector('.fld12bitHevcRextHwDecoding').classList.add('hide');
+        }
+
         const isHwaSelected = [ 'amf', 'nvenc', 'qsv', 'vaapi', 'rkmpp', 'videotoolbox' ].includes(this.value);
         if (this.value === '' || isHwaSelected) {
             page.querySelector('.tonemappingOptions').classList.remove('hide');

From c775769dcebd1896e91b1e26866f9ec8ffdf0b81 Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Wed, 18 Sep 2024 14:51:44 +0800
Subject: [PATCH 2/3] Enable 12bit for VideoToolbox

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
---
 src/controllers/dashboard/encodingsettings.html |  4 +---
 src/controllers/dashboard/encodingsettings.js   | 10 ++--------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
index cec7c4ede6..d23602e503 100644
--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@@ -81,13 +81,11 @@
                                 <span>VP9 10bit</span>
                             </label>
                         </div>
-                        <div class="checkboxList hide fld10bitHevcRextHwDecoding">
+                        <div class="checkboxList hide fldHevcRextHwDecoding">
                             <label>
                                 <input type="checkbox" is="emby-checkbox" id="chkDecodingColorDepth10HevcRext" />
                                 <span>HEVC RExt 8/10bit</span>
                             </label>
-                        </div>
-                        <div class="checkboxList hide fld12bitHevcRextHwDecoding">
                             <label>
                                 <input type="checkbox" is="emby-checkbox" id="chkDecodingColorDepth12HevcRext" />
                                 <span>HEVC RExt 12bit</span>
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index 35452933d2..8589e28db2 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -199,15 +199,9 @@ $(document).on('pageinit', '#encodingSettingsPage', function () {
         }
 
         if (this.value == 'nvenc' || this.value == 'qsv' || this.value == 'vaapi' || this.value == 'videotoolbox') {
-            page.querySelector('.fld10bitHevcRextHwDecoding').classList.remove('hide');
+            page.querySelector('.fldHevcRextHwDecoding').classList.remove('hide');
         } else {
-            page.querySelector('.fld10bitHevcRextHwDecoding').classList.add('hide');
-        }
-
-        if (this.value == 'nvenc' || this.value == 'qsv' || this.value == 'vaapi') {
-            page.querySelector('.fld12bitHevcRextHwDecoding').classList.remove('hide');
-        } else {
-            page.querySelector('.fld12bitHevcRextHwDecoding').classList.add('hide');
+            page.querySelector('.fldHevcRextHwDecoding').classList.add('hide');
         }
 
         const isHwaSelected = [ 'amf', 'nvenc', 'qsv', 'vaapi', 'rkmpp', 'videotoolbox' ].includes(this.value);

From ee7879cf7635eb663faf62a845883e210e34b52e Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Wed, 18 Sep 2024 16:04:21 +0800
Subject: [PATCH 3/3] Hide RExt and 10bit check for VideoToolbox

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
---
 src/controllers/dashboard/encodingsettings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index 8589e28db2..0e942e45d1 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -192,13 +192,13 @@ $(document).on('pageinit', '#encodingSettingsPage', function () {
             page.querySelector('#txtVaapiDevice').removeAttribute('required');
         }
 
-        if (this.value == 'amf' || this.value == 'nvenc' || this.value == 'qsv' || this.value == 'vaapi' || this.value == 'rkmpp' || this.value == 'videotoolbox') {
+        if (this.value == 'amf' || this.value == 'nvenc' || this.value == 'qsv' || this.value == 'vaapi' || this.value == 'rkmpp') {
             page.querySelector('.fld10bitHevcVp9HwDecoding').classList.remove('hide');
         } else {
             page.querySelector('.fld10bitHevcVp9HwDecoding').classList.add('hide');
         }
 
-        if (this.value == 'nvenc' || this.value == 'qsv' || this.value == 'vaapi' || this.value == 'videotoolbox') {
+        if (this.value == 'nvenc' || this.value == 'qsv' || this.value == 'vaapi') {
             page.querySelector('.fldHevcRextHwDecoding').classList.remove('hide');
         } else {
             page.querySelector('.fldHevcRextHwDecoding').classList.add('hide');