diff --git a/include/rtsp_manager.hpp b/include/rtsp_manager.hpp index b4aa776..db7ecb8 100644 --- a/include/rtsp_manager.hpp +++ b/include/rtsp_manager.hpp @@ -4,9 +4,10 @@ #include #include #include "app_config.hpp" +#include +#include #include -// RTSP 管理器，负责启动/关闭 RTSP 服务器 class RTSPManager { public: @@ -14,21 +15,24 @@ public: static void start(const std::vector &cameras); static void stop(); - // === 按需挂载/卸载摄像头 === static void mount_camera(const Camera &cam); static void unmount_camera(const Camera &cam); - - // === 查询播放状态 === static bool is_streaming(const std::string &cam_name); private: static GMainLoop *loop; - static GMainContext *main_context; // 新增：保存 loop 的 context + static GMainContext *main_context; static GstRTSPServer *server; - - // 播放状态表 static std::unordered_map streaming_status; - // 创建 MediaFactory + // 工厂创建函数 static GstRTSPMediaFactory *create_media_factory(const Camera &cam); + + // --- 把挂载/卸载函数变成私有静态成员 --- + static gboolean mount_camera_in_main(gpointer data); + static gboolean unmount_camera_in_main(gpointer data); + + // --- 静态 mutex 和工厂表 --- + static std::unordered_map mounted_factories; + static std::mutex mounted_factories_mutex; }; diff --git a/src/rtsp_manager.cpp b/src/rtsp_manager.cpp index fcad1f4..81fc1d5 100644 --- a/src/rtsp_manager.cpp +++ b/src/rtsp_manager.cpp @@ -1,17 +1,14 @@ #include "rtsp_manager.hpp" #include "logger.hpp" #include -#include // 静态变量定义 GMainLoop *RTSPManager::loop = nullptr; -GMainContext *RTSPManager::main_context = nullptr; // 新增 +GMainContext *RTSPManager::main_context = nullptr; GstRTSPServer *RTSPManager::server = nullptr; -std::unordered_map RTSPManager::streaming_status; // 播放状态表 - -// 保存已挂载的 factory，方便卸载时找到并释放 -static std::unordered_map mounted_factories; -static std::mutex mounted_factories_mutex; +std::unordered_map RTSPManager::streaming_status; +std::unordered_map RTSPManager::mounted_factories; +std::mutex RTSPManager::mounted_factories_mutex; void RTSPManager::init() { @@ -31,7 +28,6 @@ GstRTSPMediaFactory *RTSPManager::create_media_factory(const Camera &cam) GstRTSPMediaFactory *factory = gst_rtsp_media_factory_new(); gst_rtsp_media_factory_set_launch(factory, launch_str.c_str()); gst_rtsp_media_factory_set_shared(factory, TRUE); - return factory; } @@ -40,9 +36,8 @@ void RTSPManager::start(const std::vector &cameras) server = gst_rtsp_server_new(); gst_rtsp_server_set_service(server, "8554"); - // 不在启动时挂载摄像头，由调度指令控制推流 loop = g_main_loop_new(nullptr, FALSE); - main_context = g_main_loop_get_context(loop); // 保存 context + main_context = g_main_loop_get_context(loop); gst_rtsp_server_attach(server, nullptr); @@ -62,19 +57,17 @@ void RTSPManager::start(const std::vector &cameras) LOG_INFO("[RTSP] Server stopped."); } -// --- 主线程挂载函数 --- -static gboolean mount_camera_in_main(gpointer data) +// --- 静态成员实现 --- +gboolean RTSPManager::mount_camera_in_main(gpointer data) { Camera *cam = static_cast(data); - if (!cam) - return G_SOURCE_REMOVE; - if (!RTSPManager::server) + if (!cam || !server) { delete cam; return G_SOURCE_REMOVE; } - GstRTSPMountPoints *mounts = gst_rtsp_server_get_mount_points(RTSPManager::server); + GstRTSPMountPoints *mounts = gst_rtsp_server_get_mount_points(server); if (!mounts) { delete cam; @@ -82,7 +75,7 @@ static gboolean mount_camera_in_main(gpointer data) } std::string mount_point = "/" + cam->name; - GstRTSPMediaFactory *factory = RTSPManager::create_media_factory(*cam); + GstRTSPMediaFactory *factory = create_media_factory(*cam); if (!factory) { g_object_unref(mounts); @@ -96,7 +89,7 @@ static gboolean mount_camera_in_main(gpointer data) { std::lock_guard lock(mounted_factories_mutex); mounted_factories[cam->name] = factory; - RTSPManager::streaming_status[cam->name] = true; + streaming_status[cam->name] = true; } LOG_INFO("[RTSP] Camera '" + cam->name + "' mounted at rtsp://localhost:8554" + mount_point); @@ -104,19 +97,16 @@ static gboolean mount_camera_in_main(gpointer data) return G_SOURCE_REMOVE; } -// --- 主线程卸载函数 --- -static gboolean unmount_camera_in_main(gpointer data) +gboolean RTSPManager::unmount_camera_in_main(gpointer data) { Camera *cam = static_cast(data); - if (!cam) - return G_SOURCE_REMOVE; - if (!RTSPManager::server) + if (!cam || !server) { delete cam; return G_SOURCE_REMOVE; } - GstRTSPMountPoints *mounts = gst_rtsp_server_get_mount_points(RTSPManager::server); + GstRTSPMountPoints *mounts = gst_rtsp_server_get_mount_points(server); if (!mounts) { delete cam; @@ -132,12 +122,11 @@ static gboolean unmount_camera_in_main(gpointer data) auto it = mounted_factories.find(cam->name); if (it != mounted_factories.end()) { - GstRTSPMediaFactory *factory = it->second; - if (factory) - g_object_unref(factory); + if (it->second) + g_object_unref(it->second); mounted_factories.erase(it); } - RTSPManager::streaming_status[cam->name] = false; + streaming_status[cam->name] = false; } LOG_INFO("[RTSP] Camera '" + cam->name + "' unmounted."); @@ -145,23 +134,20 @@ static gboolean unmount_camera_in_main(gpointer data) return G_SOURCE_REMOVE; } -// 公共接口：挂载摄像头（线程安全） void RTSPManager::mount_camera(const Camera &cam) { Camera *camCopy = new Camera(cam); g_main_context_invoke(main_context, [](gpointer data) -> gboolean - { return mount_camera_in_main(data); }, camCopy); + { return RTSPManager::mount_camera_in_main(data); }, camCopy); } -// 公共接口：卸载摄像头（线程安全） void RTSPManager::unmount_camera(const Camera &cam) { Camera *camCopy = new Camera(cam); g_main_context_invoke(main_context, [](gpointer data) -> gboolean - { return unmount_camera_in_main(data); }, camCopy); + { return RTSPManager::unmount_camera_in_main(data); }, camCopy); } -// 查询播放状态 bool RTSPManager::is_streaming(const std::string &cam_name) { std::lock_guard lock(mounted_factories_mutex); @@ -175,8 +161,7 @@ void RTSPManager::stop() { g_main_context_invoke(main_context, [](gpointer data) -> gboolean { - GMainLoop *loop = static_cast(data); - g_main_loop_quit(loop); + g_main_loop_quit(static_cast(data)); return G_SOURCE_REMOVE; }, loop); } }