1 files changed, 62 insertions, 37 deletions

diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
index 92e40fb01..ec3b37efa 100644
--- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs
+++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
@@ -1,48 +1,81 @@
+#nullable disable
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.MediaInfo;
-using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Session;
 
 namespace MediaBrowser.Model.Dto
 {
     public class MediaSourceInfo
     {
+        public MediaSourceInfo()
+        {
+            Formats = Array.Empty<string>();
+            MediaStreams = new List<MediaStream>();
+            MediaAttachments = Array.Empty<MediaAttachment>();
+            RequiredHttpHeaders = new Dictionary<string, string>();
+            SupportsTranscoding = true;
+            SupportsDirectStream = true;
+            SupportsDirectPlay = true;
+            SupportsProbing = true;
+        }
+
         public MediaProtocol Protocol { get; set; }
+
         public string Id { get; set; }
 
         public string Path { get; set; }
 
         public string EncoderPath { get; set; }
+
         public MediaProtocol? EncoderProtocol { get; set; }
 
         public MediaSourceType Type { get; set; }
 
         public string Container { get; set; }
+
         public long? Size { get; set; }
 
         public string Name { get; set; }
 
         /// <summary>
-        /// Differentiate internet url vs local network
+        /// Gets or sets a value indicating whether the media is remote.
+        /// Differentiate internet url vs local network.
         /// </summary>
         public bool IsRemote { get; set; }
 
         public string ETag { get; set; }
+
         public long? RunTimeTicks { get; set; }
+
         public bool ReadAtNativeFramerate { get; set; }
+
         public bool IgnoreDts { get; set; }
+
         public bool IgnoreIndex { get; set; }
+
         public bool GenPtsInput { get; set; }
+
         public bool SupportsTranscoding { get; set; }
+
         public bool SupportsDirectStream { get; set; }
+
         public bool SupportsDirectPlay { get; set; }
+
         public bool IsInfiniteStream { get; set; }
+
         public bool RequiresOpening { get; set; }
+
         public string OpenToken { get; set; }
+
         public bool RequiresClosing { get; set; }
+
         public string LiveStreamId { get; set; }
+
         public int? BufferMs { get; set; }
 
         public bool RequiresLooping { get; set; }
@@ -57,28 +90,46 @@ namespace MediaBrowser.Model.Dto
 
         public List<MediaStream> MediaStreams { get; set; }
 
+        public IReadOnlyList<MediaAttachment> MediaAttachments { get; set; }
+
         public string[] Formats { get; set; }
 
         public int? Bitrate { get; set; }
 
         public TransportStreamTimestamp? Timestamp { get; set; }
+
         public Dictionary<string, string> RequiredHttpHeaders { get; set; }
 
         public string TranscodingUrl { get; set; }
+
         public string TranscodingSubProtocol { get; set; }
+
         public string TranscodingContainer { get; set; }
 
         public int? AnalyzeDurationMs { get; set; }
 
-        public MediaSourceInfo()
+        [JsonIgnore]
+        public TranscodeReason[] TranscodeReasons { get; set; }
+
+        public int? DefaultAudioStreamIndex { get; set; }
+
+        public int? DefaultSubtitleStreamIndex { get; set; }
+
+        [JsonIgnore]
+        public MediaStream VideoStream
         {
-            Formats = Array.Empty<string>();
-            MediaStreams = new List<MediaStream>();
-            RequiredHttpHeaders = new Dictionary<string, string>();
-            SupportsTranscoding = true;
-            SupportsDirectStream = true;
-            SupportsDirectPlay = true;
-            SupportsProbing = true;
+            get
+            {
+                foreach (var i in MediaStreams)
+                {
+                    if (i.Type == MediaStreamType.Video)
+                    {
+                        return i;
+                    }
+                }
+
+                return null;
+            }
         }
 
         public void InferTotalBitrate(bool force = false)
@@ -108,12 +159,6 @@ namespace MediaBrowser.Model.Dto
             }
         }
 
-        [IgnoreDataMember]
-        public TranscodeReason[] TranscodeReasons { get; set; }
-
-        public int? DefaultAudioStreamIndex { get; set; }
-        public int? DefaultSubtitleStreamIndex { get; set; }
-
         public MediaStream GetDefaultAudioStream(int? defaultIndex)
         {
             if (defaultIndex.HasValue)
@@ -148,23 +193,6 @@ namespace MediaBrowser.Model.Dto
             return null;
         }
 
-        [IgnoreDataMember]
-        public MediaStream VideoStream
-        {
-            get
-            {
-                foreach (var i in MediaStreams)
-                {
-                    if (i.Type == MediaStreamType.Video)
-                    {
-                        return i;
-                    }
-                }
-
-                return null;
-            }
-        }
-
         public MediaStream GetMediaStream(MediaStreamType type, int index)
         {
             foreach (var i in MediaStreams)
@@ -207,10 +235,7 @@ namespace MediaBrowser.Model.Dto
             {
                 if (currentStream.Type == MediaStreamType.Audio && currentStream.IsDefault)
                 {
-                    if (currentStream.Index != stream.Index)
-                    {
-                        return true;
-                    }
+                    return currentStream.Index != stream.Index;
                 }
             }