From 998df179a8e49d6cbb73f0ace2237a2a8a34738a Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Wed, 10 Feb 2021 09:42:25 -0500
Subject: [PATCH] Merge pull request #2350 from nyanmisaka/nvdec-vpp

(cherry picked from commit f7f0d688e8ae772e9c42cd8cad5f80d8226f4fb6)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
---
 src/components/playerstats/playerstats.js     | 13 +++++----
 .../dashboard/encodingsettings.html           | 14 ++++++++++
 src/controllers/dashboard/encodingsettings.js | 27 +++++++++++++++++++
 src/strings/en-us.json                        |  5 +++-
 src/strings/zh-cn.json                        | 19 ++++++++++++-
 5 files changed, 69 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..aa5d030746 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>
@@ -103,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>
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index c0ff10eeb7..83c965880b 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);
@@ -26,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;
@@ -81,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;
@@ -101,6 +104,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 () {
@@ -156,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');
@@ -181,6 +196,18 @@ 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 (systemInfo.OperatingSystem.toLowerCase() === 'linux' && (this.value == 'vaapi' || this.value == 'qsv')) {
+                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 747892d638..08341163a0 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1499,5 +1499,8 @@
     "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",
+    "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 829b2eb992..21b014cb97 100644
--- a/src/strings/zh-cn.json
+++ b/src/strings/zh-cn.json
@@ -1487,5 +1487,22 @@
     "HeaderDebugging": "调试和跟踪",
     "HeaderAutoDiscovery": "网络发现",
     "HeaderAddUser": "添加用户",
-    "HeaderAddUpdateSubtitle": "添加 / 更新字幕"
+    "HeaderAddUpdateSubtitle": "添加 / 更新字幕",
+    "SyncPlayGroupDefaultTitle": "{0} 的群组",
+    "MessageSyncPlayIsDisabled": "需要权限来启用同步播放。",
+    "LabelSyncPlayTimeSyncOffset": "时间偏差：",
+    "LabelSyncPlayTimeSyncDevice": "与时间同步：",
+    "LabelSyncPlayResumePlaybackDescription": "加入群组播放",
+    "LabelSyncPlayResumePlayback": "恢复本地播放",
+    "LabelSyncPlayHaltPlaybackDescription": "并且忽略当前的播放列表更新",
+    "LabelSyncPlayHaltPlayback": "停止本地播放",
+    "LabelMaxAudiobookResumeHelp": "如果在此时间之后停止播放，媒体会标记为“已播放”。",
+    "LabelMinAudiobookResumeHelp": "如果在此时间之前停止播放，媒体会标记为“未播放”。",
+    "LabelMinAudiobookResume": "恢复播放有声读物的最短时间：",
+    "LabelMaxAudiobookResume": "恢复播放有声读物的最长时间：",
+    "MessagePlaybackError": "在您的 Google Cast 接收器上播放此文件时发生错误。",
+    "MessageChromecastConnectionError": "您的 Google Cast 接收器无法联系 Jellyfin 服务器。请检查连接，然后重试。",
+    "EnableEnhancedNvdecDecoder": "启用增强的 NVDEC 解码器",
+    "EnableVppTonemapping": "启用 VPP 色调映射",
+    "AllowVppTonemappingHelp": "完全基于硬件的色调映射，不需要 OpenCL 滤镜。目前仅在转码内嵌 HDR10 元数据的视频时生效。"
 }