From cbfa0acfb3ab9334f66af9357799318c94415a28 Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Thu, 16 Jun 2022 23:55:55 +0800
Subject: [PATCH 1/3] Expose VPP TM brightness/contrast gain options

---
 .../dashboard/encodingsettings.html           | 23 ++++++++++++++-----
 src/controllers/dashboard/encodingsettings.js |  8 +++++--
 src/strings/en-us.json                        |  6 ++++-
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
index 9e5b18a88a..f44158f1c8 100644
--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@@ -125,13 +125,24 @@
                     </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 class="vppTonemappingOptions hide">
+                    <div class="checkboxListContainer checkboxContainer-withDescription">
+                        <label>
+                            <input type="checkbox" is="emby-checkbox" id="chkVppTonemapping" />
+                            <span>${EnableVppTonemapping}</span>
+                        </label>
+                        <div class="fieldDescription checkboxFieldDescription">${AllowVppTonemappingHelp}</div>
+                    </div>
+                    <div class="inputContainer">
+                        <input is="emby-input" type="number" id="txtVppTonemappingBrightness" pattern="[0-9]*" min="0" max="100" step=".00001" label="${LabelVppTonemappingBrightness}" />
+                        <div class="fieldDescription">${LabelVppTonemappingBrightnessHelp}</div>
+                    </div>
+                    <div class="inputContainer">
+                        <input is="emby-input" type="number" id="txtVppTonemappingContrast" pattern="[0-9]*" min="1" max="2" step=".00001" label="${LabelVppTonemappingContrast}" />
+                        <div class="fieldDescription">${LabelVppTonemappingContrastHelp}</div>
+                    </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 aeaf28a6be..e1ff452073 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -37,6 +37,8 @@ import alert from '../../components/alert';
         page.querySelector('#txtTonemappingThreshold').value = config.TonemappingThreshold;
         page.querySelector('#txtTonemappingPeak').value = config.TonemappingPeak;
         page.querySelector('#txtTonemappingParam').value = config.TonemappingParam || '';
+        page.querySelector('#txtVppTonemappingBrightness').value = config.VppTonemappingBrightness;
+        page.querySelector('#txtVppTonemappingContrast').value = config.VppTonemappingContrast;
         page.querySelector('#selectEncoderPreset').value = config.EncoderPreset || '';
         page.querySelector('#txtH264Crf').value = config.H264Crf || '';
         page.querySelector('#txtH265Crf').value = config.H265Crf || '';
@@ -91,6 +93,8 @@ import alert from '../../components/alert';
                 config.TonemappingThreshold = form.querySelector('#txtTonemappingThreshold').value;
                 config.TonemappingPeak = form.querySelector('#txtTonemappingPeak').value;
                 config.TonemappingParam = form.querySelector('#txtTonemappingParam').value || '0';
+                config.VppTonemappingBrightness = form.querySelector('#txtVppTonemappingBrightness').value;
+                config.VppTonemappingContrast = form.querySelector('#txtVppTonemappingContrast').value;
                 config.EncoderPreset = form.querySelector('#selectEncoderPreset').value;
                 config.H264Crf = parseInt(form.querySelector('#txtH264Crf').value || '0');
                 config.H265Crf = parseInt(form.querySelector('#txtH265Crf').value || '0');
@@ -205,9 +209,9 @@ import alert from '../../components/alert';
             }
 
             if (systemInfo.OperatingSystem.toLowerCase() === 'linux' && (this.value == 'qsv' || this.value == 'vaapi')) {
-                page.querySelector('.fldVppTonemapping').classList.remove('hide');
+                page.querySelector('.vppTonemappingOptions').classList.remove('hide');
             } else {
-                page.querySelector('.fldVppTonemapping').classList.add('hide');
+                page.querySelector('.vppTonemappingOptions').classList.add('hide');
             }
 
             if (this.value == 'qsv') {
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index af17c594ea..5a1920df66 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1643,5 +1643,9 @@
     "Sample": "Sample",
     "ThemeSong": "Theme Song",
     "ThemeVideo": "Theme Video",
-    "EnableSplashScreen": "Enable the splash screen"
+    "EnableSplashScreen": "Enable the splash screen",
+    "LabelVppTonemappingBrightness": "VPP Tone mapping brightness gain:",
+    "LabelVppTonemappingBrightnessHelp": "Apply brightness gain in VPP tone mapping. Both recommended and default values are 0.",
+    "LabelVppTonemappingContrast": "VPP Tone mapping contrast gain:",
+    "LabelVppTonemappingContrastHelp": "Apply contrast gain in VPP tone mapping. The recommended and default values are 1.2 and 1."
 }

From 8d531976a109b5bf80ab07b3ce776c9f99e16fbd Mon Sep 17 00:00:00 2001
From: "Andriy Kushnir (Orhideous)" <me@orhideous.name>
Date: Thu, 16 Jun 2022 22:16:12 +0300
Subject: [PATCH 2/3] Recognize MIME for transcoded audio in streams

Fixes: #3663
See: jellyfin/jellyfin#6941
---
 src/plugins/htmlAudioPlayer/plugin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/htmlAudioPlayer/plugin.js b/src/plugins/htmlAudioPlayer/plugin.js
index baa396dbb8..adbd291663 100644
--- a/src/plugins/htmlAudioPlayer/plugin.js
+++ b/src/plugins/htmlAudioPlayer/plugin.js
@@ -74,7 +74,7 @@ function enableHlsPlayer(url, item, mediaSource, mediaType) {
                 type: 'HEAD'
             }).then(function (response) {
                 const contentType = (response.headers.get('Content-Type') || '').toLowerCase();
-                if (contentType === 'application/x-mpegurl') {
+                if (contentType === 'application/vnd.apple.mpegurl') {
                     resolve();
                 } else {
                     reject();

From f2a826bb5d707c2a9c9bd3a2492808cb429ef240 Mon Sep 17 00:00:00 2001
From: "Andriy Kushnir (Orhideous)" <me@orhideous.name>
Date: Fri, 17 Jun 2022 13:38:43 +0300
Subject: [PATCH 3/3] Left old MIME type for backward compatibility

---
 src/plugins/htmlAudioPlayer/plugin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/htmlAudioPlayer/plugin.js b/src/plugins/htmlAudioPlayer/plugin.js
index adbd291663..440bb4c3d0 100644
--- a/src/plugins/htmlAudioPlayer/plugin.js
+++ b/src/plugins/htmlAudioPlayer/plugin.js
@@ -74,7 +74,7 @@ function enableHlsPlayer(url, item, mediaSource, mediaType) {
                 type: 'HEAD'
             }).then(function (response) {
                 const contentType = (response.headers.get('Content-Type') || '').toLowerCase();
-                if (contentType === 'application/vnd.apple.mpegurl') {
+                if (contentType === 'application/vnd.apple.mpegurl' || contentType === 'application/x-mpegurl') {
                     resolve();
                 } else {
                     reject();