setVideoSoftMute / setVideoHardMute を追加 #298
+257
−13
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zztkm marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| import Foundation | ||
|
|
||
| // 映像ハードミュートの同時呼び出しによるレースコンディション防止を目的とした Actor です | ||
| // MediaChannel.setVideoHardMute(_:) での使用を想定しています | ||
| actor VideoHardMuteActor { | ||
| // 処理実行中フラグ | ||
| private var isProcessing = false | ||
| // カメラ操作のためのキャプチャラー | ||
| private var capturer: CameraVideoCapturer? | ||
|
|
||
| /// ハードミュートを有効化/無効化します | ||
| /// | ||
| /// - Parameters: | ||
| /// - mute: `true` で有効化、`false` で無効化 | ||
| /// - senderStream: 送信ストリーム | ||
| /// - Throws: | ||
| /// - 既に処理実行中、またはカメラキャプチャラーが無効な場合は `SoraError.mediaChannelError` | ||
| /// - カメラ操作の失敗時は `SoraError.cameraError` | ||
| func setMute(mute: Bool, senderStream: MediaStream) async throws { | ||
| guard !isProcessing else { | ||
| throw SoraError.mediaChannelError(reason: "video hard mute operation is in progress") | ||
| } | ||
| isProcessing = true | ||
| defer { isProcessing = false } | ||
|
|
||
| // ミュートを有効化します | ||
| if mute { | ||
| guard let currentCapturer = await currentCameraVideoCapturer() else { | ||
| // 既にハードミュート済み(再開用キャプチャラーを保持)なら、冪等として何もしません | ||
| if capturer != nil { return } | ||
| throw SoraError.mediaChannelError(reason: "CameraVideoCapturer is unavailable") | ||
| } | ||
| try await stopCameraVideoCapture(currentCapturer) | ||
| // ミュート無効化する際にキャプチャラーを使用するため保持しておきます | ||
| capturer = currentCapturer | ||
| return | ||
| } | ||
|
|
||
| // ミュートを無効化します | ||
| // 現在のキャプチャラーが取得できる場合は既に再開済みとして成功扱いにします | ||
| let currentCapturer = await currentCameraVideoCapturer() | ||
| if currentCapturer != nil { return } | ||
| // 前回停止時のキャプチャラーが保持できていない場合エラー | ||
| guard let stored = capturer else { | ||
| throw SoraError.mediaChannelError(reason: "CameraVideoCapturer is unavailable") | ||
| } | ||
| try await restartCameraVideoCapture(stored, senderStream: senderStream) | ||
| } | ||
|
|
||
| // 現在のカメラキャプチャラーを取得します | ||
| private func currentCameraVideoCapturer() async -> CameraVideoCapturer? { | ||
| // libwebrtc のカメラ用キュー（SoraDispatcher）を利用して実行します | ||
| await withCheckedContinuation { continuation in | ||
| SoraDispatcher.async(on: .camera) { | ||
| continuation.resume(returning: CameraVideoCapturer.current) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // カメラキャプチャを停止します | ||
| private func stopCameraVideoCapture(_ capturer: CameraVideoCapturer) async throws { | ||
| // libwebrtc のカメラ用キュー（SoraDispatcher）を利用して実行します | ||
| try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, Error>) in | ||
| SoraDispatcher.async(on: .camera) { | ||
| // CameraVideoCapturer.stop はコールバック形式です | ||
| capturer.stop { error in | ||
| if let error { | ||
| continuation.resume(throwing: error) | ||
| } else { | ||
| continuation.resume(returning: ()) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // カメラキャプチャを再開します | ||
| private func restartCameraVideoCapture( | ||
| _ capturer: CameraVideoCapturer, | ||
| senderStream: MediaStream | ||
| ) async throws { | ||
| // libwebrtc のカメラ用キュー（SoraDispatcher）を利用して実行します | ||
| try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, Error>) in | ||
| SoraDispatcher.async(on: .camera) { | ||
| // マルチストリームの場合、停止時と現在の送信ストリームが異なることがあるので再設定します | ||
| capturer.stream = senderStream | ||
| // CameraVideoCapturer.restart はコールバック形式です | ||
| capturer.restart { error in | ||
| if let error { | ||
| continuation.resume(throwing: error) | ||
| } else { | ||
| continuation.resume(returning: ()) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CI が 18.4 では通らなくなってしまったため上げています