Update ActionHandlers

GetStream · Dec 13, 2024 · 7834436 · 7834436
1 parent f2291a4
commit 7834436
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 181 deletions.
diff --git a/Sources/StreamVideo/WebRTC/v2/Extensions/Foundation/Int+DefaultValues.swift b/Sources/StreamVideo/WebRTC/v2/Extensions/Foundation/Int+DefaultValues.swift
@@ -11,6 +11,9 @@ extension Int {
     /// Typically used for video publishing when no specific frame rate is set.
     public static let defaultFrameRate: Int = 30
 
+    /// The default frame rate for screenShare streams.
+    public static let defaultScreenShareFrameRate: Int = 25
+
     /// The maximum bitrate for video streams, in bits per second.
     ///
     /// Used to limit the data rate for video publishing to optimize quality

diff --git a/...adcast/BroadcastStartCaptureHandler.swift → ...s/Broadcast/BroadcastCaptureHandler.swift b/...adcast/BroadcastStartCaptureHandler.swift → ...s/Broadcast/BroadcastCaptureHandler.swift
@@ -6,10 +6,10 @@ import Foundation
 import ReplayKit
 import StreamWebRTC
 
-final class BroadcastStartCaptureHandler: StreamVideoCapturerActionHandler, @unchecked Sendable {
+final class BroadcastCaptureHandler: StreamVideoCapturerActionHandler, @unchecked Sendable {
 
     private struct Session {
-        var frameRate: Int = 15
+        var frameRate: Int = .defaultScreenShareFrameRate
         var adaptedOutputFormat: Bool = false
         var preferredDimensions: CGSize
         var videoSource: RTCVideoSource
@@ -32,7 +32,9 @@ final class BroadcastStartCaptureHandler: StreamVideoCapturerActionHandler, @unc
                 videoCapturerDelegate: videoCapturerDelegate
             )
         case .stopCapture:
+            broadcastBufferReader.stopCapturing()
             activeSession = nil
+            log.debug("\(type(of: self)) stopped capturing.", subsystems: .videoCapturer)
         default:
             break
         }

diff --git a/...Video/WebRTC/v2/VideoCapturing/ActionHandlers/Broadcast/BroadcastStopCaptureHandler.swift b/...Video/WebRTC/v2/VideoCapturing/ActionHandlers/Broadcast/BroadcastStopCaptureHandler.swift
diff --git a/...rs/Camera/CameraStartCaptureHandler.swift → ...andlers/Camera/CameraCaptureHandler.swift b/...rs/Camera/CameraStartCaptureHandler.swift → ...andlers/Camera/CameraCaptureHandler.swift
@@ -7,7 +7,7 @@ import CoreMedia
 import Foundation
 import StreamWebRTC
 
-final class CameraStartCaptureHandler: StreamVideoCapturerActionHandler, @unchecked Sendable {
+final class CameraCaptureHandler: StreamVideoCapturerActionHandler, @unchecked Sendable {
 
     private struct Configuration: Equatable, Sendable {
         /// The camera position to use for capturing (e.g., front or back camera).
@@ -78,8 +78,14 @@ final class CameraStartCaptureHandler: StreamVideoCapturerActionHandler, @unchec
                 videoCapturerDelegate: videoCapturerDelegate
             )
 
-        case .stopCapture:
+        case let .stopCapture(videoCapturer):
             activeConfiguration = nil
+            guard
+                let cameraVideoCapturer = videoCapturer as? RTCCameraVideoCapturer
+            else {
+                return
+            }
+            await executeStop(cameraVideoCapturer)
         default:
             break
         }
@@ -238,4 +244,13 @@ final class CameraStartCaptureHandler: StreamVideoCapturerActionHandler, @unchec
             subsystems: .videoCapturer
         )
     }
+
+    private func executeStop(_ videoCapturer: RTCCameraVideoCapturer) async {
+        await withCheckedContinuation { continuation in
+            videoCapturer.stopCapture {
+                continuation.resume()
+            }
+        }
+        log.debug("\(type(of: self)) stopped capturing.", subsystems: .videoCapturer)
+    }
 }
diff --git a/...StreamVideo/WebRTC/v2/VideoCapturing/ActionHandlers/Camera/CameraStopCaptureHandler.swift b/...StreamVideo/WebRTC/v2/VideoCapturing/ActionHandlers/Camera/CameraStopCaptureHandler.swift
diff --git a/...hare/ScreenShareStartCaptureHandler.swift → ...reenShare/ScreenShareCaptureHandler.swift b/...hare/ScreenShareStartCaptureHandler.swift → ...reenShare/ScreenShareCaptureHandler.swift
@@ -6,7 +6,7 @@ import Foundation
 import ReplayKit
 import StreamWebRTC
 
