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

slight optimisations in frame skipping

This commit is contained in:
Isaac Connor 2018-09-11 13:22:01 -04:00
parent e98603885d
commit b3ef347fd5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_monitor.cpp
View File

@ -1395,7 +1395,7 @@ bool Monitor::Analyse() {
} else if ( signal && Active() && (function == MODECT || function == MOCORD) ) { } else if ( signal && Active() && (function == MODECT || function == MOCORD) ) {
Event::StringSet zoneSet; Event::StringSet zoneSet;
int motion_score = last_motion_score; int motion_score = last_motion_score;
if ( !(image_count % (motion_frame_skip+1) ) ) { if ( (!motion_frame_skip) || !(image_count % (motion_frame_skip+1) ) ) {
// Get new score. // Get new score.
motion_score = DetectMotion(*snap_image, zoneSet); motion_score = DetectMotion(*snap_image, zoneSet);
@ -1718,7 +1718,7 @@ bool Monitor::Analyse() {
//Warning("In state TAPE, //Warning("In state TAPE,
//video_store_data->recording = event->StartTime(); //video_store_data->recording = event->StartTime();
//} //}
if ( !(image_count%(frame_skip+1)) ) { if ( (!frame_skip) || !(image_count%(frame_skip+1)) ) {
if ( config.bulk_frame_interval > 1 ) { if ( config.bulk_frame_interval > 1 ) {
event->AddFrame( snap_image, *timestamp, (event->Frames()<pre_event_count?0:-1) ); event->AddFrame( snap_image, *timestamp, (event->Frames()<pre_event_count?0:-1) );
} else { } else {
@ -1761,7 +1761,7 @@ bool Monitor::Analyse() {
image_count++; image_count++;
return( true ); return true;
} }
void Monitor::Reload() { void Monitor::Reload() {