From 4c8d3827658342b630472cc4dc1601ae56ffe39c Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Tue, 13 Jun 2023 10:53:35 -0400
Subject: Backport pull request #9642 from jellyfin/release-10.8.z

Fix the brightness of VPP tonemap and add the tonemap mode

Original-merge: d5a8419bc52ba06c070012849ba166dd2fbff8b0

Merged-by: Cody Robibero <cody@robibe.ro>

Backported-by: Bond_009 <bond.009@outlook.com>
---
 MediaBrowser.Model/Configuration/EncodingOptions.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'MediaBrowser.Model/Configuration/EncodingOptions.cs')

diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index f9f63f751..ac2f1e71a 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -27,13 +27,13 @@ public class EncodingOptions
         EnableTonemapping = false;
         EnableVppTonemapping = false;
         TonemappingAlgorithm = "bt2390";
+        TonemappingMode = "auto";
         TonemappingRange = "auto";
         TonemappingDesat = 0;
-        TonemappingThreshold = 0.8;
         TonemappingPeak = 100;
         TonemappingParam = 0;
-        VppTonemappingBrightness = 0;
-        VppTonemappingContrast = 1.2;
+        VppTonemappingBrightness = 16;
+        VppTonemappingContrast = 1;
         H264Crf = 23;
         H265Crf = 28;
         DeinterlaceDoubleRate = false;
@@ -137,6 +137,11 @@ public class EncodingOptions
     /// </summary>
     public string TonemappingAlgorithm { get; set; }
 
+    /// <summary>
+    /// Gets or sets the tone-mapping mode.
+    /// </summary>
+    public string TonemappingMode { get; set; }
+
     /// <summary>
     /// Gets or sets the tone-mapping range.
     /// </summary>
@@ -147,11 +152,6 @@ public class EncodingOptions
     /// </summary>
     public double TonemappingDesat { get; set; }
 
-    /// <summary>
-    /// Gets or sets the tone-mapping threshold.
-    /// </summary>
-    public double TonemappingThreshold { get; set; }
-
     /// <summary>
     /// Gets or sets the tone-mapping peak.
     /// </summary>
-- 
cgit v1.2.3