adding method to enumerate video devices on MacOS

Author: sandboxcoder

obs-studio-server/CMakeLists.txt

@@ -403,6 +403,8 @@ SET(osn-server_SOURCES
 if (APPLE)
     SET(osn-server-osx_SOURCES
         "${PROJECT_SOURCE_DIR}/source/osn-multitrack-video-system-info-osx.mm"
+        "${PROJECT_SOURCE_DIR}/source/nodeobs_settings-osx.h"
+        "${PROJECT_SOURCE_DIR}/source/nodeobs_settings-osx.mm"
 
         ###### osx-util ######
         "${PROJECT_SOURCE_DIR}/source/util-osx.hpp"

obs-studio-server/source/nodeobs_settings-osx.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#ifdef __APPLE__
+
+#include <string>
+#include <utility>
+#include <vector>
+
+// Returns (localizedName, uniqueID) pairs for all connected video capture devices.
+// Requires macOS 12 or later; returns an empty vector on older systems.
+std::vector<std::pair<std::string, std::string>> getVideoDevicesMacOS();
+
+#endif

obs-studio-server/source/nodeobs_settings-osx.mm

@@ -0,0 +1,37 @@
+#include "nodeobs_settings-osx.h"
+
+#import <AVFoundation/AVFoundation.h>
+
+std::vector<std::pair<std::string, std::string>> getVideoDevicesMacOS()
+{
+	std::vector<std::pair<std::string, std::string>> result;
+
+	if (@available(macOS 12.0, *)) {
+		NSMutableArray<AVCaptureDeviceType> *deviceTypes =
+			[NSMutableArray arrayWithObject:AVCaptureDeviceTypeBuiltInWideAngleCamera];
+
+		if (@available(macOS 13.0, *)) {
+			[deviceTypes addObject:AVCaptureDeviceTypeExternal];
+		} else {
+			// AVCaptureDeviceTypeExternalUnknown is deprecated in macOS 13 in favour of
+			// AVCaptureDeviceTypeExternal, but is the correct constant for macOS 12.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+			[deviceTypes addObject:AVCaptureDeviceTypeExternalUnknown];
+#pragma clang diagnostic pop
+		}
+
+		AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession
+			discoverySessionWithDeviceTypes:deviceTypes
+			                      mediaType:AVMediaTypeVideo
+			                       position:AVCaptureDevicePositionUnspecified];
+
+		for (AVCaptureDevice *device in session.devices) {
+			if (!device.localizedName || !device.uniqueID)
+				continue;
+			result.push_back({[device.localizedName UTF8String], [device.uniqueID UTF8String]});
+		}
+	}
+
+	return result;
+}

obs-studio-server/source/nodeobs_settings.cpp

@@ -37,6 +37,8 @@
 #ifdef __APPLE__
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <CoreAudio/CoreAudio.h>
+#include "nodeobs_settings-osx.h"
 #endif
 
 #include <unordered_set>
@@ -3864,7 +3866,7 @@ void OBS_settings::saveGenericSettings(std::vector<SubCategory> genericSettings,
 	config_save_safe(config, "tmp", nullptr);
 }
 
-void getDevices(const char *source_id, const char *property_name, bool shouldInitPlugin, std::vector<ipc::value> &rval)
+void getDevices(const char *source_id, const char *property_name, std::vector<ipc::value> &rval)
 {
 	auto settings = obs_get_source_defaults(source_id);
 	if (!settings)
@@ -3877,16 +3879,7 @@ void getDevices(const char *source_id, const char *property_name, bool shouldIni
 		obs_data_set_string(settings, "audio_device_id", dummy_device_name);
 	}
 
-	// Create a dummy source so that the "device" property can be init
-    OBSSourceAutoRelease dummy_source = nullptr;
-    if (shouldInitPlugin) {
-        dummy_source = obs_source_create(source_id, dummy_device_name, settings, nullptr);
-        if (!dummy_source) {
-            obs_data_release(settings);
-            return;
-        }
-    }
-    auto props = dummy_source != nullptr ? obs_source_properties(dummy_source) : obs_get_source_properties(source_id);
+	auto props = obs_get_source_properties(source_id);
 	if (!props) {
 		obs_data_release(settings);
 		blog(LOG_WARNING, "Could not get source properties for source id: %s", source_id);
@@ -4067,10 +4060,7 @@ void OBS_settings::OBS_settings_getInputAudioDevices(void *data, const int64_t i
 	enumAudioDevices(rval, eCapture);
 #elif __APPLE__
 	const char *source_id = "coreaudio_input_capture";
-    // Do not init mac-coreaudio plugin. When passed a non-existent object
-    // it will create a reconnect_thread and try to initialize it.
-    const bool shouldInitCoreAudio = false;
-	getDevices(source_id, "device_id", shouldInitCoreAudio, rval);
+	getDevices(source_id, "device_id", rval);
 #endif
 
 	AUTO_DEBUG;
@@ -4087,10 +4077,7 @@ void OBS_settings::OBS_settings_getOutputAudioDevices(void *data, const int64_t
 	enumAudioDevices(rval, eRender);
 #elif __APPLE__
 	const char *source_id = "coreaudio_output_capture";
-    // Do not init mac-coreaudio plugin. When passed a non-existent object
-    // it will create a reconnect_thread and try to initialize it.
-    const bool shouldInitCoreAudio = false;
-    getDevices(source_id, "device_id", shouldInitCoreAudio, rval);
+	getDevices(source_id, "device_id", rval);
 #endif
 
 	AUTO_DEBUG;
@@ -4104,14 +4091,17 @@ void OBS_settings::OBS_settings_getVideoDevices(void *data, const int64_t id, co
 	rval.push_back(ipc::value((uint32_t)0));
 	enumVideoDevices(rval);
 #elif __APPLE__
-	const char *source_id = "macos_avcapture";
-	const char *property_name = "device";
-    // We must initialize the macos_avcapture plugin so that
-    // it can enumerate the video devices -or- we can provide
-    // our own custom implementation that enumerates video devices
-    // on MacOS.
-    const bool shouldInitPlugin = true;
-	getDevices(source_id, property_name, shouldInitPlugin, rval);
+    // Here we do not invoke getDevices() because the mac-capture
+    // plugin will not enumerate video devices unless it is fully initialized.
+    // So instead, we will enumerate video devices manually. Hopefully,
+    // mac-capture doesn't do anything special to enumerate video devices.
+    // If so, then this implementation will need to be updated.
+	auto devices = getVideoDevicesMacOS();
+	rval.push_back(ipc::value((uint64_t)devices.size()));
+	for (const auto &[name, uid] : devices) {
+		rval.push_back(ipc::value(name.c_str()));
+		rval.push_back(ipc::value(uid.c_str()));
+	}
 #endif
 
 	AUTO_DEBUG;