diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-01 16:45:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 16:45:23 +0200 |
| commit | 5c9ee93f3e6918974aa5dc7dab65a2fdbc8c3313 (patch) | |
| tree | 9b2252be5843b7ce4efbb4ed570abcf8557c38fe /modules/camera | |
| parent | 01559ca84e0782b91788be73609f2c8afed94027 (diff) | |
| parent | 00299f15b46b695d6809f7f812daaad1ad520b4a (diff) | |
Merge pull request #39788 from bruvzg/macos_apple_silicon
[macOS] Add support for the Apple Silicon (ARM64) build target.
Diffstat (limited to 'modules/camera')
| -rw-r--r-- | modules/camera/camera_osx.mm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/camera/camera_osx.mm b/modules/camera/camera_osx.mm index 9a72174723..306632a016 100644 --- a/modules/camera/camera_osx.mm +++ b/modules/camera/camera_osx.mm @@ -313,7 +313,12 @@ MyDeviceNotifications *device_notifications = nil; // CameraOSX - Subclass for our camera server on OSX void CameraOSX::update_feeds() { +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101500 + AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:[NSArray arrayWithObjects:AVCaptureDeviceTypeExternalUnknown, AVCaptureDeviceTypeBuiltInWideAngleCamera, nil] mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionUnspecified]; + NSArray *devices = session.devices; +#else NSArray *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo]; +#endif // remove devices that are gone.. for (int i = feeds.size() - 1; i >= 0; i--) { @@ -325,7 +330,6 @@ void CameraOSX::update_feeds() { }; }; - // add new devices.. for (AVCaptureDevice *device in devices) { bool found = false; for (int i = 0; i < feeds.size() && !found; i++) { |