Merge branch 'master' into segment-deletion

2 files changed, 56 insertions, 4 deletions

diff --git a/MediaBrowser.Model/Drawing/DrawingUtils.cs b/MediaBrowser.Model/Drawing/DrawingUtils.cs
index 5567927682..2040d26bbb 100644
--- a/MediaBrowser.Model/Drawing/DrawingUtils.cs
+++ b/MediaBrowser.Model/Drawing/DrawingUtils.cs
@@ -71,18 +71,18 @@ namespace MediaBrowser.Model.Drawing
             int? fillHeight)
         {
             // Return original size if input is invalid.
-            if ((fillWidth == null || fillWidth == 0)
-                && (fillHeight == null || fillHeight == 0))
+            if ((fillWidth is null || fillWidth == 0)
+                && (fillHeight is null || fillHeight == 0))
             {
                 return size;
             }
 
-            if (fillWidth == null || fillWidth == 0)
+            if (fillWidth is null || fillWidth == 0)
             {
                 fillWidth = 1;
             }
 
-            if (fillHeight == null || fillHeight == 0)
+            if (fillHeight is null || fillHeight == 0)
             {
                 fillHeight = 1;
             }
diff --git a/MediaBrowser.Model/Drawing/ImageResolution.cs b/MediaBrowser.Model/Drawing/ImageResolution.cs
new file mode 100644
index 0000000000..34738b7990
--- /dev/null
+++ b/MediaBrowser.Model/Drawing/ImageResolution.cs
@@ -0,0 +1,52 @@
+namespace MediaBrowser.Model.Drawing;
+
+/// <summary>
+/// Enum ImageResolution.
+/// </summary>
+public enum ImageResolution
+{
+    /// <summary>
+    /// MatchSource.
+    /// </summary>
+    MatchSource = 0,
+
+    /// <summary>
+    /// 144p.
+    /// </summary>
+    P144 = 1,
+
+    /// <summary>
+    /// 240p.
+    /// </summary>
+    P240 = 2,
+
+    /// <summary>
+    /// 360p.
+    /// </summary>
+    P360 = 3,
+
+    /// <summary>
+    /// 480p.
+    /// </summary>
+    P480 = 4,
+
+    /// <summary>
+    /// 720p.
+    /// </summary>
+    P720 = 5,
+
+    /// <summary>
+    /// 1080p.
+    /// </summary>
+    P1080 = 6,
+
+    /// <summary>
+    /// 1440p.
+    /// </summary>
+    P1440 = 7,
+
+    /// <summary>
+    /// 2160p.
+    /// </summary>
+    P2160 = 8
+}