From 58e2afedd53de56446e843bf5d5559fbca4ece26 Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Mon, 25 Jan 2021 03:39:53 +0800
Subject: [PATCH 1/3] add an option to use the enhanced nvdec decoder

---
 src/components/playerstats/playerstats.js       | 13 ++++++-------
 src/controllers/dashboard/encodingsettings.html |  7 +++++++
 src/controllers/dashboard/encodingsettings.js   |  9 +++++++++
 src/strings/en-us.json                          |  3 ++-
 src/strings/zh-cn.json                          |  3 ++-
 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/components/playerstats/playerstats.js b/src/components/playerstats/playerstats.js
index 106ca0a7cd..805f0115ce 100644
--- a/src/components/playerstats/playerstats.js
+++ b/src/components/playerstats/playerstats.js
@@ -142,14 +142,13 @@ import ServerConnections from '../ServerConnections';
             });
         }
 
-        if (audioChannels) {
-            sessionStats.push({
-                label: globalize.translate('LabelAudioChannels'),
-                value: audioChannels
-            });
-        }
-
         if (displayPlayMethod === 'Transcode') {
+            if (audioChannels) {
+                sessionStats.push({
+                    label: globalize.translate('LabelAudioChannels'),
+                    value: audioChannels
+                });
+            }
             if (totalBitrate) {
                 sessionStats.push({
                     label: globalize.translate('LabelBitrate'),
diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
index 4c7b8c3a57..d8045796af 100644
--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@@ -84,6 +84,13 @@
                         </label>
                     </div>
 
+                    <div class="checkboxListContainer hide fldEnhancedNvdec">
+                        <label>
+                            <input type="checkbox" is="emby-checkbox" id="chkEnhancedNvdecDecoder" />
+                            <span>${EnableEnhancedNvdecDecoder}</span>
+                        </label>
+                    </div>
+
                     <div class="checkboxListContainer">
                         <div class="checkboxList">
                             <label>
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index c0ff10eeb7..6affa92fb8 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -14,6 +14,7 @@ import alert from '../../components/alert';
         });
         page.querySelector('#chkDecodingColorDepth10Hevc').checked = config.EnableDecodingColorDepth10Hevc;
         page.querySelector('#chkDecodingColorDepth10Vp9').checked = config.EnableDecodingColorDepth10Vp9;
+        page.querySelector('#chkEnhancedNvdecDecoder').checked = config.EnableEnhancedNvdecDecoder;
         page.querySelector('#chkHardwareEncoding').checked = config.EnableHardwareEncoding;
         page.querySelector('#chkAllowHevcEncoding').checked = config.AllowHevcEncoding;
         $('#selectVideoDecoder', page).val(config.HardwareAccelerationType);
@@ -101,6 +102,7 @@ import alert from '../../components/alert';
                 });
                 config.EnableDecodingColorDepth10Hevc = form.querySelector('#chkDecodingColorDepth10Hevc').checked;
                 config.EnableDecodingColorDepth10Vp9 = form.querySelector('#chkDecodingColorDepth10Vp9').checked;
+                config.EnableEnhancedNvdecDecoder = form.querySelector('#chkEnhancedNvdecDecoder').checked;
                 config.EnableHardwareEncoding = form.querySelector('#chkHardwareEncoding').checked;
                 config.AllowHevcEncoding = form.querySelector('#chkAllowHevcEncoding').checked;
                 ApiClient.updateNamedConfiguration('encoding', config).then(function () {
@@ -181,6 +183,13 @@ import alert from '../../components/alert';
                 page.querySelector('.tonemappingOptions').classList.add('hide');
             }
 
+            if (this.value == 'nvenc')
+            {
+                page.querySelector('.fldEnhancedNvdec').classList.remove('hide');
+            } else {
+                page.querySelector('.fldEnhancedNvdec').classList.add('hide');
+            }
+
             if (this.value) {
                 page.querySelector('.hardwareAccelerationOptions').classList.remove('hide');
             } else {
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 23457106d1..6195dae0b1 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1497,5 +1497,6 @@
     "YoutubeNotFound": "Video not found.",
     "YoutubeDenied": "Requested video is not allowed to be played in embedded players.",
     "MessageChromecastConnectionError": "Your Google Cast receiver is unable to contact the Jellyfin server. Please check the connection and try again.",
-    "MessagePlaybackError": "There was an error playing this file on your Google Cast receiver."
+    "MessagePlaybackError": "There was an error playing this file on your Google Cast receiver.",
+    "EnableEnhancedNvdecDecoder": "Enable enhanced NVDEC decoder"
 }
diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json
index 2fd896f89d..52f51e19d5 100644
--- a/src/strings/zh-cn.json
+++ b/src/strings/zh-cn.json
@@ -1501,5 +1501,6 @@
     "LabelMinAudiobookResume": "恢复播放有声读物的最短时间：",
     "LabelMaxAudiobookResume": "恢复播放有声读物的最长时间：",
     "MessagePlaybackError": "在您的 Google Cast 接收器上播放此文件时发生错误。",
-    "MessageChromecastConnectionError": "您的 Google Cast 接收器无法联系 Jellyfin 服务器。请检查连接，然后重试。"
+    "MessageChromecastConnectionError": "您的 Google Cast 接收器无法联系 Jellyfin 服务器。请检查连接，然后重试。",
+    "EnableEnhancedNvdecDecoder": "启用增强的 NVDEC 解码器"
 }

