Merge branch 'obs_merge_31.1.2' into update-libobs-v31.1.2sl1

Author: summeroff

.github/workflows/main.yml

@@ -254,22 +254,6 @@ jobs:
     steps:
       - name: 'Add msbuild to PATH'
         uses: microsoft/setup-msbuild@v1
-      - name: Install older build components
-        run: |
-          # For versions update see here: https://learn.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2022
-          Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
-          $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
-          $componentsToInstall= @(
-          "Microsoft.VisualStudio.Component.VC.v141.x86.x64"
-          "Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64"
-          "Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL"
-          )
-          [string]$workloadArgs = $componentsToInstall | ForEach-Object {" --add " +  $_}
-          $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache')
-          # should be run twice
-          $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
-          $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
-        shell: powershell
       - name: 'Checkout'
         uses: actions/checkout@v3
         with:

CMakeLists.txt

@@ -136,7 +136,14 @@ if(NOT libcurl_POPULATED)
   set(USE_LIBIDN2 OFF CACHE BOOL "" FORCE)
   set(USE_LIBPSL  OFF CACHE BOOL "" FORCE)
   set(CURL_ZLIB   OFF CACHE BOOL "" FORCE)
+
+if(APPLE)
+  # Enable Secure Transport on Apple platforms
+  set(CURL_USE_SECTRANSP ON CACHE BOOL "" FORCE)
+  set(CMAKE_USE_SCHANNEL OFF CACHE BOOL "" FORCE)
+else()
   set(CMAKE_USE_SCHANNEL ON CACHE BOOL "" FORCE)
+endif()
 
   FetchContent_Populate(libcurl)
   add_subdirectory(${libcurl_SOURCE_DIR} ${libcurl_BINARY_DIR} EXCLUDE_FROM_ALL)

js/module.d.ts

