create browser source on main thread

* create 1st browser_source on main thread to satisfy requirement
CEFInitialize() must be called on main thread (obs-browser plugin -> CEF)

Author: sandboxcoder

obs-studio-server/source/osn-input.cpp

@@ -111,7 +111,22 @@ void osn::Input::Create(void *data, const int64_t id, const std::vector<ipc::val
 		break;
 	}
 
+#if defined(__APPLE__)
+	static bool hasInitializedBrowserSources = false;
+	obs_source_t *source = nullptr;
+
+	if (!hasInitializedBrowserSources && sourceId == "browser_source") {
+		// CEFInitialize must be invoked on main thread (first time a browser source is created)
+		hasInitializedBrowserSources = true;
+
+		g_util_osx->runOnMainThreadSync(
+			[&source, &sourceId, &name, &settings, &hotkeys]() { source = obs_source_create(sourceId.c_str(), name.c_str(), settings, hotkeys); });
+	} else {
+		source = obs_source_create(sourceId.c_str(), name.c_str(), settings, hotkeys);
+	}
+#else
 	obs_source_t *source = obs_source_create(sourceId.c_str(), name.c_str(), settings, hotkeys);
+#endif
 	obs_data_release(hotkeys);
 	obs_data_release(settings);
 
@@ -660,4 +675,4 @@ void osn::Input::GetMediaState(void *data, const int64_t id, const std::vector<i
 	rval.push_back(ipc::value((uint64_t)ErrorCode::Ok));
 	rval.push_back(ipc::value(obs_source_media_get_state(input)));
 	AUTO_DEBUG;
-}
+}

obs-studio-server/source/util-osx-impl.mm

@@ -170,4 +170,11 @@ @implementation UtilImplObj
 	NSString *workindDirPath = [[NSProcessInfo processInfo] environment][@"PWD"];
 	return std::string([workindDirPath UTF8String]);
 }
+
+void UtilObjCInt::runOnMainThreadSync(std::function<void()> func)
+{
+	dispatch_sync(dispatch_get_main_queue(), ^{
+		func();
+	});
+}
 @end

obs-studio-server/source/util-osx-int.h

@@ -39,6 +39,9 @@ class UtilObjCInt {
 	std::string getWorkingDirectory(void);
 	void wait_terminate(void);
 
+	// Runs a function on the main thread and waits for the function to finish before proceeding.
+	void runOnMainThreadSync(std::function<void()> func);
+
 private:
 	void *self;
 	std::atomic<bool> appRunning;

obs-studio-server/source/util-osx.cpp

@@ -72,4 +72,9 @@ std::string UtilInt::getUserDataPath(void)
 std::string UtilInt::getWorkingDirectory(void)
 {
 	return _impl->getWorkingDirectory();
-}
+}
+
+void UtilInt::runOnMainThreadSync(std::function<void()> func)
+{
+	_impl->runOnMainThreadSync(func);
+}

obs-studio-server/source/util-osx.hpp

@@ -19,6 +19,7 @@
 #ifndef __UTIL_CLASS_H__
 #define __UTIL_CLASS_H__
 
+#include <functional>
 #include <string>
 #include <vector>
 
@@ -38,6 +39,8 @@ class UtilInt {
 	std::vector<std::pair<uint32_t, uint32_t>> getAvailableScreenResolutions(void);
 	std::string getUserDataPath(void);
 	std::string getWorkingDirectory(void);
+	// Runs a function on the main thread and waits for the function to finish before proceeding.
+	void runOnMainThreadSync(std::function<void()> func);
 
 private:
 	UtilObjCInt *_impl;