1 files changed, 34 insertions, 9 deletions

diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index 0ff95a2e1..3f0e98ec8 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -14,11 +14,14 @@ public class EncodingOptions
     public EncodingOptions()
     {
         EnableFallbackFont = false;
+        EnableAudioVbr = false;
         DownMixAudioBoost = 2;
         DownMixStereoAlgorithm = DownMixStereoAlgorithms.None;
         MaxMuxingQueueSize = 2048;
         EnableThrottling = false;
         ThrottleDelaySeconds = 180;
+        EnableSegmentDeletion = false;
+        SegmentKeepSeconds = 720;
         EncodingThreadCount = -1;
         // This is a DRM device that is almost guaranteed to be there on every intel platform,
         // plus it's the default one in ffmpeg if you don't specify anything
@@ -26,25 +29,27 @@ 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;
         DeinterlaceMethod = "yadif";
         EnableDecodingColorDepth10Hevc = true;
         EnableDecodingColorDepth10Vp9 = true;
-        EnableEnhancedNvdecDecoder = false;
+        // Enhanced Nvdec or system native decoder is required for DoVi to SDR tone-mapping.
+        EnableEnhancedNvdecDecoder = true;
         PreferSystemNativeHwDecoder = true;
         EnableIntelLowPowerH264HwEncoder = false;
         EnableIntelLowPowerHevcHwEncoder = false;
         EnableHardwareEncoding = true;
         AllowHevcEncoding = false;
+        AllowAv1Encoding = false;
         EnableSubtitleExtraction = true;
         AllowOnDemandMetadataBasedKeyframeExtractionForExtensions = new[] { "mkv" };
         HardwareDecodingCodecs = new string[] { "h264", "vc1" };
@@ -71,6 +76,11 @@ public class EncodingOptions
     public bool EnableFallbackFont { get; set; }
 
     /// <summary>
+    /// Gets or sets a value indicating whether audio VBR is enabled.
+    /// </summary>
+    public bool EnableAudioVbr { get; set; }
+
+    /// <summary>
     /// Gets or sets the audio boost applied when downmixing audio.
     /// </summary>
     public double DownMixAudioBoost { get; set; }
@@ -96,6 +106,16 @@ public class EncodingOptions
     public int ThrottleDelaySeconds { get; set; }
 
     /// <summary>
+    /// Gets or sets a value indicating whether segment deletion is enabled.
+    /// </summary>
+    public bool EnableSegmentDeletion { get; set; }
+
+    /// <summary>
+    /// Gets or sets seconds for which segments should be kept before being deleted.
+    /// </summary>
+    public int SegmentKeepSeconds { get; set; }
+
+    /// <summary>
     /// Gets or sets the hardware acceleration type.
     /// </summary>
     public string HardwareAccelerationType { get; set; }
@@ -131,6 +151,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; }
@@ -141,11 +166,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; }
@@ -231,6 +251,11 @@ public class EncodingOptions
     public bool AllowHevcEncoding { get; set; }
 
     /// <summary>
+    /// Gets or sets a value indicating whether AV1 encoding is enabled.
+    /// </summary>
+    public bool AllowAv1Encoding { get; set; }
+
+    /// <summary>
     /// Gets or sets a value indicating whether subtitle extraction is enabled.
     /// </summary>
     public bool EnableSubtitleExtraction { get; set; }