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>

2 files changed, 26 insertions, 13 deletions

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 906a04a61..b6fa49fcd 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -45,6 +45,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
         private readonly Version _minFFmpegImplictHwaccel = new Version(6, 0);
         private readonly Version _minFFmpegHwaUnsafeOutput = new Version(6, 0);
+        private readonly Version _minFFmpegOclCuTonemapMode = new Version(5, 1, 3);
 
         private static readonly string[] _videoProfilesH264 = new[]
         {
@@ -2929,7 +2930,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             return string.Empty;
         }
 
-        public static string GetHwTonemapFilter(EncodingOptions options, string hwTonemapSuffix, string videoFormat)
+        public string GetHwTonemapFilter(EncodingOptions options, string hwTonemapSuffix, string videoFormat)
         {
             if (string.IsNullOrEmpty(hwTonemapSuffix))
             {
@@ -2941,7 +2942,8 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             if (string.Equals(hwTonemapSuffix, "vaapi", StringComparison.OrdinalIgnoreCase))
             {
-                args = "tonemap_vaapi=format={0}:p=bt709:t=bt709:m=bt709,procamp_vaapi=b={1}:c={2}:extra_hw_frames=16";
+                args = "procamp_vaapi=b={2}:c={3}," + args + ":extra_hw_frames=32";
+
                 return string.Format(
                         CultureInfo.InvariantCulture,
                         args,
@@ -2972,14 +2974,24 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 args = "tonemap_{0}=format={1}:p=bt709:t=bt709:m=bt709:tonemap={2}:peak={3}:desat={4}";
 
+                if (string.Equals(options.TonemappingMode, "max", StringComparison.OrdinalIgnoreCase)
+                    || string.Equals(options.TonemappingMode, "rgb", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (_mediaEncoder.EncoderVersion >= _minFFmpegOclCuTonemapMode)
+                    {
+                        args += ":tonemap_mode={5}";
+                    }
+                }
+
                 if (options.TonemappingParam != 0)
                 {
-                    args += ":param={5}";
+                    args += ":param={6}";
                 }
 
-                if (!string.Equals(options.TonemappingRange, "auto", StringComparison.OrdinalIgnoreCase))
+                if (string.Equals(options.TonemappingRange, "tv", StringComparison.OrdinalIgnoreCase)
+                    || string.Equals(options.TonemappingRange, "pc", StringComparison.OrdinalIgnoreCase))
                 {
-                    args += ":range={6}";
+                    args += ":range={7}";
                 }
             }
 
@@ -2991,6 +3003,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     algorithm,
                     options.TonemappingPeak,
                     options.TonemappingDesat,
+                    options.TonemappingMode,
                     options.TonemappingParam,
                     options.TonemappingRange);
         }
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;
@@ -138,6 +138,11 @@ public class EncodingOptions
     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>
     public string TonemappingRange { get; set; }
@@ -148,11 +153,6 @@ public class EncodingOptions
     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>
     public double TonemappingPeak { get; set; }