From 372291e9375d504184f1dbc8c9b72084723da86f Mon Sep 17 00:00:00 2001
From: Bill Thornton <thornbill@users.noreply.github.com>
Date: Fri, 17 Jun 2022 12:52:15 -0400
Subject: [PATCH] Merge pull request #3714 from nyanmisaka/vpp-tm-configs

Expose VPP TM brightness/contrast gain options

(cherry picked from commit 6142283e99d2c8f1a3419b62a05480859fa3331a)
Signed-off-by: Bill Thornton <billt2006@gmail.com>
---
 .../dashboard/encodingsettings.html           | 23 ++++++++++++++-----
 src/controllers/dashboard/encodingsettings.js |  8 +++++--
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
index adb9ef62c6..048a957b4e 100644
--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@@ -126,13 +126,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 308fc0cba3..4a67eaa22a 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') {