cxh/yituo_video
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
cxh 2025-11-21 14:52:53 +08:00
parent 811eb19d5d
commit b8f0c31455
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/rtsp_manager.hpp
View File

@ -45,4 +45,9 @@ private:
// 信号处理函数
static void on_media_created(GstRTSPMediaFactory *factory, GstRTSPMedia *media, gpointer user_data);
static void on_media_unprepared(GstRTSPMedia *media, gpointer user_data);
// === 新增：同步停止用 ===
static std::mutex stop_mutex;
static std::condition_variable stop_cv;
static std::unordered_map<std::string, int> stopping_count;
};

40
src/rtsp_manager.cpp
View File

@ -29,19 +29,6 @@ GstRTSPMediaFactory *RTSPManager::create_media_factory(const Camera &cam)
int out_width = cam.width;
int out_height = cam.height;
// 构建 pipeline
// std::string launch_str =
// "( v4l2src device=" + cam.device +
// " ! video/x-raw,format=NV12,width=" + std::to_string(out_width) +
// ",height=" + std::to_string(out_height) +
// ",framerate=" + std::to_string(cam.fps) + "/1"
// " ! queue max-size-buffers=1 leaky=downstream" // 最小队列
// " ! mpph264enc bps=" +
// std::to_string(cam.bitrate) +
// " gop=" + std::to_string(cam.fps) + // GOP 设置为 1 秒
// " ! h264parse"
// " ! rtph264pay name=pay0 pt=96 config-interval=1 )"; // 每秒发送 SPS/PPS
std::string launch_str =
"( v4l2src device=" + cam.device +
" ! video/x-raw,format=NV12,width=" + std::to_string(out_width) +
@ -129,6 +116,14 @@ void RTSPManager::on_media_unprepared(GstRTSPMedia *media, gpointer user_data)
}
}
}
// === ★ 新增：减计数并在最后一个时唤醒等待线程 ===
{
std::lock_guard<std::mutex> lk(stop_mutex);
if (--stopping_count[cam_name] == 0)
stop_cv.notify_all();
}
g_object_unref(media); // 释放引用
}
@ -190,6 +185,13 @@ gboolean RTSPManager::unmount_camera_in_main(gpointer data)
auto it = media_map.find(cam_name);
if (it != media_map.end())
{
// === ★ 新增：记录需要等待的 media 数量 ===
{
std::lock_guard<std::mutex> lk(stop_mutex);
stopping_count[cam_name] = it->second.size();
}
for (GstRTSPMedia *media : it->second)
{
GstElement *pipeline = gst_rtsp_media_get_element(media);
@ -199,11 +201,9 @@ gboolean RTSPManager::unmount_camera_in_main(gpointer data)
gst_object_unref(pipeline);
}
// 这一步会触发 on_media_unprepared 信号
gst_rtsp_media_unprepare(media);
}
it->second.clear();
media_map.erase(it);
}
}
@ -236,8 +236,16 @@ gboolean RTSPManager::unmount_camera_in_main(gpointer data)
void RTSPManager::mount_camera(const Camera &cam)
{
Camera *camCopy = new Camera(cam);
g_main_context_invoke(main_context, [](gpointer data) -> gboolean
{ return RTSPManager::mount_camera_in_main(data); }, camCopy);
// === ★ 新增：等待 on_media_unprepared 全部完成 ===
std::unique_lock<std::mutex> lk(stop_mutex);
stop_cv.wait(lk, [&]
{
auto it = stopping_count.find(cam.name);
return it == stopping_count.end() || it->second == 0; });
}
void RTSPManager::unmount_camera(const Camera &cam)