macOS では USB で接続されたカメラも取得する #44
Merged
Conversation
This file contains 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
enm10k
commented
Nov 1, 2023
src/mac/mac_capturer.mm
Outdated
| @@ -91,9 +91,24 @@ - (void)capturer:(RTCVideoCapturer*)capturer | |||
| return rtc::make_ref_counted<MacCapturer>(c); | |||
| } | |||
|
|
|||
| NSArray<AVCaptureDevice*>* captureDevices() { | |||
There was a problem hiding this comment.
@melpon
EnumVideoDevice のように MacCapturer のプライベート・メソッドとして定義しようとしたのですが、その場合ヘッダーファイルの修正が必要でした (NSArray を利用しているためです)。
ヘッダーファイルの修正を避けるために captureDevices をこのように定義していますが、問題があれば教えてください。
There was a problem hiding this comment.
このままだとグローバルに定義されちゃうので、static 関数として定義して下さい
melpon
reviewed
Nov 1, 2023
src/mac/mac_capturer.mm
Outdated
| @@ -91,9 +91,24 @@ - (void)capturer:(RTCVideoCapturer*)capturer | |||
| return rtc::make_ref_counted<MacCapturer>(c); | |||
| } | |||
|
|
|||
| NSArray<AVCaptureDevice*>* captureDevices() { | |||
There was a problem hiding this comment.
このままだとグローバルに定義されちゃうので、static 関数として定義して下さい
src/mac/mac_capturer.mm
Outdated
| // return session.devices; | ||
| return [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo]; | ||
| #else | ||
| return [RTCCameraVideoCapturer captureDevices]; |
There was a problem hiding this comment.
これ macOS 以外は RTCCameraVideoCapturer に渡してますけど、libwebrtc のデバイス列挙の処理が変わったらまた問題起きるかもなので、iOS の場合も自作した方が良さそうな気がします
There was a problem hiding this comment.
レビューありがとうございます
修正しました
|
確認ありがとうございました、マージします。 |
melpon
pushed a commit
that referenced
this pull request
Mar 26, 2024
ローカルの CPP SDK を参照してビルドするためのオプションを追加する
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.