Bladeren bron

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

This reverts commit 3fea85a6f0c7beb18841b68e5bed5c8ff01a8a51.

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).
Rémi Verschelde 3 jaren geleden
bovenliggende
commit
90022710ab
1 gewijzigde bestanden met toevoegingen van 3 en 19 verwijderingen
  1. 3 19
      modules/camera/camera_osx.mm

+ 3 - 19
modules/camera/camera_osx.mm

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