Merge pull request #16803 from nyanmisaka/new-profile-condition-video-rotation

Add videoRotation profile condition

3 files changed, 39 insertions, 34 deletions

diff --git a/MediaBrowser.Controller/MediaEncoding/BaseEncodingJobOptions.cs b/MediaBrowser.Controller/MediaEncoding/BaseEncodingJobOptions.cs
index 10f2f04af6..34826982af 100644
--- a/MediaBrowser.Controller/MediaEncoding/BaseEncodingJobOptions.cs
+++ b/MediaBrowser.Controller/MediaEncoding/BaseEncodingJobOptions.cs
@@ -92,6 +92,12 @@ namespace MediaBrowser.Controller.MediaEncoding
         public string CodecTag { get; set; }
 
         /// <summary>
+        /// Gets or sets the rotation.
+        /// </summary>
+        /// <value>The video rotation angle, usually 0 or +-90/180.</value>
+        public string Rotation { get; set; }
+
+        /// <summary>
         /// Gets or sets the framerate.
         /// </summary>
         /// <value>The framerate.</value>
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index a0e04eae63..04b13a6f3c 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -2466,6 +2466,17 @@ namespace MediaBrowser.Controller.MediaEncoding
                 }
             }
 
+            var requestedRotations = state.GetRequestedRotations(videoStream.Codec);
+            if (requestedRotations.Length > 0)
+            {
+                var rotation = state.VideoStream?.Rotation ?? 0;
+                if (rotation != 0
+                    && !requestedRotations.Contains(rotation.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal))
+                {
+                    return false;
+                }
+            }
+
             // Video width must fall within requested value
             if (request.MaxWidth.HasValue
                 && (!videoStream.Width.HasValue || videoStream.Width.Value > request.MaxWidth.Value))
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
index 7d0384ef27..3a1897a244 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -571,62 +571,50 @@ namespace MediaBrowser.Controller.MediaEncoding
 
         public string[] GetRequestedProfiles(string codec)
         {
-            if (!string.IsNullOrEmpty(BaseRequest.Profile))
-            {
-                return BaseRequest.Profile.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
-            }
+            var profile = BaseRequest.Profile;
 
-            if (!string.IsNullOrEmpty(codec))
+            if (string.IsNullOrEmpty(profile) && !string.IsNullOrEmpty(codec))
             {
-                var profile = BaseRequest.GetOption(codec, "profile");
-
-                if (!string.IsNullOrEmpty(profile))
-                {
-                    return profile.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
-                }
+                profile = BaseRequest.GetOption(codec, "profile");
             }
 
-            return Array.Empty<string>();
+            return (profile ?? string.Empty).Split(_separators, StringSplitOptions.RemoveEmptyEntries);
         }
 
         public string[] GetRequestedRangeTypes(string codec)
         {
-            if (!string.IsNullOrEmpty(BaseRequest.VideoRangeType))
-            {
-                return BaseRequest.VideoRangeType.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
-            }
+            var rangetype = BaseRequest.VideoRangeType;
 
-            if (!string.IsNullOrEmpty(codec))
+            if (string.IsNullOrEmpty(rangetype) && !string.IsNullOrEmpty(codec))
             {
-                var rangetype = BaseRequest.GetOption(codec, "rangetype");
-
-                if (!string.IsNullOrEmpty(rangetype))
-                {
-                    return rangetype.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
-                }
+                rangetype = BaseRequest.GetOption(codec, "rangetype");
             }
 
-            return Array.Empty<string>();
+            return (rangetype ?? string.Empty).Split(_separators, StringSplitOptions.RemoveEmptyEntries);
         }
 
         public string[] GetRequestedCodecTags(string codec)
         {
-            if (!string.IsNullOrEmpty(BaseRequest.CodecTag))
+            var codectag = BaseRequest.CodecTag;
+
+            if (string.IsNullOrEmpty(codectag) && !string.IsNullOrEmpty(codec))
             {
-                return BaseRequest.CodecTag.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
+                codectag = BaseRequest.GetOption(codec, "codectag");
             }
 
-            if (!string.IsNullOrEmpty(codec))
-            {
-                var codectag = BaseRequest.GetOption(codec, "codectag");
+            return (codectag ?? string.Empty).Split(_separators, StringSplitOptions.RemoveEmptyEntries);
+        }
 
-                if (!string.IsNullOrEmpty(codectag))
-                {
-                    return codectag.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
-                }
+        public string[] GetRequestedRotations(string codec)
+        {
+            var rotation = BaseRequest.Rotation;
+
+            if (string.IsNullOrEmpty(rotation) && !string.IsNullOrEmpty(codec))
+            {
+                rotation = BaseRequest.GetOption(codec, "rotation");
             }
 
-            return Array.Empty<string>();
+            return (rotation ?? string.Empty).Split(_separators, StringSplitOptions.RemoveEmptyEntries);
         }
 
         public string GetRequestedLevel(string codec)