From: Nico Grunbaum Date: Wed, 15 Nov 2023 22:33:00 +0000 Subject: Bug 1863041 - P0 - add device filter control to RTCCameraVideoCapturer;r=pehrsons,webrtc-reviewers I have filed this bug upstream: https://bugs.chromium.org/p/webrtc/issues/detail?id=15639 Differential Revision: https://phabricator.services.mozilla.com/D193172 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/91a763d768b74acc9cf4828f91a86df4a7b092ce --- .../capturer/RTCCameraVideoCapturer.h | 5 ++++- .../capturer/RTCCameraVideoCapturer.m | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/sdk/objc/components/capturer/RTCCameraVideoCapturer.h b/sdk/objc/components/capturer/RTCCameraVideoCapturer.h index 370bfa70f0..b1f3f64f74 100644 --- a/sdk/objc/components/capturer/RTCCameraVideoCapturer.h +++ b/sdk/objc/components/capturer/RTCCameraVideoCapturer.h @@ -26,7 +26,10 @@ NS_EXTENSION_UNAVAILABLE_IOS("Camera not available in app extensions.") @property(readonly, nonatomic) AVCaptureSession *captureSession; // Returns list of available capture devices that support video capture. -+ (NSArray *)captureDevices; ++ (NSArray *)captureDevicesWithDeviceTypes: + (NSArray *)deviceTypes; +// Returns list of default capture devices types ++ (NSArray *)defaultCaptureDeviceTypes; // Returns list of formats that are supported by this class for this device. + (NSArray *)supportedFormatsForDevice:(AVCaptureDevice *)device; diff --git a/sdk/objc/components/capturer/RTCCameraVideoCapturer.m b/sdk/objc/components/capturer/RTCCameraVideoCapturer.m index e7c47b4e99..1361207faf 100644 --- a/sdk/objc/components/capturer/RTCCameraVideoCapturer.m +++ b/sdk/objc/components/capturer/RTCCameraVideoCapturer.m @@ -117,14 +117,27 @@ const int64_t kNanosecondsPerSecond = 1000000000; [[NSNotificationCenter defaultCenter] removeObserver:self]; } -+ (NSArray *)captureDevices { ++ (NSArray *)captureDevicesWithDeviceTypes: + (NSArray *)deviceTypes { AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession - discoverySessionWithDeviceTypes:@[ AVCaptureDeviceTypeBuiltInWideAngleCamera ] + discoverySessionWithDeviceTypes:deviceTypes mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionUnspecified]; return session.devices; } ++ (NSArray *)defaultCaptureDeviceTypes { + NSArray *types = @[ AVCaptureDeviceTypeBuiltInWideAngleCamera ]; +#if !defined(WEBRTC_IOS) + if (@available(macOS 14.0, *)) { + types = [types arrayByAddingObject:AVCaptureDeviceTypeExternal]; + } else { + types = [types arrayByAddingObject:AVCaptureDeviceTypeExternalUnknown]; + } +#endif + return types; +} + + (NSArray *)supportedFormatsForDevice:(AVCaptureDevice *)device { // Support opening the device in any format. We make sure it's converted to a format we // can handle, if needed, in the method `-setupVideoDataOutput`.