[Enhancement]Improve Camera in Lobby

Author: ipavlidakis

Sources/StreamVideo/WebRTC/v2/Extensions/AVFoundation/AVCaptureDevice+OutputFormat.swift

@@ -22,7 +22,7 @@ extension AVCaptureDevice {
     ///
     /// - Note: The formats are sorted by their area difference relative to the preferred dimensions
     ///   before applying the selection criteria.
-    func outputFormat(
+    public func outputFormat(
         preferredDimensions: CMVideoDimensions,
         preferredFrameRate: Int
     ) -> AVCaptureDevice.Format? {

Sources/StreamVideo/WebRTC/v2/PeerConnection/Protocols/CaptureDeviceProtocol.swift

@@ -5,7 +5,7 @@
 import AVFoundation
 
 /// A protocol that defines the properties and methods for a capture device.
-protocol CaptureDeviceProtocol: Sendable {
+public protocol CaptureDeviceProtocol: Sendable {
     /// The position of the capture device.
     var position: AVCaptureDevice.Position { get }
 

Sources/StreamVideo/WebRTC/v2/VideoCapturing/StreamCaptureDeviceProvider.swift

@@ -6,7 +6,7 @@ import Foundation
 import StreamWebRTC
 
 /// A protocol defining methods for providing capture devices.
-protocol CaptureDeviceProviding {
+public protocol CaptureDeviceProviding {
     /// Returns a capture device for the specified AVCaptureDevice position.
     /// - Parameter position: The position of the AVCaptureDevice.
     /// - Returns: A capture device conforming to CaptureDeviceProtocol.
@@ -64,7 +64,7 @@ enum CaptureDeviceProviderKey: InjectionKey {
 /// An extension to manage injected values.
 extension InjectedValues {
     /// The capture device provider.
-    var captureDeviceProvider: CaptureDeviceProviding {
+    public var captureDeviceProvider: CaptureDeviceProviding {
         get { Self[CaptureDeviceProviderKey.self] }
         set { Self[CaptureDeviceProviderKey.self] = newValue }
     }

Sources/StreamVideoSwiftUI/CallingViews/LobbyViewModel.swift

@@ -11,7 +11,7 @@ import SwiftUI
 public class LobbyViewModel: ObservableObject, @unchecked Sendable {
     @Injected(\.callAudioRecorder) private var callAudioRecorder
 
-    private let camera: Any
+    private let camera: CameraAdapter
     private var imagesTask: Task<Void, Never>?
     private let disposableBag = DisposableBag()
 
@@ -25,54 +25,35 @@ public class LobbyViewModel: ObservableObject, @unchecked Sendable {
             callType: callType,
             callId: callId
         )
-        if #available(iOS 14, *) {
-            camera = Camera()
-            imagesTask = Task {
-                await handleCameraPreviews()
-            }
-        } else {
-            camera = NSObject()
-        }
+        camera = .init(cameraPosition: call.state.callSettings.cameraPosition)
         loadCurrentMembers()
         subscribeForCallJoinUpdates()
         subscribeForCallLeaveUpdates()
-    }
-    
-    @available(iOS 14, *)
-    func handleCameraPreviews() async {
-        let imageStream = (camera as? Camera)?.previewStream.dropFirst()
-            .map(\.image)
-        
-        guard let imageStream = imageStream else { return }
 
-        for await image in imageStream {
-            await MainActor.run {
-                viewfinderImage = image
-            }
-        }
+        camera
+            .$image
+            .map(\.?.image)
+            .receive(on: DispatchQueue.main)
+            .assign(to: \.viewfinderImage, onWeak: self)
+            .store(in: disposableBag)
     }
-    
+
     public func startCamera(front: Bool) {
-        if #available(iOS 14, *) {
-            if front {
-                (camera as? Camera)?.switchCaptureDevice()
-            }
-            Task {
-                await(camera as? Camera)?.start()
-            }
+        Task {
+            await self.camera.start()
         }
     }
 
     public func stopCamera() {
-        imagesTask?.cancel()
-        imagesTask = nil
-        if #available(iOS 14, *) {
-            (camera as? Camera)?.stop()
+        camera.stop()
+        Task { @MainActor in
+            viewfinderImage = nil
         }
     }
 
     public func cleanUp() {
         disposableBag.removeAll()
+        camera.stop()
         Task {
             await callAudioRecorder.stopRecording()
         }
@@ -84,6 +65,12 @@ public class LobbyViewModel: ObservableObject, @unchecked Sendable {
         } else {
             await callAudioRecorder.stopRecording()
         }
+
+        if callSettings.videoOn {
+            startCamera(front: callSettings.cameraPosition == .front)
+        } else {
+            stopCamera()
+        }
     }
 
     // MARK: - private