From d78cd0db51650048391deab420b3b5a3ce648f76 Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Tue, 26 Jan 2021 03:14:47 +0800
Subject: [PATCH 2/3] add an option to enable vpp tonemapping

---
 src/controllers/dashboard/encodingsettings.html |  7 +++++++
 src/controllers/dashboard/encodingsettings.js   | 11 +++++++++--
 src/strings/en-us.json                          |  4 +++-
 src/strings/zh-cn.json                          |  4 +++-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
index d8045796af..78d04fdc72 100644
--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@@ -118,6 +118,13 @@
                         </label>
                         <div class="fieldDescription checkboxFieldDescription">${AllowTonemappingHelp}</div>
                     </div>
+                    <div class="checkboxListContainer checkboxContainer-withDescription fldVppTonemapping hide">
+                        <label>
+                            <input type="checkbox" is="emby-checkbox" id="chkVppTonemapping" />
+                            <span>${EnableVppTonemapping}</span>
+                        </label>
+                        <div class="fieldDescription checkboxFieldDescription">${AllowVppTonemappingHelp}</div>
+                    </div>
                     <div class="selectContainer">
                         <select is="emby-select" id="selectTonemappingAlgorithm" label="${LabelTonemappingAlgorithm}">
                             <option value="none">None</option>
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index 6affa92fb8..49b0aad84c 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -27,6 +27,7 @@ import alert from '../../components/alert';
         page.querySelector('#chkEnableFallbackFont').checked = config.EnableFallbackFont;
         $('#txtVaapiDevice', page).val(config.VaapiDevice || '');
         page.querySelector('#chkTonemapping').checked = config.EnableTonemapping;
+        page.querySelector('#chkVppTonemapping').checked = config.EnableVppTonemapping;
         page.querySelector('#txtOpenclDevice').value = config.OpenclDevice || '';
         page.querySelector('#selectTonemappingAlgorithm').value = config.TonemappingAlgorithm;
         page.querySelector('#selectTonemappingRange').value = config.TonemappingRange;
@@ -82,6 +83,7 @@ import alert from '../../components/alert';
                 config.VaapiDevice = $('#txtVaapiDevice', form).val();
                 config.OpenclDevice = form.querySelector('#txtOpenclDevice').value;
                 config.EnableTonemapping = form.querySelector('#chkTonemapping').checked;
+                config.EnableVppTonemapping = form.querySelector('#chkVppTonemapping').checked;
                 config.TonemappingAlgorithm = form.querySelector('#selectTonemappingAlgorithm').value;
                 config.TonemappingRange = form.querySelector('#selectTonemappingRange').value;
                 config.TonemappingDesat = form.querySelector('#txtTonemappingDesat').value;
@@ -183,13 +185,18 @@ import alert from '../../components/alert';
                 page.querySelector('.tonemappingOptions').classList.add('hide');
             }
 
