cxh/sweeper_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-10-16 11:04:22 +08:00
parent e1cc6fe10f
commit 8a676136e3
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/rtmp_manager.cpp
View File

@ -175,7 +175,16 @@ void RTMPManager::stream_loop(Camera cam, StreamType type, std::promise<StreamSt
while (true) while (true)
{ {
// 检查超时 // 检查 stop_flag 或超时
{
std::lock_guard<std::mutex> lock(streams_mutex);
auto it = streams.find(key);
if (it == streams.end() || !it->second->running.load())
{
break; // 停止逻辑
}
}
if (!first_frame_received && if (!first_frame_received &&
std::chrono::duration_cast<std::chrono::seconds>(std::chrono::steady_clock::now() - start_time).count() > 5) std::chrono::duration_cast<std::chrono::seconds>(std::chrono::steady_clock::now() - start_time).count() > 5)
{ {
@ -204,7 +213,7 @@ void RTMPManager::stream_loop(Camera cam, StreamType type, std::promise<StreamSt
status.running = true; status.running = true;
status.last_result = StreamResult::OK; status.last_result = StreamResult::OK;
status.last_error = ""; status.last_error = "";
if (status_promise) status_promise->set_value(status); // 立刻返回给 start_camera if (status_promise) status_promise->set_value(status);
} }
break; break;
} }
@ -219,10 +228,10 @@ void RTMPManager::stream_loop(Camera cam, StreamType type, std::promise<StreamSt
} }
gst_message_unref(msg); gst_message_unref(msg);
if (!running) break; // 停止逻辑
} }
gst_element_set_state(pipeline, GST_STATE_NULL); gst_element_set_state(pipeline, GST_STATE_NULL);
if (bus) gst_object_unref(bus);
gst_object_unref(pipeline); gst_object_unref(pipeline);
} }