Add ability to check Screen Recording privacy settings on macOS.

desktop-app · Jun 8, 2021 · 8926a5b · 8926a5b
1 parent 539b9b5
commit 8926a5b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 0 deletions.
diff --git a/webrtc/mac/webrtc_media_devices_mac.h b/webrtc/mac/webrtc_media_devices_mac.h
@@ -56,4 +56,6 @@ class MacMediaDevices final : public MediaDevices {
 
 };
 
+[[nodiscard]] bool MacDesktopCaptureAllowed();
+
 } // namespace Webrtc
diff --git a/webrtc/mac/webrtc_media_devices_mac.mm b/webrtc/mac/webrtc_media_devices_mac.mm
@@ -9,6 +9,7 @@
 #include "modules/audio_device/include/audio_device_defines.h"
 
 #import <AVFoundation/AVFoundation.h>
+#import <IOKit/hidsystem/IOHIDLib.h>
 
 namespace Webrtc {
 namespace {
@@ -395,4 +396,14 @@ OSStatus PropertyChangedCallback(
 	_resolvedVideoInputId = ResolveVideoInput(_videoInputId);
 }
 
+bool MacDesktopCaptureAllowed() {
+	if (@available(macOS 10.15, *)) {
+		// Screen Recording is required on macOS 10.15 an later.
+		// Even if user grants access, restart is required.
+		static const auto result = CGPreflightScreenCaptureAccess();
+		return result;
+	}
+	return true;
+}
+
 } // namespace Webrtc
diff --git a/webrtc/webrtc_media_devices.cpp b/webrtc/webrtc_media_devices.cpp
@@ -193,6 +193,14 @@ std::unique_ptr<MediaDevices> CreateMediaDevices(
 #endif
 }
 
+bool DesktopCaptureAllowed() {
+#ifdef WEBRTC_MAC
+	return MacDesktopCaptureAllowed();
+#else // WEBRTC_MAC
+	return true;
+#endif // WEBRTC_MAC
+}
+
 std::optional<QString> UniqueDesktopCaptureSource() {
 #ifdef WEBRTC_LINUX
 	return LinuxUniqueDesktopCaptureSource();

diff --git a/webrtc/webrtc_media_devices.h b/webrtc/webrtc_media_devices.h
@@ -52,6 +52,7 @@ class MediaDevices {
 	QString audioOutput,
 	QString videoInput);
 
+[[nodiscard]] bool DesktopCaptureAllowed();
 [[nodiscard]] std::optional<QString> UniqueDesktopCaptureSource();
 
 } // namespace Webrtc