-final class ScreenShareStartCaptureHandler: StreamVideoCapturerActionHandler, @unchecked Sendable {
+final class ScreenShareCaptureHandler: StreamVideoCapturerActionHandler, @unchecked Sendable {
 
     private let recorder: RPScreenRecorder
     private var activeSession: Session?
@@ -33,6 +33,7 @@ final class ScreenShareStartCaptureHandler: StreamVideoCapturerActionHandler, @u
             )
         case .stopCapture:
             activeSession = nil
+            try await stop()
         default:
             break
         }
@@ -147,4 +148,24 @@ final class ScreenShareStartCaptureHandler: StreamVideoCapturerActionHandler, @u
             didCapture: rtcFrame
         )
     }
+
+    private func stop() async throws {
+        try await withCheckedThrowingContinuation { [weak self] continuation in
+            guard
+                let recorder = self?.recorder,
+                recorder.isRecording
+            else {
+                continuation.resume()
+                return
+            }
+
+            recorder.stopCapture { error in
+                if let error {
+                    continuation.resume(throwing: error)
+                } else {
+                    continuation.resume()
+                }
+            }
+        }
+    }
 }
diff --git a/...o/WebRTC/v2/VideoCapturing/ActionHandlers/ScreenShare/ScreenShareStopCaptureHandler.swift b/...o/WebRTC/v2/VideoCapturing/ActionHandlers/ScreenShare/ScreenShareStopCaptureHandler.swift
diff --git a/...ulator/SimulatorStartCaptureHandler.swift → ...s/Simulator/SimulatorCaptureHandler.swift b/...ulator/SimulatorStartCaptureHandler.swift → ...s/Simulator/SimulatorCaptureHandler.swift
@@ -4,7 +4,7 @@
 
 import Foundation
 
-final class SimulatorStartCaptureHandler: StreamVideoCapturerActionHandler, @unchecked Sendable {
+final class SimulatorCaptureHandler: StreamVideoCapturerActionHandler, @unchecked Sendable {
 
     // MARK: - StreamVideoCapturerActionHandler
 
@@ -15,6 +15,11 @@ final class SimulatorStartCaptureHandler: StreamVideoCapturerActionHandler, @unc
                 return
             }
             simulatorCapturer.startCapturing()
+        case let .stopCapture(videoCapturer):
+            guard let simulatorCapturer = videoCapturer as? SimulatorScreenCapturer else {
+                return
+            }
+            simulatorCapturer.stopCapturing()
         default:
             break
         }

diff --git a/...Video/WebRTC/v2/VideoCapturing/ActionHandlers/Simulator/SimulatorStopCaptureHandler.swift b/...Video/WebRTC/v2/VideoCapturing/ActionHandlers/Simulator/SimulatorStopCaptureHandler.swift
diff --git a/Sources/StreamVideo/WebRTC/v2/VideoCapturing/StreamVideoCapturer.swift b/Sources/StreamVideo/WebRTC/v2/VideoCapturing/StreamVideoCapturer.swift
@@ -136,8 +136,7 @@ actor StreamVideoCapturer {
             videoCapturer: videoCapturer,
             videoCapturerDelegate: videoCapturerDelegate,
             actionHandlers: [
-                SimulatorStartCaptureHandler(),
-                SimulatorStopCaptureHandler()
+                SimulatorCaptureHandler()
             ]
         )
         #else
@@ -150,8 +149,7 @@ actor StreamVideoCapturer {
             videoCapturerDelegate: videoCapturerDelegate,
             actionHandlers: [
                 CameraBackgroundAccessHandler(),
-                CameraStartCaptureHandler(),
-                CameraStopCaptureHandler(),
+                CameraCaptureHandler(),
                 CameraFocusHandler(),
                 CameraCapturePhotoHandler(),
                 CameraVideoOutputHandler(),
@@ -169,8 +167,7 @@ actor StreamVideoCapturer {
             videoCapturer: RTCVideoCapturer(delegate: videoSource),
             videoCapturerDelegate: videoSource,
             actionHandlers: [
-                ScreenShareStartCaptureHandler(),
-                ScreenShareStopCaptureHandler()
+                ScreenShareCaptureHandler()
             ]
         )
     }
@@ -183,8 +180,7 @@ actor StreamVideoCapturer {
             videoCapturer: RTCVideoCapturer(delegate: videoSource),
             videoCapturerDelegate: videoSource,
             actionHandlers: [
-                BroadcastStartCaptureHandler(),
-                BroadcastStopCaptureHandler()
+                BroadcastCaptureHandler()
             ]
         )
     }