Merge pull request #5 from jellyfin/dev

Dev

5 files changed, 26 insertions, 34 deletions

diff --git a/MediaBrowser.Model/Dlna/ContainerProfile.cs b/MediaBrowser.Model/Dlna/ContainerProfile.cs
index 3fb0682b03..ccad4cead4 100644
--- a/MediaBrowser.Model/Dlna/ContainerProfile.cs
+++ b/MediaBrowser.Model/Dlna/ContainerProfile.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Xml.Serialization;
-using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Dlna
@@ -17,7 +15,7 @@ namespace MediaBrowser.Model.Dlna
 
         public ContainerProfile()
         {
-            Conditions = new ProfileCondition[] { };
+            Conditions = Array.Empty<ProfileCondition>();
         }
 
         public string[] GetContainers()
@@ -25,13 +23,11 @@ namespace MediaBrowser.Model.Dlna
             return SplitValue(Container);
         }
 
-        private static readonly string[] EmptyStringArray = Array.Empty<string>();
-
         public static string[] SplitValue(string value)
         {
             if (string.IsNullOrEmpty(value))
             {
-                return EmptyStringArray;
+                return Array.Empty<string>();
             }
 
             return value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
diff --git a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
index 966c4a8ce2..88d7573e60 100644
--- a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
+++ b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
@@ -1,7 +1,6 @@
 using MediaBrowser.Model.MediaInfo;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace MediaBrowser.Model.Dlna
 {
@@ -28,7 +27,7 @@ namespace MediaBrowser.Model.Dlna
             DlnaFlags flagValue = DlnaFlags.BackgroundTransferMode |
                             DlnaFlags.InteractiveTransferMode |
                             DlnaFlags.DlnaV15;
-            
+
             string dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}",
              DlnaMaps.FlagsToString(flagValue));
 
diff --git a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
index 4fdf4972f6..4cde26a03c 100644
--- a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
+++ b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
@@ -1,13 +1,12 @@
 using System;
-using System.Collections.Generic;
 using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Dlna
 {
     public class ResolutionNormalizer
     {
-        private static readonly ResolutionConfiguration[] Configurations = 
-            new []
+        private static readonly ResolutionConfiguration[] Configurations =
+            new[]
             {
                 new ResolutionConfiguration(426, 320000),
                 new ResolutionConfiguration(640, 400000),
@@ -20,24 +19,24 @@ namespace MediaBrowser.Model.Dlna
         public static ResolutionOptions Normalize(int? inputBitrate,
             int? unused1,
             int? unused2,
-			int outputBitrate,
-			string inputCodec,
+            int outputBitrate,
+            string inputCodec,
             string outputCodec,
             int? maxWidth,
             int? maxHeight)
         {
-			// If the bitrate isn't changing, then don't downlscale the resolution
-			if (inputBitrate.HasValue && outputBitrate >= inputBitrate.Value) 
-			{
-				if (maxWidth.HasValue || maxHeight.HasValue) 
-				{
-					return new ResolutionOptions
-					{
-						MaxWidth = maxWidth,
-						MaxHeight = maxHeight
-					};
-				}
-			}
+            // If the bitrate isn't changing, then don't downlscale the resolution
+            if (inputBitrate.HasValue && outputBitrate >= inputBitrate.Value)
+            {
+                if (maxWidth.HasValue || maxHeight.HasValue)
+                {
+                    return new ResolutionOptions
+                    {
+                        MaxWidth = maxWidth,
+                        MaxHeight = maxHeight
+                    };
+                }
+            }
 
             var resolutionConfig = GetResolutionConfiguration(outputBitrate);
             if (resolutionConfig != null)
@@ -90,8 +89,8 @@ namespace MediaBrowser.Model.Dlna
         {
             var inputScaleFactor = GetVideoBitrateScaleFactor(inputVideoCodec);
             var outputScaleFactor = GetVideoBitrateScaleFactor(outputVideoCodec);
-            var scaleFactor = outputScaleFactor/inputScaleFactor;
-            var newBitrate = scaleFactor*bitrate;
+            var scaleFactor = outputScaleFactor / inputScaleFactor;
+            var newBitrate = scaleFactor * bitrate;
 
             return Convert.ToInt32(newBitrate);
         }
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index c927cd31cc..ba0ac04866 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -18,10 +18,10 @@ namespace MediaBrowser.Model.Dlna
     {
         public StreamInfo()
         {
-            AudioCodecs = new string[] { };
-            VideoCodecs = new string[] { };
-            SubtitleCodecs = new string[] { };
-            TranscodeReasons = new TranscodeReason[] { };
+            AudioCodecs = Array.Empty<string>();
+            VideoCodecs = Array.Empty<string>();
+            SubtitleCodecs = Array.Empty<string>();
+            TranscodeReasons = Array.Empty<TranscodeReason>();
             StreamOptions = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
         }
 
diff --git a/MediaBrowser.Model/Dlna/SubtitleProfile.cs b/MediaBrowser.Model/Dlna/SubtitleProfile.cs
index a7e61e69a5..f85ba4a7a3 100644
--- a/MediaBrowser.Model/Dlna/SubtitleProfile.cs
+++ b/MediaBrowser.Model/Dlna/SubtitleProfile.cs
@@ -1,7 +1,5 @@
 using MediaBrowser.Model.Extensions;
-using System.Collections.Generic;
 using System.Xml.Serialization;
-using MediaBrowser.Model.Dlna;
 
 namespace MediaBrowser.Model.Dlna
 {
@@ -43,4 +41,4 @@ namespace MediaBrowser.Model.Dlna
             return languages.Length == 0 || ListHelper.ContainsIgnoreCase(languages, subLanguage);
         }
     }
-}
\ No newline at end of file
+}