Add checks for invalid DIrectX version (#133)

* Detect errors when creating/reseting the graphical API

* Pass the numeric video error (if there is any) directly to the frontend

* Add a video error enum accessible from the frontend to handle the dx11 case

Author: RodrigoHolztrattner

js/module.ts

@@ -50,6 +50,15 @@ export const enum EDeinterlaceFieldOrder {
     Bottom
 }
 
+export const enum EVideoCodes {
+	Success = 0,
+	Fail = -1,
+	NotSupported = -2,
+	InvalidParam = -3,
+	CurrentlyActive = -4,
+	ModuleNotFound = -5	
+}
+
 export const enum EDeinterlaceMode {
     Disable,
     Discard,

obs-studio-server/source/nodeobs_api.cpp

@@ -498,8 +498,14 @@ void OBS_API::OBS_API_initAPI(
 	obs_data_set_bool(private_settings, "BrowserHWAccel", true);
 	obs_apply_private_data(private_settings);
 	obs_data_release(private_settings);
-
-	openAllModules();
+	
+	int videoError;
+	if (!openAllModules(videoError)) {
+		rval.push_back(ipc::value((uint64_t)ErrorCode::Error));
+		rval.push_back(ipc::value(videoError));
+		AUTO_DEBUG;
+		return;
+	}
 
 	OBS_service::createService();
 
@@ -818,9 +824,12 @@ typedef std::basic_string<char, ci_char_traits> istring;
 
 /* This should be reusable outside of node-obs, especially
 * if we go a server/client route. */
-void OBS_API::openAllModules(void)
+bool OBS_API::openAllModules(int& video_err)
 {
-	OBS_service::resetVideoContext(NULL);
+	video_err = OBS_service::resetVideoContext(NULL);
+	if (video_err != OBS_VIDEO_SUCCESS) {
+		return false;
+	}
 
 	std::string plugins_paths[] = {g_moduleDirectory + "/obs-plugins/64bit", g_moduleDirectory + "/obs-plugins", slobs_plugin + "/obs-plugins/64bit"};
 
@@ -838,13 +847,13 @@ void OBS_API::openAllModules(void)
 		* shared library. */
 		if (!os_file_exists(plugins_path.c_str())) {
 			std::cerr << "Plugin Path provided is invalid: " << plugins_path << std::endl;
-			return;
+			return false;
 		}
 
 		os_dir_t* plugin_dir = os_opendir(plugins_path.c_str());
 		if (!plugin_dir) {
 			std::cerr << "Failed to open plugin diretory: " << plugins_path << std::endl;
-			return;
+			return false;
 		}
 
 		for (os_dirent* ent = os_readdir(plugin_dir); ent != nullptr; ent = os_readdir(plugin_dir)) {
@@ -895,6 +904,8 @@ void OBS_API::openAllModules(void)
 
 		os_closedir(plugin_dir);
 	}
+
+	return true;
 }
 
 double OBS_API::getCPU_Percentage(void)

obs-studio-server/source/nodeobs_api.h

@@ -67,7 +67,7 @@ class OBS_API
 	private:
 	static void initAPI(void);
 	static void destroyOBS_API(void);
-	static void openAllModules(void);
+	static bool openAllModules(int& video_err);
 
 	static double getCPU_Percentage(void);
 	static int    getNumberOfDroppedFrames(void);

obs-studio-server/source/nodeobs_service.cpp

@@ -105,8 +105,14 @@ void OBS_service::OBS_service_resetVideoContext(
     const std::vector<ipc::value>& args,
     std::vector<ipc::value>&       rval)
 {
-	resetVideoContext(NULL);
-	rval.push_back(ipc::value((uint64_t)ErrorCode::Ok));
+	int result = resetVideoContext(NULL);
+	if (result == OBS_VIDEO_SUCCESS) {
+		rval.push_back(ipc::value((uint64_t)ErrorCode::Ok));
+	} else {
+		rval.push_back(ipc::value((uint64_t)ErrorCode::Error));
+		rval.push_back(ipc::value(result));
+	}
+
 	AUTO_DEBUG;
 }
 
@@ -466,7 +472,7 @@ static const double vals[] = {1.0, 1.25, (1.0 / 0.75), 1.5, (1.0 / 0.6), 1.75, 2
 
 static const size_t numVals = sizeof(vals) / sizeof(double);
 
-bool OBS_service::resetVideoContext(const char* outputType)
+int OBS_service::resetVideoContext(const char* outputType)
 {
 	config_t* basicConfig = OBS_API::openConfigFile(OBS_API::getBasicConfigPath());
 
@@ -1762,7 +1768,9 @@ void OBS_service::updateRecordSettings(void)
 	} else if (strcmp(currentOutputMode, "Advanced") == 0) {
 		const char* recType = config_get_string(config, "AdvOut", "RecType");
 		if (recType != NULL && strcmp(recType, "Custom Output (FFmpeg)") == 0) {
-			resetVideoContext("Record");
+			if (!resetVideoContext("Record") != OBS_VIDEO_SUCCESS) {
+				return;
+			}
 			associateAudioAndVideoToTheCurrentRecordingContext();
 			UpdateFFmpegOutput();
 			return;

obs-studio-server/source/nodeobs_service.h

@@ -262,7 +262,7 @@ class OBS_service
 
 	// Reset contexts
 	static bool resetAudioContext(void);
-	static bool resetVideoContext(const char* outputType);
+	static int  resetVideoContext(const char* outputType);
 
 	static void associateAudioAndVideoToTheCurrentStreamingContext(void);
 	static void associateAudioAndVideoToTheCurrentRecordingContext(void);