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

Fix no bulk frames by setting score to -1 which means BULK. It will get changed to 0 or more by later code. Fixes #3121

This commit is contained in:
Isaac Connor 2021-02-02 17:27:35 -05:00
parent 7e469a28fa
commit 0958768ce5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/zm_monitor.cpp
View File

@ -1806,8 +1806,8 @@ bool Monitor::Analyse() {
// if we have been told to be OFF, then we are off and don't do any processing. // if we have been told to be OFF, then we are off and don't do any processing.
if ( trigger_data->trigger_state != TRIGGER_OFF ) { if ( trigger_data->trigger_state != TRIGGER_OFF ) {
Debug(4, "Trigger not oFF state is (%d)", trigger_data->trigger_state); Debug(4, "Trigger not OFF state is (%d)", trigger_data->trigger_state);
unsigned int score = 0; unsigned int score = -1;
// Ready means that we have captured the warmpup # of frames // Ready means that we have captured the warmpup # of frames
if ( Ready() ) { if ( Ready() ) {
Debug(4, "Ready"); Debug(4, "Ready");
@ -2004,7 +2004,7 @@ bool Monitor::Analyse() {
} // end if ! event } // end if ! event
} // end if RECORDING } // end if RECORDING
if ( score ) { if ( score > 0 ) {
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()
@ -2111,7 +2111,6 @@ bool Monitor::Analyse() {
Event::EmptyPreAlarmFrames(); Event::EmptyPreAlarmFrames();
} // end if score or not } // end if score or not
// Flag the packet so we don't analyse it again
snap->score = score; snap->score = score;
if ( state == PREALARM ) { if ( state == PREALARM ) {