From e563353842af32f89d8fc9a30815f3b0d830c351 Mon Sep 17 00:00:00 2001
From: Ryan Zhao <ryanzhaors@qq.com>
Date: Tue, 8 Feb 2022 12:08:01 +1100
Subject: [PATCH] improve video scale

---
 Session/Calls/CallVC.swift                    |  1 -
 .../Views & Modals/RemoteVideoView.swift      | 44 ++++++++++++++-----
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/Session/Calls/CallVC.swift b/Session/Calls/CallVC.swift
index 64d055a87..7b28dd474 100644
--- a/Session/Calls/CallVC.swift
+++ b/Session/Calls/CallVC.swift
@@ -34,7 +34,6 @@ final class CallVC : UIViewController, VideoPreviewDelegate {
     private lazy var remoteVideoView: RemoteVideoView = {
         let result = RemoteVideoView()
         result.alpha = 0
-        result.videoContentMode = .scaleAspectFit
         result.backgroundColor = .black
         result.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(handleRemoteVieioViewTapped)))
         return result
diff --git a/Session/Calls/Views & Modals/RemoteVideoView.swift b/Session/Calls/Views & Modals/RemoteVideoView.swift
index be9d9dd32..50384d41a 100644
--- a/Session/Calls/Views & Modals/RemoteVideoView.swift	
+++ b/Session/Calls/Views & Modals/RemoteVideoView.swift	
@@ -8,33 +8,55 @@ class RemoteVideoView: RTCMTLVideoView {
         super.renderFrame(frame)
         guard let frame = frame else { return }
         DispatchMainThreadSafe {
+            let frameRatio = Double(frame.height) / Double(frame.width)
             let frameRotation = frame.rotation
             let deviceRotation = UIDevice.current.orientation
+            var rotationOverride: RTCVideoRotation? = nil
             switch deviceRotation {
             case .portrait, .portraitUpsideDown:
                 // We don't have to do anything, the renderer will automatically make sure it's right-side-up.
-                self.rotationOverride = nil
+                break
             case .landscapeLeft:
                 switch frameRotation {
-                case RTCVideoRotation._0: self.rotationOverride = NSNumber(value: RTCVideoRotation._90.rawValue) // Landscape left
-                case RTCVideoRotation._90: self.rotationOverride = NSNumber(value: RTCVideoRotation._180.rawValue) // Portrait
-                case RTCVideoRotation._180: self.rotationOverride = NSNumber(value: RTCVideoRotation._270.rawValue) // Landscape right
-                case RTCVideoRotation._270: self.rotationOverride = NSNumber(value: RTCVideoRotation._0.rawValue) // Portrait upside-down
-                default: self.rotationOverride = nil
+                case RTCVideoRotation._0: rotationOverride = RTCVideoRotation._90 // Landscape left
+                case RTCVideoRotation._90: rotationOverride = RTCVideoRotation._180 // Portrait
+                case RTCVideoRotation._180: rotationOverride = RTCVideoRotation._270 // Landscape right
+                case RTCVideoRotation._270: rotationOverride = RTCVideoRotation._0 // Portrait upside-down
+                default: break
                 }
             case .landscapeRight:
                 switch frameRotation {
-                case RTCVideoRotation._0: self.rotationOverride = NSNumber(value: RTCVideoRotation._270.rawValue) // Landscape left
-                case RTCVideoRotation._90: self.rotationOverride = NSNumber(value: RTCVideoRotation._0.rawValue) // Portrait
-                case RTCVideoRotation._180: self.rotationOverride = NSNumber(value: RTCVideoRotation._90.rawValue) // Landscape right
-                case RTCVideoRotation._270: self.rotationOverride = NSNumber(value: RTCVideoRotation._180.rawValue) // Portrait upside-down
-                default: self.rotationOverride = nil
+                case RTCVideoRotation._0: rotationOverride = RTCVideoRotation._270 // Landscape left
+                case RTCVideoRotation._90: rotationOverride = RTCVideoRotation._0 // Portrait
+                case RTCVideoRotation._180: rotationOverride = RTCVideoRotation._90 // Landscape right
+                case RTCVideoRotation._270: rotationOverride = RTCVideoRotation._180 // Portrait upside-down
+                default: break
                 }
             default:
                 // Do nothing if we're face down, up, etc.
                 // Assume we're already setup for the correct orientation.
                 break
             }
+            
+            if let rotationOverride = rotationOverride {
+                self.rotationOverride = NSNumber(value: rotationOverride.rawValue)
+                if [ RTCVideoRotation._0, RTCVideoRotation._180 ].contains(rotationOverride) {
+                    self.videoContentMode = .scaleAspectFill
+                } else {
+                    self.videoContentMode = .scaleAspectFit
+                }
+            } else {
+                self.rotationOverride = nil
+                if [ RTCVideoRotation._0, RTCVideoRotation._180 ].contains(frameRotation) {
+                    self.videoContentMode = .scaleAspectFill
+                } else {
+                    self.videoContentMode = .scaleAspectFit
+                }
+            }
+            
+            if frameRatio < 1.5 {
+                self.videoContentMode = .scaleAspectFit
+            }
         }
     }
 }