Merge remote-tracking branch 'jellyfinorigin/master' into feature/EFUserData

5 files changed, 56 insertions, 17 deletions

diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index 4c5213d4e..2720c0bdf 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CA1819 // XML serialization handles collections improperly, so we need to use arrays
+
 #nullable disable
 using MediaBrowser.Model.Entities;
 
@@ -30,9 +32,9 @@ public class EncodingOptions
         EnableTonemapping = false;
         EnableVppTonemapping = false;
         EnableVideoToolboxTonemapping = false;
-        TonemappingAlgorithm = "bt2390";
-        TonemappingMode = "auto";
-        TonemappingRange = "auto";
+        TonemappingAlgorithm = TonemappingAlgorithm.bt2390;
+        TonemappingMode = TonemappingMode.auto;
+        TonemappingRange = TonemappingRange.auto;
         TonemappingDesat = 0;
         TonemappingPeak = 100;
         TonemappingParam = 0;
@@ -41,9 +43,11 @@ public class EncodingOptions
         H264Crf = 23;
         H265Crf = 28;
         DeinterlaceDoubleRate = false;
-        DeinterlaceMethod = "yadif";
+        DeinterlaceMethod = DeinterlaceMethod.yadif;
         EnableDecodingColorDepth10Hevc = true;
         EnableDecodingColorDepth10Vp9 = true;
+        EnableDecodingColorDepth10HevcRext = false;
+        EnableDecodingColorDepth12HevcRext = false;
         // Enhanced Nvdec or system native decoder is required for DoVi to SDR tone-mapping.
         EnableEnhancedNvdecDecoder = true;
         PreferSystemNativeHwDecoder = true;
@@ -53,8 +57,8 @@ public class EncodingOptions
         AllowHevcEncoding = false;
         AllowAv1Encoding = false;
         EnableSubtitleExtraction = true;
-        AllowOnDemandMetadataBasedKeyframeExtractionForExtensions = new[] { "mkv" };
-        HardwareDecodingCodecs = new string[] { "h264", "vc1" };
+        AllowOnDemandMetadataBasedKeyframeExtractionForExtensions = ["mkv"];
+        HardwareDecodingCodecs = ["h264", "vc1"];
     }
 
     /// <summary>
@@ -120,7 +124,7 @@ public class EncodingOptions
     /// <summary>
     /// Gets or sets the hardware acceleration type.
     /// </summary>
-    public string HardwareAccelerationType { get; set; }
+    public HardwareAccelerationType HardwareAccelerationType { get; set; }
 
     /// <summary>
     /// Gets or sets the FFmpeg path as set by the user via the UI.
@@ -160,17 +164,17 @@ public class EncodingOptions
     /// <summary>
     /// Gets or sets the tone-mapping algorithm.
     /// </summary>
-    public string TonemappingAlgorithm { get; set; }
+    public TonemappingAlgorithm TonemappingAlgorithm { get; set; }
 
     /// <summary>
     /// Gets or sets the tone-mapping mode.
     /// </summary>
-    public string TonemappingMode { get; set; }
+    public TonemappingMode TonemappingMode { get; set; }
 
     /// <summary>
     /// Gets or sets the tone-mapping range.
     /// </summary>
-    public string TonemappingRange { get; set; }
+    public TonemappingRange TonemappingRange { get; set; }
 
     /// <summary>
     /// Gets or sets the tone-mapping desaturation.
@@ -210,7 +214,7 @@ public class EncodingOptions
     /// <summary>
     /// Gets or sets the encoder preset.
     /// </summary>
-    public string EncoderPreset { get; set; }
+    public EncoderPreset? EncoderPreset { get; set; }
 
     /// <summary>
     /// Gets or sets a value indicating whether the framerate is doubled when deinterlacing.
@@ -220,7 +224,7 @@ public class EncodingOptions
     /// <summary>
     /// Gets or sets the deinterlace method.
     /// </summary>
-    public string DeinterlaceMethod { get; set; }
+    public DeinterlaceMethod DeinterlaceMethod { get; set; }
 
     /// <summary>
     /// Gets or sets a value indicating whether 10bit HEVC decoding is enabled.
@@ -233,6 +237,16 @@ public class EncodingOptions
     public bool EnableDecodingColorDepth10Vp9 { get; set; }
 
     /// <summary>
