|
@@ -33,7 +33,6 @@
|
|
|
|
|
|
#include "camera_osx.h"
|
|
|
#include "servers/camera/camera_feed.h"
|
|
|
-
|
|
|
#import <AVFoundation/AVFoundation.h>
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////
|
|
@@ -254,25 +253,10 @@ CameraFeedOSX::~CameraFeedOSX() {
|
|
|
|
|
|
bool CameraFeedOSX::activate_feed() {
|
|
|
if (capture_session) {
|
|
|
- // Already recording!
|
|
|
+ // already recording!
|
|
|
} else {
|
|
|
- // Start camera capture, check permission.
|
|
|
- if (@available(macOS 10.14, *)) {
|
|
|
- AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
|
|
|
- if (status == AVAuthorizationStatusAuthorized) {
|
|
|
- capture_session = [[MyCaptureSession alloc] initForFeed:this andDevice:device];
|
|
|
- } else if (status == AVAuthorizationStatusNotDetermined) {
|
|
|
- // Request permission.
|
|
|
- [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo
|
|
|
- completionHandler:^(BOOL granted) {
|
|
|
- if (granted) {
|
|
|
- capture_session = [[MyCaptureSession alloc] initForFeed:this andDevice:device];
|
|
|
- }
|
|
|
- }];
|
|
|
- }
|
|
|
- } else {
|
|
|
- capture_session = [[MyCaptureSession alloc] initForFeed:this andDevice:device];
|
|
|
- }
|
|
|
+ // start camera capture
|
|
|
+ capture_session = [[MyCaptureSession alloc] initForFeed:this andDevice:device];
|
|
|
};
|
|
|
|
|
|
return true;
|