Reverts camera feed creation logic (#706)

Author: ellbosch

Stitch/Graph/Node/Port/Model/PortValue/Type/Media/ObjectTypes/CameraFeed/Reference/CameraFeedManager.swift

@@ -61,11 +61,13 @@ final class CameraFeedManager: Sendable, MiddlewareService {
     @MainActor
     init(cameraSettings: CameraSettings,
          isEnabled: Bool,
-         documentDelegate: StitchDocumentViewModel) {
+         documentDelegate: StitchDocumentViewModel,
+         isCameraFeedNode: Bool) {
         self.documentDelegate = documentDelegate
 
         if isEnabled {
-            self.session = Self.createSession(cameraSettings: cameraSettings)
+            self.session = Self.createSession(cameraSettings: cameraSettings,
+                                              isCameraFeedNode: isCameraFeedNode)
         } else {
             self.session = nil
         }
@@ -82,22 +84,26 @@ final class CameraFeedManager: Sendable, MiddlewareService {
     }
 
     @MainActor
-    static func createSession(cameraSettings: CameraSettings) -> StitchCameraSession {
+    static func createSession(cameraSettings: CameraSettings,
+                              isCameraFeedNode: Bool) -> StitchCameraSession {
         let cameraPosition = cameraSettings.direction.avCapturePosition
         let cameraPref = UserDefaults.standard.getCameraPref(position: cameraPosition)
         return Self.createSession(device: cameraPref,
                                   position: cameraPosition,
-                                  cameraOrientation: cameraSettings.orientation)
+                                  cameraOrientation: cameraSettings.orientation,
+                                  isCameraFeedNode: isCameraFeedNode)
     }
 
     // This needs to be called before changing direction of camera
     @MainActor
     static func createSession(device: StitchCameraDevice,
                               position: AVCaptureDevice.Position,
-                              cameraOrientation: StitchCameraOrientation) -> StitchCameraSession {
+                              cameraOrientation: StitchCameraOrientation,
+                              isCameraFeedNode: Bool) -> StitchCameraSession {
 
         // Only use AR if supported by device and the camera is from a RealityView layer node (not a CameraFeed patch node)
-        let useAR = device.isARSupported
+        // MARK: isCameraFeedNode is a necessary check to prevent crashes on iPad
+        let useAR = device.isARSupported && !isCameraFeedNode
 
         // Must get called on main thread
         let session: StitchCameraSession = useAR ? StitchARView() : StitchAVCaptureSession()

Stitch/Graph/Node/Port/Model/PortValue/Type/Media/ObjectTypes/CameraFeed/Util/CameraUtil.swift

@@ -126,7 +126,8 @@ extension StitchDocumentViewModel {
 
             let cameraFeed = CameraFeedManager(cameraSettings: document.cameraSettings,
                                                isEnabled: true,
-                                               documentDelegate: document)
+                                               documentDelegate: document,
+                                               isCameraFeedNode: nodeKind == .patch(.cameraFeed))
 
             document.cameraFeedManager = .loaded(.cameraFeedManager(cameraFeed))
         }