Do a bunch of weird rotations...

mrousavy · Jun 4, 2024 · 8851f83 · 8851f83
1 parent 4fb112e
commit 8851f83
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/package/ios/Core/CameraSession+Configuration.swift b/package/ios/Core/CameraSession+Configuration.swift
@@ -116,8 +116,13 @@ extension CameraSession {
       // 2. Configure
       videoOutput.setSampleBufferDelegate(self, queue: CameraQueues.videoQueue)
       videoOutput.alwaysDiscardsLateVideoFrames = true
-      videoOutput.orientation = videoOrientation
-      videoOutput.isMirrored = isMirrored
+      if isMirrored {
+        // rotate by 180 deg and mirror the selfie camera so it behaves like the back camera.
+        let before = videoOutput.orientation
+        let after = videoOutput.orientation.reversed()
+        videoOutput.orientation = videoOutput.orientation.reversed()
+        videoOutput.isMirrored = isMirrored
+      }
 
       self.videoOutput = videoOutput
     }

diff --git a/package/ios/Core/CameraSession+Video.swift b/package/ios/Core/CameraSession+Video.swift
@@ -142,21 +142,11 @@ extension CameraSession {
   }
 
   private func getVideoRecordingOrientation() throws -> Orientation {
-    guard let videoDeviceInput = videoDeviceInput else {
-      throw CameraError.session(.cameraNotReady)
+    var orientation = outputOrientation
+    if isMirrored && !orientation.isLandscape {
+      // If the video is mirrored and rotated, we need to counter-rotate by 180° because we applied that translation when creating the output.
+      orientation = orientation.reversed()
     }
-
-    // Video stream is already rotated against sensor orientation so we can properly mirror.
-    // counter that rotation again for the AVAssetWriter transforms
-    let sensorOrientation = videoDeviceInput.device.sensorOrientation
-    var outputOrientation = self.outputOrientation
-    if isMirrored {
-      // mirrored streams are reversed.
-      outputOrientation = outputOrientation.reversed()
-    }
-    let orientation = outputOrientation.rotateBy(orientation: sensorOrientation.reversed())
-    VisionLogger.log(level: .info, message: "Sensor Orientation is \(sensorOrientation), output orientation is \(outputOrientation)." +
-      "Video will be \(orientation)...")
     return orientation
   }
 

diff --git a/package/ios/Core/Types/Orientation.swift b/package/ios/Core/Types/Orientation.swift
@@ -139,6 +139,10 @@ enum Orientation: String, JSUnionValue {
     }
   }
 
+  var isLandscape: Bool {
+    return self == .landscapeLeft || self == .landscapeRight
+  }
+
   func rotateBy(orientation: Orientation) -> Orientation {
     let added = degrees + orientation.degrees
     let degress = added.truncatingRemainder(dividingBy: 360)