@@ -625,7 +625,6 @@ export interface IVolmeterFactory {
     create(type: EFaderType): IVolmeter;
 }
 export interface IVolmeter {
-    updateInterval: number;
     destroy(): void;
     attach(source: IInput): void;
     detach(): void;

js/module.ts

@@ -1383,11 +1383,6 @@ export interface IVolmeterFactory {
  * Object representing a volmeter control corresponding to a source.
  */
 export interface IVolmeter {
-    /**
-     * The interval at which the volmeter will call the callback.
-     */
-    updateInterval: number;
-
     /**
      * Destroy the volmeter object object
      */

obs-studio-client/source/volmeter.cpp

@@ -77,8 +77,7 @@ Napi::Value osn::Volmeter::Create(const Napi::CallbackInfo &info)
 	if (!ValidateResponse(info, response))
 		return info.Env().Undefined();
 
-	auto instance = osn::Volmeter::constructor.New({Napi::Number::New(info.Env(), static_cast<double>(response[1].value_union.ui64)),
-							Napi::Number::New(info.Env(), static_cast<double>(response[2].value_union.ui32))});
+	auto instance = osn::Volmeter::constructor.New({Napi::Number::New(info.Env(), static_cast<double>(response[1].value_union.ui64))});
 
 	globalCallback::add_volmeter(response[1].value_union.ui64);
 

obs-studio-server/source/nodeobs_api.cpp

@@ -972,6 +972,18 @@ void OBS_API::OBS_API_initAPI(void *data, const int64_t id, const std::vector<ip
 	SetPrivilegeForGPUPriority();
 #endif
 
+	// This code initializes the graphics susbsystem and hardware acceleration features
+	obs_video_info *ovi = obs_create_video_info();
+	const auto resetResult = obs_reset_video(ovi);
+	if (resetResult != OBS_VIDEO_SUCCESS) {
+		rval.push_back(ipc::value((uint64_t)ErrorCode::CriticalError));
+		rval.push_back(ipc::value(resetResult));
+	}
+	obs_remove_video_info(ovi);
+	if (resetResult != OBS_VIDEO_SUCCESS) {
+		return;
+	}
+
 	osn::Source::initialize_global_signals();
 
 	cpuUsageInfo = os_cpu_usage_info_start();
@@ -1032,17 +1044,18 @@ void OBS_API::OBS_API_initAPI(void *data, const int64_t id, const std::vector<ip
 
 	util::CrashManager::setAppState("idle");
 
-	blog(LOG_INFO, "---------------------------------");
-	obs_log_loaded_modules();
-	blog(LOG_INFO, "---------------------------------");
-	logEncoders();
-	blog(LOG_INFO, "---------------------------------");
-
 	// We are returning a video result here because the frontend needs to know if we sucessfully
 	// initialized the Dx11 API
 	rval.push_back(ipc::value((uint64_t)ErrorCode::Ok));
 	rval.push_back(ipc::value(OBS_VIDEO_SUCCESS));
 
+#if defined(__APPLE__)
+	// Block until CEF has been initialized by the main thread.
+	g_util_osx->nextState();
+	while (!g_util_osx->hasInitCef()) {
+		std::this_thread::sleep_for(std::chrono::milliseconds(50));
+	}
+#endif
 	AUTO_DEBUG;
 }
 

obs-studio-server/source/osn-multitrack-video-configuration.cpp

@@ -174,6 +174,7 @@ Config DownloadGoLiveConfig(std::string url, const PostData &post_data)
 						      5);      // timeout in seconds
 
 	if (!encodeConfigDownloadedOk) {
+		blog(LOG_ERROR, "Go live error: %s", libraryError.c_str());
 		throw std::runtime_error("Failed to start stream. Config request failed");
 	}
 

obs-studio-server/source/osn-multitrack-video-system-info-osx.mm

@@ -1,8 +1,68 @@
 #include "osn-multitrack-video-system-info.hpp"
+#include "shared.hpp"
+#include "util/platform.h"
+
+#import <Foundation/Foundation.h>
+#import <Foundation/NSProcessInfo.h>
 
 namespace osn {
 
-// This feature is currently unused on Mac
-void system_info(Capabilities &capabilities) {}
+void fillSystemInfo(System &sysinfo)
+{
+	NSProcessInfo *procInfo = [NSProcessInfo processInfo];
+	NSOperatingSystemVersion versionObj = [procInfo operatingSystemVersion];
+
+	sysinfo.name = "macOS";
+	sysinfo.bits = 64; // 32-bit macOS is long deprecated.
+	sysinfo.version = [[procInfo operatingSystemVersionString] UTF8String];
+
+	switch (versionObj.majorVersion) {
+	case 11:
+		sysinfo.release = "Big Sur";
+		break;
+	case 12:
+		sysinfo.release = "Monterey";
+		break;
+	case 13:
+		sysinfo.release = "Ventura";
+		break;
+	case 14:
+		sysinfo.release = "Sonoma";
+		break;
+	case 15:
+		sysinfo.release = "Sequoia";
+		break;
+	case 26:
+		sysinfo.release = "Tahoe";
+		break;
+	default:
+		sysinfo.release = "unknown";
+	}
+
+	sysinfo.arm = true;
+	sysinfo.armEmulation = false;
+}
+
+void system_info(Capabilities &capabilities)
+{
+	capabilities.cpu.name = g_util_osx->getCpuName();
+	// Getting the frequency is not supported on Apple Silicon.
+	capabilities.cpu.physical_cores = os_get_physical_cores();
+	capabilities.cpu.logical_cores = os_get_logical_cores();
+
+	capabilities.memory.total = os_get_sys_total_size();
+	capabilities.memory.free = os_get_sys_free_size();
+
+	// Apple Silicon- there's only going to be gpu
+	Gpu gpu;
+	gpu.model = capabilities.cpu.name.value_or("Unknown");
+	gpu.vendor_id = 0x106b; // Always Apple
+	gpu.device_id = 0;      // Always 0 for Apple Silicon
+
+	std::vector<Gpu> gpus;
+	gpus.push_back(std::move(gpu));
+	capabilities.gpu = gpus;
+	fillSystemInfo(capabilities.system);
+}
 
 } // namespace osn

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

@@ -84,7 +84,6 @@ void osn::Volmeter::Create(void *data, const int64_t id, const std::vector<ipc::
 
 	rval.push_back(ipc::value((uint64_t)ErrorCode::Ok));
 	rval.push_back(ipc::value(meter->id));
-	rval.push_back(ipc::value(obs_volmeter_get_update_interval(meter->self)));
 	AUTO_DEBUG;
 }
 

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

@@ -17,6 +17,7 @@
 ******************************************************************************/
 
 #include "util-osx-impl.h"
+#include "obs.h"
 #include <iostream>
 #include <unistd.h>
 #include <sys/types.h>
@@ -43,13 +44,13 @@
 		return;
 
 	while (true) {
-		if (!appRunning) {
+		if (state == UtilObjCInt::EState::Stop) {
 			break;
 		}
 		int ret = ::read(file_descriptor, buffer.data(), count);
 		if (ret > 0) {
 			bool appCrashed = *reinterpret_cast<bool *>(buffer.data());
-			if (appCrashed && appRunning)
+			if (appCrashed && state != UtilObjCInt::EState::Stop)
 				this->stopApplication();
 			break;
 		}
@@ -86,17 +87,33 @@ @implementation UtilImplObj
 
 void UtilObjCInt::runApplication(void)
 {
-	appRunning = true;
-	worker = new std::thread(&UtilObjCInt::wait_terminate, this);
+	// Wait for OBS_API_initAPI to be invoked
+	while (!hasInitApi() && isRunning()) {
+		std::this_thread::sleep_for(std::chrono::milliseconds(50));
+	}
+	if (isRunning()) {
+		// Create a dummy source to init obs-browser plugin. Must be init from main thread before [NSApplication run]
+		obs_source_t *source = obs_source_create("browser_source", "dummy", NULL, NULL);
+		obs_source_release(source);
+		nextState();
 
-	@autoreleasepool {
-		NSApplication *app = [NSApplication sharedApplication];
-		[app run];
+		worker = new std::thread(&UtilObjCInt::wait_terminate, this);
+
+		@autoreleasepool {
+			NSApplication *app = [NSApplication sharedApplication];
+			[app run];
+		}
 	}
 }
 
 void UtilObjCInt::stopApplication(void)
 {
+	if (!hasInitCef()) {
+		state = UtilObjCInt::EState::Stop;
+		return;
+	} else {
+		state = UtilObjCInt::EState::Stop;
+	}
 	dispatch_async(dispatch_get_main_queue(), ^{
 		[[NSApplication sharedApplication] stop:nil];
 		NSEvent *event = [NSEvent otherEventWithType:NSEventTypeApplicationDefined
@@ -110,12 +127,17 @@ @implementation UtilImplObj
 						       data2:0];
 		[NSApp postEvent:event atStart:TRUE];
 
-		appRunning = false;
+		state = UtilObjCInt::EState::Stop;
 		if (worker->joinable())
 			worker->join();
 	});
 }
 
+bool UtilObjCInt::isRunning(void)
+{
+	return state != UtilObjCInt::EState::Stop;
+}
+
 unsigned long long UtilObjCInt::getTotalPhysicalMemory(void)
 {
 	return [NSProcessInfo processInfo].physicalMemory;
@@ -191,4 +213,37 @@ @implementation UtilImplObj
 		return 0;
 	return physical_cores;
 }
+
+std::string UtilObjCInt::getCpuName(void)
+{
+	char buffer[256];
+	size_t size = sizeof(buffer);
+	std::string name;
+
+	if (sysctlbyname("machdep.cpu.brand_string", buffer, &size, nullptr, 0) == 0) {
+		name = std::string(buffer);
+	} else if (sysctlbyname("hw.model", buffer, &size, nullptr, 0) == 0) {
+		name = std::string(buffer);
+	}
+
+	return name;
+}
+
+void UtilObjCInt::nextState(void)
+{
+	if (state + 1 < UtilObjCInt::EState::Max) {
+		state = state + 1;
+	}
+}
+
+bool UtilObjCInt::hasInitApi(void)
+{
+	return state == UtilObjCInt::EState::InitializedApi;
+}
+
+bool UtilObjCInt::hasInitCef(void)
+{
+	return state == UtilObjCInt::EState::InitializedCEF;
+}
+
 @end