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

Merge branch 'master' into replace_function_concept

This commit is contained in:
Isaac Connor 2022-02-16 18:49:01 -05:00
parent cd2c977ed8 b9e6cf8038
commit 1983801004
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_monitor.cpp
View File

@ -1872,9 +1872,6 @@ bool Monitor::Analyse() {
// So... // So...
Debug(1, "Waiting for decode"); Debug(1, "Waiting for decode");
packet_lock->wait(); packet_lock->wait();
//packetqueue.unlock(packet_lock); // This will delete packet_lock and notify_all
//packetqueue.wait();
////packet_lock->lock();
} // end while ! decoded } // end while ! decoded
if (zm_terminate or analysis_thread->Stopped()) { if (zm_terminate or analysis_thread->Stopped()) {
delete packet_lock; delete packet_lock;
@ -1969,7 +1966,7 @@ bool Monitor::Analyse() {
if ((state == IDLE) || (state == TAPE) || (state == PREALARM)) { if ((state == IDLE) || (state == TAPE) || (state == PREALARM)) {
// If we should end then previous continuous event and start a new non-continuous event // If we should end then previous continuous event and start a new non-continuous event
if (event && event->Frames() if (event && event->Frames()
&& !event->AlarmFrames() && (event->AlarmFrames() < alarm_frame_count)
&& (event_close_mode == CLOSE_ALARM) && (event_close_mode == CLOSE_ALARM)
// FIXME since we won't be including this snap in the event if we close it, we should be looking at event->duration() instead // FIXME since we won't be including this snap in the event if we close it, we should be looking at event->duration() instead
&& (event->Duration() >= min_section_length) && (event->Duration() >= min_section_length)
@ -2065,6 +2062,7 @@ bool Monitor::Analyse() {
Event::EmptyPreAlarmFrames(); Event::EmptyPreAlarmFrames();
} // end if score or not } // end if score or not
// At this point, snap ONLY has motion score, so this adds other sources
if (score > snap->score) if (score > snap->score)
snap->score = score; snap->score = score;