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

rearrange a bit, put back setting width and height on video source even though it isn't used yet. Remove signal blocking stuff that we don't use

This commit is contained in:
Isaac Connor 2021-03-22 17:44:19 -04:00
parent d84e4a14fb
commit d2efb51b0d
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/zm_rtsp_server.cpp
View File

@ -129,6 +129,10 @@ int main(int argc, char *argv[]) {
zmDbConnect(); zmDbConnect();
zmLoadDBConfig(); zmLoadDBConfig();
logInit(log_id_string); logInit(log_id_string);
if (!config.min_rtsp_port) {
Debug(1, "Not starting RTSP server because min_rtsp_port not set");
exit(-1);
}
hwcaps_detect(); hwcaps_detect();
@ -152,18 +156,6 @@ int main(int argc, char *argv[]) {
zmSetDefaultTermHandler(); zmSetDefaultTermHandler();
zmSetDefaultDieHandler(); zmSetDefaultDieHandler();
sigset_t block_set;
sigemptyset(&block_set);
sigaddset(&block_set, SIGHUP);
sigaddset(&block_set, SIGUSR1);
sigaddset(&block_set, SIGUSR2);
if (!config.min_rtsp_port) {
Debug(1, "Not starting RTSP server because min_rtsp_port not set");
exit(-1);
}
std::shared_ptr<xop::EventLoop> eventLoop(new xop::EventLoop()); std::shared_ptr<xop::EventLoop> eventLoop(new xop::EventLoop());
std::shared_ptr<xop::RtspServer> rtspServer = xop::RtspServer::Create(eventLoop.get()); std::shared_ptr<xop::RtspServer> rtspServer = xop::RtspServer::Create(eventLoop.get());
@ -183,7 +175,6 @@ int main(int argc, char *argv[]) {
std::list<ZoneMinderFifoSource *> sources; std::list<ZoneMinderFifoSource *> sources;
while (!zm_terminate) { while (!zm_terminate) {
for (size_t i = 0; i < monitors.size(); i++) { for (size_t i = 0; i < monitors.size(); i++) {
std::shared_ptr<Monitor> monitor = monitors[i]; std::shared_ptr<Monitor> monitor = monitors[i];
@ -242,13 +233,10 @@ int main(int argc, char *argv[]) {
Error("Unable to create source"); Error("Unable to create source");
} }
sources.push_back(videoSource); sources.push_back(videoSource);
if (videoSource) {
#if 0 videoSource->setWidth(monitor->Width());
if (video_source) { videoSource->setHeight(monitor->Height());
video_source->setWidth(monitor->Width());
video_source->setHeight(monitor->Height());
} }
#endif
std::string audioFifoPath = monitor->GetAudioFifoPath(); std::string audioFifoPath = monitor->GetAudioFifoPath();
if (audioFifoPath.empty()) { if (audioFifoPath.empty()) {
@ -288,7 +276,7 @@ int main(int argc, char *argv[]) {
logInit(log_id_string); logInit(log_id_string);
zm_reload = false; zm_reload = false;
} // end if zm_reload } // end if zm_reload
} // end while ! zm_terminate } // end while !zm_terminate
Info("RTSP Server shutting down"); Info("RTSP Server shutting down");
for (size_t i = 0; i < monitors.size(); i++) { for (size_t i = 0; i < monitors.size(); i++) {
@ -300,7 +288,7 @@ int main(int argc, char *argv[]) {
} // end foreach monitor } // end foreach monitor
for ( std::list<ZoneMinderFifoSource *>::iterator it = sources.begin(); it != sources.end(); ++it ) { for ( std::list<ZoneMinderFifoSource *>::iterator it = sources.begin(); it != sources.end(); ++it ) {
Debug(1, "RTSPServerThread::stopping source"); Debug(1, "RTSPServerThread::stopping source");
(*it)->Stop(); (*it)->Stop();
} }
while (sources.size()) { while (sources.size()) {