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

terminate when zm_terminate is set. Do a countdown instead of countup. Sleeo for 10000 microseconds instead of 100. This restores the old value

This commit is contained in:
Isaac Connor 2022-01-25 16:24:21 -05:00
parent 17e01cb58f
commit 961256d2e7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/zm_remote_camera_rtsp.cpp
View File

@ -22,6 +22,7 @@
#include "zm_config.h" #include "zm_config.h"
#include "zm_monitor.h" #include "zm_monitor.h"
#include "zm_packet.h" #include "zm_packet.h"
#include "zm_signal.h"
RemoteCameraRtsp::RemoteCameraRtsp( RemoteCameraRtsp::RemoteCameraRtsp(
const Monitor *monitor, const Monitor *monitor,
@ -126,8 +127,8 @@ int RemoteCameraRtsp::Disconnect() {
int RemoteCameraRtsp::PrimeCapture() { int RemoteCameraRtsp::PrimeCapture() {
Debug(2, "Waiting for sources"); Debug(2, "Waiting for sources");
for (int i = 0; i < 100 && !rtspThread->hasSources(); i++) { for (int i = 100; i && !zm_terminate && !rtspThread->hasSources(); i--) {
std::this_thread::sleep_for(Microseconds(100)); std::this_thread::sleep_for(Microseconds(10000));
} }
if (!rtspThread->hasSources()) { if (!rtspThread->hasSources()) {
@ -218,7 +219,7 @@ int RemoteCameraRtsp::Capture(std::shared_ptr<ZMPacket> &zm_packet) {
while (!frameComplete) { while (!frameComplete) {
buffer.clear(); buffer.clear();
if (!rtspThread || rtspThread->IsStopped()) if (!rtspThread || rtspThread->IsStopped() || zm_terminate)
return -1; return -1;
if (rtspThread->getFrame(buffer)) { if (rtspThread->getFrame(buffer)) {