Add SDL camera handler

Author: Megamouse

rpcs3/CMakeLists.txt

@@ -79,6 +79,7 @@ if (NOT ANDROID)
 
         Input/basic_keyboard_handler.cpp
         Input/basic_mouse_handler.cpp
+        Input/camera_video_sink.cpp
         Input/ds3_pad_handler.cpp
         Input/ds4_pad_handler.cpp
         Input/dualsense_pad_handler.cpp
@@ -96,6 +97,9 @@ if (NOT ANDROID)
         Input/ps_move_tracker.cpp
         Input/raw_mouse_config.cpp
         Input/raw_mouse_handler.cpp
+        Input/sdl_camera_handler.cpp
+        Input/sdl_camera_video_sink.cpp
+        Input/sdl_instance.cpp
         Input/sdl_pad_handler.cpp
         Input/skateboard_pad_handler.cpp
         Input/xinput_pad_handler.cpp

rpcs3/Emu/Cell/Modules/cellGem.cpp

@@ -1331,8 +1331,15 @@ void gem_config_data::operator()()
 			vc = vc_attribute;
 		}
 
-		if (g_cfg.io.camera != camera_handler::qt)
+		switch (g_cfg.io.camera)
 		{
+#ifdef HAVE_SDL3
+		case camera_handler::sdl:
+#endif
+		case camera_handler::qt:
+			break;
+		case camera_handler::fake:
+		case camera_handler::null:
 			video_conversion_in_progress = false;
 			done();
 			continue;

rpcs3/Emu/Io/camera_config.cpp

@@ -36,32 +36,38 @@ void cfg_camera::save() const
 	}
 }
 
-cfg_camera::camera_setting cfg_camera::get_camera_setting(const std::string& camera, bool& success)
+cfg_camera::camera_setting cfg_camera::get_camera_setting(const std::string& handler, const std::string& camera, bool& success)
 {
-	camera_setting setting;
-	const std::string value = cameras.get_value(camera);
+	camera_setting setting {};
+	const std::string value = cameras.get_value(handler + "-" + camera);
 	success = !value.empty();
 	if (success)
 	{
-		setting.from_string(cameras.get_value(camera));
+		setting.from_string(value);
 	}
 	return setting;
 }
 
-void cfg_camera::set_camera_setting(const std::string& camera, const camera_setting& setting)
+void cfg_camera::set_camera_setting(const std::string& handler, const std::string& camera, const camera_setting& setting)
 {
+	if (handler.empty())
+	{
+		camera_log.error("String '%s' cannot be used as handler key.", handler);
+		return;
+	}
+
 	if (camera.empty())
 	{
 		camera_log.error("String '%s' cannot be used as camera key.", camera);
 		return;
 	}
 
-	cameras.set_value(camera, setting.to_string());
+	cameras.set_value(handler + "-" + camera, setting.to_string());
 }
 
 std::string cfg_camera::camera_setting::to_string() const
 {
-	return fmt::format("%d,%d,%f,%f,%d", width, height, min_fps, max_fps, format);
+	return fmt::format("%d,%d,%f,%f,%d,%d", width, height, min_fps, max_fps, format, colorspace);
 }
 
 void cfg_camera::camera_setting::from_string(const std::string& text)
@@ -106,12 +112,14 @@ void cfg_camera::camera_setting::from_string(const std::string& text)
 		!to_integer(::at32(list, 1), height) ||
 		!to_double(::at32(list, 2), min_fps) ||
 		!to_double(::at32(list, 3), max_fps) ||
-		!to_integer(::at32(list, 4), format))
+		!to_integer(::at32(list, 4), format) ||
+		!to_integer(::at32(list, 4), colorspace))
 	{
 		width = 0;
 		height = 0;
 		min_fps = 0;
 		max_fps = 0;
 		format = 0;
+		colorspace = 0;
 	}
 }

rpcs3/Emu/Io/camera_config.h

@@ -15,18 +15,19 @@ struct cfg_camera final : cfg::node
 		double min_fps = 0;
 		double max_fps = 0;
 		int format = 0;
+		int colorspace = 0;
 
-		static constexpr u32 member_count = 5;
+		static constexpr u32 member_count = 6;
 
 		std::string to_string() const;
 		void from_string(const std::string& text);
 	};
-	camera_setting get_camera_setting(const std::string& camera, bool& success);
-	void set_camera_setting(const std::string& camera, const camera_setting& setting);
+	camera_setting get_camera_setting(const std::string& handler, const std::string& camera, bool& success);
+	void set_camera_setting(const std::string& handler, const std::string& camera, const camera_setting& setting);
 
 	const std::string path;
 
-	cfg::map_entry cameras{ this, "Cameras" }; // <camera>: <width>,<height>,<min_fps>,<max_fps>,<format>
+	cfg::map_entry cameras{ this, "Cameras" }; // <handler-camera>: <width>,<height>,<min_fps>,<max_fps>,<format>,<colorspace>
 };
 
 extern cfg_camera g_cfg_camera;

rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp

@@ -75,9 +75,17 @@ namespace rsx
 			add_checkbox(&g_cfg.io.keep_pads_connected, localized_string_id::HOME_MENU_SETTINGS_INPUT_KEEP_PADS_CONNECTED);
 			add_checkbox(&g_cfg.io.show_move_cursor, localized_string_id::HOME_MENU_SETTINGS_INPUT_SHOW_PS_MOVE_CURSOR);
 
-			if (g_cfg.io.camera == camera_handler::qt)
+			switch (g_cfg.io.camera)
 			{
+	#ifdef HAVE_SDL3
+			case camera_handler::sdl:
+	#endif
+			case camera_handler::qt:
 				add_dropdown(&g_cfg.io.camera_flip_option, localized_string_id::HOME_MENU_SETTINGS_INPUT_CAMERA_FLIP);
+				break;
+			case camera_handler::fake:
+			case camera_handler::null:
+				break;
 			}
 
 			add_dropdown(&g_cfg.io.pad_mode, localized_string_id::HOME_MENU_SETTINGS_INPUT_PAD_MODE);

rpcs3/Emu/system_config.h

@@ -269,6 +269,7 @@ struct cfg_root : cfg::node
 		cfg::_enum<fake_camera_type> camera_type{ this, "Camera type", fake_camera_type::unknown };
 		cfg::_enum<camera_flip> camera_flip_option{ this, "Camera flip", camera_flip::none, true };
 		cfg::string camera_id{ this, "Camera ID", "Default", true };
+		cfg::string sdl_camera_id{ this, "SDL Camera ID", "Default", true };
 		cfg::_enum<move_handler> move{ this, "Move", move_handler::null, true };
 		cfg::_enum<buzz_handler> buzz{ this, "Buzz emulated controller", buzz_handler::null };
 		cfg::_enum<turntable_handler> turntable{this, "Turntable emulated controller", turntable_handler::null};

rpcs3/Emu/system_config_types.cpp

@@ -374,6 +374,9 @@ void fmt_class_string<camera_handler>::format(std::string& out, u64 arg)
 		case camera_handler::null: return "Null";
 		case camera_handler::fake: return "Fake";
 		case camera_handler::qt: return "Qt";
+#ifdef HAVE_SDL3
+		case camera_handler::sdl: return "SDL";
+#endif
 		}
 
 		return unknown;

rpcs3/Emu/system_config_types.h

@@ -116,7 +116,10 @@ enum class camera_handler
 {
 	null,
 	fake,
-	qt
+	qt,
+#ifdef HAVE_SDL3
+	sdl,
+#endif
 };
 
 enum class camera_flip