maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "[macOS] Request camera permission before session init."

Browse source 
This reverts commit 3fea85a6f0.

The commit is good but to use `@available(macOS 10.14, *)` with osxcross one
needs to build `compiler-rt`, which can be done but might surprise some users
who have their custom build pipelines for 3.3.x (including the official build
system).
This commit is contained in:
Rémi Verschelde 2021-09-29 14:12:33 +02:00
parent 91f48e2940
commit 90022710ab
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/camera/camera_osx.mm
View file

@ -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;