ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

restart stream when RTSP stream name changes

This commit is contained in:
Isaac Connor 2021-04-29 06:38:42 -04:00
parent a8bd1662e3
commit 3d11366c0f
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/zm_rtsp_server.cpp
View File

@ -176,7 +176,11 @@ int main(int argc, char *argv[]) {
std::vector<std::shared_ptr<Monitor>> new_monitors = Monitor::LoadMonitors(where, Monitor::QUERY); std::vector<std::shared_ptr<Monitor>> new_monitors = Monitor::LoadMonitors(where, Monitor::QUERY);
for (const auto &monitor : new_monitors) { for (const auto &monitor : new_monitors) {
if (old_monitors.find(monitor->Id()) != old_monitors.end()) { if (
(old_monitors.find(monitor->Id()) != old_monitors.end())
and
(old_monitors[monitor->Id()]->GetRTSPStreamName() == monitor->GetRTSPStreamName())
) {
Debug(1, "Found monitor in oldmonitors, clearing it"); Debug(1, "Found monitor in oldmonitors, clearing it");
old_monitors.erase(monitor->Id()); old_monitors.erase(monitor->Id());
} else { } else {
@ -191,11 +195,6 @@ int main(int argc, char *argv[]) {
Debug(1, "Removing %d %s from monitors", monitor->Id(), monitor->Name()); Debug(1, "Removing %d %s from monitors", monitor->Id(), monitor->Name());
monitors.erase(mid); monitors.erase(mid);
if (sessions.find(mid) != sessions.end()) { if (sessions.find(mid) != sessions.end()) {
rtspServer->RemoveSession(sessions[mid]->GetMediaSessionId());
//Debug(1, "Deleting session");
//delete sessions[mid];
sessions.erase(mid);
}
if (video_sources.find(monitor->Id()) != video_sources.end()) { if (video_sources.find(monitor->Id()) != video_sources.end()) {
delete video_sources[monitor->Id()]; delete video_sources[monitor->Id()];
video_sources.erase(monitor->Id()); video_sources.erase(monitor->Id());
@ -204,6 +203,11 @@ int main(int argc, char *argv[]) {
delete audio_sources[monitor->Id()]; delete audio_sources[monitor->Id()];
audio_sources.erase(monitor->Id()); audio_sources.erase(monitor->Id());
} }
rtspServer->RemoveSession(sessions[mid]->GetMediaSessionId());
//Debug(1, "Deleting session");
//delete sessions[mid];
sessions.erase(mid);
}
} }
for (auto it = monitors.begin(); it != monitors.end(); ++it) { for (auto it = monitors.begin(); it != monitors.end(); ++it) {
@ -215,21 +219,22 @@ int main(int argc, char *argv[]) {
if (!monitor->connect()) { if (!monitor->connect()) {
Warning("Couldn't connect to monitor %d", monitor->Id()); Warning("Couldn't connect to monitor %d", monitor->Id());
if (sessions.find(monitor->Id()) != sessions.end()) { if (sessions.find(monitor->Id()) != sessions.end()) {
rtspServer->RemoveSession(sessions[monitor->Id()]->GetMediaSessionId());
delete sessions[monitor->Id()];
sessions.erase(monitor->Id());
}
if (video_sources.find(monitor->Id()) != video_sources.end()) { if (video_sources.find(monitor->Id()) != video_sources.end()) {
video_sources.erase(monitor->Id()); video_sources.erase(monitor->Id());
} }
if (audio_sources.find(monitor->Id()) != audio_sources.end()) { if (audio_sources.find(monitor->Id()) != audio_sources.end()) {
audio_sources.erase(monitor->Id()); audio_sources.erase(monitor->Id());
} }
rtspServer->RemoveSession(sessions[monitor->Id()]->GetMediaSessionId());
delete sessions[monitor->Id()];
sessions.erase(monitor->Id());
}
continue; continue;
} }
} }
if (sessions.end() == sessions.find(monitor->Id())) { if (sessions.end() == sessions.find(monitor->Id())) {
Debug(1, "Monitor not found in sessions, opening it"); Debug(1, "Monitor not found in sessions, opening it");
std::string videoFifoPath = monitor->GetVideoFifoPath(); std::string videoFifoPath = monitor->GetVideoFifoPath();
@ -237,8 +242,8 @@ int main(int argc, char *argv[]) {
Debug(1, "video fifo is empty. Skipping."); Debug(1, "video fifo is empty. Skipping.");
continue; continue;
} }
std::string streamname = monitor->GetRTSPStreamName();
std::string streamname = monitor->GetRTSPStreamName();
xop::MediaSession *session = sessions[monitor->Id()] = xop::MediaSession::CreateNew(streamname); xop::MediaSession *session = sessions[monitor->Id()] = xop::MediaSession::CreateNew(streamname);
if (!session) { if (!session) {
Error("Unable to create session for %s", streamname.c_str()); Error("Unable to create session for %s", streamname.c_str());
@ -325,16 +330,16 @@ int main(int argc, char *argv[]) {
} // end while !zm_terminate } // end while !zm_terminate
Info("RTSP Server shutting down"); Info("RTSP Server shutting down");
for (auto it = sessions.begin(); it != sessions.end(); ++it) { for (auto it = monitors.begin(); it != monitors.end(); ++it) {
auto &monitor = it->second; auto &monitor = it->second;
unsigned int i = it->first; unsigned int i = it->first;
if (video_sources.find(i) != video_sources.end()) delete video_sources[i];
if (audio_sources.find(i) != audio_sources.end()) delete audio_sources[i];
if (sessions.find(i) != sessions.end()) { if (sessions.find(i) != sessions.end()) {
Debug(1, "Removing session for %s", monitors[i]->Name()); Debug(1, "Removing session for %s", monitors[i]->Name());
rtspServer->RemoveSession(sessions[i]->GetMediaSessionId()); rtspServer->RemoveSession(sessions[i]->GetMediaSessionId());
sessions[i] = nullptr; sessions.erase(i);
} }
if (video_sources.find(i) != video_sources.end()) delete video_sources[i];
if (audio_sources.find(i) != audio_sources.end()) delete audio_sources[i];
} // end foreach monitor } // end foreach monitor
rtspServer->Stop(); rtspServer->Stop();