+    /// Gets or sets a value indicating whether 8/10bit HEVC RExt decoding is enabled.
+    /// </summary>
+    public bool EnableDecodingColorDepth10HevcRext { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether 12bit HEVC RExt decoding is enabled.
+    /// </summary>
+    public bool EnableDecodingColorDepth12HevcRext { get; set; }
+
+    /// <summary>
     /// Gets or sets a value indicating whether the enhanced NVDEC is enabled.
     /// </summary>
     public bool EnableEnhancedNvdecDecoder { get; set; }
diff --git a/MediaBrowser.Model/Configuration/LibraryOptions.cs b/MediaBrowser.Model/Configuration/LibraryOptions.cs
index b0f5c2a11..6054ba34e 100644
--- a/MediaBrowser.Model/Configuration/LibraryOptions.cs
+++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs
@@ -2,15 +2,20 @@
 
 using System;
 using System.ComponentModel;
+using System.Linq;
 
 namespace MediaBrowser.Model.Configuration
 {
     public class LibraryOptions
     {
+        private static readonly string[] _defaultTagDelimiters = ["/", "|", ";", "\\"];
+
         public LibraryOptions()
         {
             TypeOptions = Array.Empty<TypeOptions>();
             DisabledSubtitleFetchers = Array.Empty<string>();
+            DisabledMediaSegmentProviders = Array.Empty<string>();
+            MediaSegmentProvideOrder = Array.Empty<string>();
             SubtitleFetcherOrder = Array.Empty<string>();
             DisabledLocalMetadataReaders = Array.Empty<string>();
             DisabledLyricFetchers = Array.Empty<string>();
@@ -24,9 +29,15 @@ namespace MediaBrowser.Model.Configuration
             EnablePhotos = true;
             SaveSubtitlesWithMedia = true;
             SaveLyricsWithMedia = false;
+            SaveTrickplayWithMedia = false;
             PathInfos = Array.Empty<MediaPathInfo>();
             EnableAutomaticSeriesGrouping = true;
             SeasonZeroDisplayName = "Specials";
+
+            PreferNonstandardArtistsTag = false;
+            UseCustomTagDelimiters = false;
+            CustomTagDelimiters = _defaultTagDelimiters;
+            DelimiterWhitelist = Array.Empty<string>();
         }
 
         public bool Enabled { get; set; } = true;
@@ -86,6 +97,10 @@ namespace MediaBrowser.Model.Configuration
 
         public string[] SubtitleFetcherOrder { get; set; }
 
+        public string[] DisabledMediaSegmentProviders { get; set; }
+
+        public string[] MediaSegmentProvideOrder { get; set; }
+
         public bool SkipSubtitlesIfEmbeddedSubtitlesPresent { get; set; }
 
         public bool SkipSubtitlesIfAudioTrackMatches { get; set; }
@@ -99,10 +114,23 @@ namespace MediaBrowser.Model.Configuration
         [DefaultValue(false)]
         public bool SaveLyricsWithMedia { get; set; }
 
+        [DefaultValue(false)]
+        public bool SaveTrickplayWithMedia { get; set; }
+
         public string[] DisabledLyricFetchers { get; set; }
 
         public string[] LyricFetcherOrder { get; set; }
 
+        [DefaultValue(false)]
+        public bool PreferNonstandardArtistsTag { get; set; }
+
+        [DefaultValue(false)]
+        public bool UseCustomTagDelimiters { get; set; }
+
+        public string[] CustomTagDelimiters { get; set; }
+
+        public string[] DelimiterWhitelist { get; set; }
+
         public bool AutomaticallyAddToCollection { get; set; }
 
         public EmbeddedSubtitleOptions AllowEmbeddedSubtitles { get; set; }
diff --git a/MediaBrowser.Model/Configuration/MediaPathInfo.cs b/MediaBrowser.Model/Configuration/MediaPathInfo.cs
index a7bc43590..25a5d5606 100644
--- a/MediaBrowser.Model/Configuration/MediaPathInfo.cs
+++ b/MediaBrowser.Model/Configuration/MediaPathInfo.cs
@@ -16,7 +16,5 @@ namespace MediaBrowser.Model.Configuration
         }
 
         public string Path { get; set; }
-
-        public string? NetworkPath { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Configuration/MetadataPluginType.cs b/MediaBrowser.Model/Configuration/MetadataPluginType.cs
index ef303726d..670d6e383 100644
--- a/MediaBrowser.Model/Configuration/MetadataPluginType.cs
+++ b/MediaBrowser.Model/Configuration/MetadataPluginType.cs
@@ -14,6 +14,7 @@ namespace MediaBrowser.Model.Configuration
         MetadataFetcher,
         MetadataSaver,
         SubtitleFetcher,
-        LyricFetcher
+        LyricFetcher,
+        MediaSegmentProvider
     }
 }
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 52f7e53b8..5ad588200 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -96,8 +96,6 @@ public class ServerConfiguration : BaseApplicationConfiguration
     /// <value>The metadata path.</value>
     public string MetadataPath { get; set; } = string.Empty;
 
-    public string MetadataNetworkPath { get; set; } = string.Empty;
-
     /// <summary>
     /// Gets or sets the preferred metadata language.
     /// </summary>