-            if (this.value == 'nvenc')
-            {
+            if (this.value == 'nvenc') {
                 page.querySelector('.fldEnhancedNvdec').classList.remove('hide');
             } else {
                 page.querySelector('.fldEnhancedNvdec').classList.add('hide');
             }
 
+            if (this.value == 'vaapi') {
+                page.querySelector('.fldVppTonemapping').classList.remove('hide');
+            } else {
+                page.querySelector('.fldVppTonemapping').classList.add('hide');
+            }
+
             if (this.value) {
                 page.querySelector('.hardwareAccelerationOptions').classList.remove('hide');
             } else {
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 6195dae0b1..faae336e4f 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1498,5 +1498,7 @@
     "YoutubeDenied": "Requested video is not allowed to be played in embedded players.",
     "MessageChromecastConnectionError": "Your Google Cast receiver is unable to contact the Jellyfin server. Please check the connection and try again.",
     "MessagePlaybackError": "There was an error playing this file on your Google Cast receiver.",
-    "EnableEnhancedNvdecDecoder": "Enable enhanced NVDEC decoder"
+    "EnableEnhancedNvdecDecoder": "Enable enhanced NVDEC decoder",
+    "EnableVppTonemapping": "Enable VPP Tone mapping",
+    "AllowVppTonemappingHelp": "Full hardware based tone mapping without using OpenCL filter. Currently works only when transcoding videos with embedded HDR10 metadata."
 }
diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json
index 52f51e19d5..b91171a971 100644
--- a/src/strings/zh-cn.json
+++ b/src/strings/zh-cn.json
@@ -1502,5 +1502,7 @@
     "LabelMaxAudiobookResume": "恢复播放有声读物的最长时间：",
     "MessagePlaybackError": "在您的 Google Cast 接收器上播放此文件时发生错误。",
     "MessageChromecastConnectionError": "您的 Google Cast 接收器无法联系 Jellyfin 服务器。请检查连接，然后重试。",
-    "EnableEnhancedNvdecDecoder": "启用增强的 NVDEC 解码器"
+    "EnableEnhancedNvdecDecoder": "启用增强的 NVDEC 解码器",
+    "EnableVppTonemapping": "启用 VPP 色调映射",
+    "AllowVppTonemappingHelp": "完全基于硬件的色调映射，不需要 OpenCL 滤镜。目前仅在转码内嵌 HDR10 元数据的视频时生效。"
 }

From 200741ae49ea7da59830a252a08e7946f693522b Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Fri, 29 Jan 2021 18:42:01 +0800
Subject: [PATCH 3/3] allow hybird vpp tonemapping for QSV on Linux

---
 src/controllers/dashboard/encodingsettings.html | 14 +++++++-------
 src/controllers/dashboard/encodingsettings.js   | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
index 78d04fdc72..aa5d030746 100644
--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@@ -110,6 +110,13 @@
                     </div>
                 </div>
 
+                <div class="checkboxListContainer checkboxContainer-withDescription fldVppTonemapping hide">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" id="chkVppTonemapping" />
+                        <span>${EnableVppTonemapping}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">${AllowVppTonemappingHelp}</div>
+                </div>
                 <div class="tonemappingOptions hide">
                     <div class="checkboxListContainer checkboxContainer-withDescription">
                         <label>
@@ -118,13 +125,6 @@
                         </label>
                         <div class="fieldDescription checkboxFieldDescription">${AllowTonemappingHelp}</div>
                     </div>
-                    <div class="checkboxListContainer checkboxContainer-withDescription fldVppTonemapping hide">
-                        <label>
-                            <input type="checkbox" is="emby-checkbox" id="chkVppTonemapping" />
-                            <span>${EnableVppTonemapping}</span>
-                        </label>
-                        <div class="fieldDescription checkboxFieldDescription">${AllowVppTonemappingHelp}</div>
-                    </div>
                     <div class="selectContainer">
                         <select is="emby-select" id="selectTonemappingAlgorithm" label="${LabelTonemappingAlgorithm}">
                             <option value="none">None</option>
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index 49b0aad84c..83c965880b 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -160,8 +160,19 @@ import alert from '../../components/alert';
         }];
     }
 
+    let systemInfo;
+    function getSystemInfo() {
+        return systemInfo ? Promise.resolve(systemInfo) : ApiClient.getPublicSystemInfo().then(
+            info => {
+                systemInfo = info;
+                return info;
+            }
+        );
+    }
+
     $(document).on('pageinit', '#encodingSettingsPage', function () {
         const page = this;
+        getSystemInfo();
         page.querySelector('#selectVideoDecoder').addEventListener('change', function () {
             if (this.value == 'vaapi') {
                 page.querySelector('.fldVaapiDevice').classList.remove('hide');
@@ -191,7 +202,7 @@ import alert from '../../components/alert';
                 page.querySelector('.fldEnhancedNvdec').classList.add('hide');
             }
 
-            if (this.value == 'vaapi') {
+            if (systemInfo.OperatingSystem.toLowerCase() === 'linux' && (this.value == 'vaapi' || this.value == 'qsv')) {
                 page.querySelector('.fldVppTonemapping').classList.remove('hide');
             } else {
                 page.querySelector('.fldVppTonemapping').classList.add('hide');