Swap raw video width and height if angle is 90 or 270 degrees

1 files changed, 13 insertions, 1 deletions

diff --git a/activestorage/lib/active_storage/analyzer/video_analyzer.rb b/activestorage/lib/active_storage/analyzer/video_analyzer.rb
index b6fc54d917..1c144baa37 100644
--- a/activestorage/lib/active_storage/analyzer/video_analyzer.rb
+++ b/activestorage/lib/active_storage/analyzer/video_analyzer.rb
@@ -31,10 +31,18 @@ module ActiveStorage
 
     private
       def width
-        Integer(video_stream["width"]) if video_stream["width"]
+        rotated? ? raw_height : raw_width
       end
 
       def height
+        rotated? ? raw_width : raw_height
+      end
+
+      def raw_width
+        Integer(video_stream["width"]) if video_stream["width"]
+      end
+
+      def raw_height
         Integer(video_stream["height"]) if video_stream["height"]
       end
 
@@ -52,6 +60,10 @@ module ActiveStorage
         end
       end
 
+      def rotated?
+        angle == 90 || angle == 270
+      end
+
 
       def tags
         @tags ||= video_stream["tags"] || {}