multitrack: mac support for enhanced broadcasting

* enable for Apple Silicon (not Intel macs since those are not supported)

Author: sandboxcoder

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)

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,65 @@
 #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;
+	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/util-osx-impl.mm

@@ -214,6 +214,21 @@ @implementation UtilImplObj
 	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) {

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

@@ -40,6 +40,7 @@ class UtilObjCInt {
 	std::string getWorkingDirectory(void);
 	std::string getComputerName(void);
 	int getPhysicalCores(void);
+	std::string getCpuName(void);
 	void wait_terminate(void);
 	void nextState(void);
 	bool hasInitApi(void);

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

@@ -89,6 +89,11 @@ int UtilInt::getPhysicalCores(void)
 	return _impl->getPhysicalCores();
 }
 
+std::string UtilInt::getCpuName(void)
+{
+	return _impl->getCpuName();
+}
+
 void UtilInt::nextState(void)
 {
 	_impl->nextState();

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

@@ -41,6 +41,7 @@ class UtilInt {
 	std::string getWorkingDirectory(void);
 	std::string getComputerName(void);
 	int getPhysicalCores(void);
+	std::string getCpuName(void);
 	void nextState(void);
 	bool hasInitApi(void);
 	bool hasInitCef(void);