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

init last_signal

This commit is contained in:
Isaac Connor 2017-11-27 15:43:06 -05:00
parent 9f57c819cd
commit 81fa201910
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/zm_monitor.cpp
View File

@ -352,6 +352,7 @@ Monitor::Monitor(
first_alarm_count = 0; first_alarm_count = 0;
last_alarm_count = 0; last_alarm_count = 0;
state = IDLE; state = IDLE;
last_signal = false;
if ( alarm_frame_count < 1 ) if ( alarm_frame_count < 1 )
alarm_frame_count = 1; alarm_frame_count = 1;
@ -590,9 +591,9 @@ Monitor::~Monitor() {
if ( (deinterlacing & 0xff) == 4) { if ( (deinterlacing & 0xff) == 4) {
delete next_buffer.image; delete next_buffer.image;
} }
#if 0 #if 1
for ( int i = 0; i < image_buffer_count; i++ ) { for ( int i = 0; i < image_buffer_count; i++ ) {
delete image_buffer[i]; delete image_buffer[i].image;
} }
#endif #endif
delete[] image_buffer; delete[] image_buffer;
@ -1453,11 +1454,12 @@ bool Monitor::Analyse() {
if ( state == PREALARM || state == ALARM ) { if ( state == PREALARM || state == ALARM ) {
if ( config.create_analysis_images ) { if ( config.create_analysis_images ) {
bool got_anal_image = false; bool got_anal_image = false;
alarm_image.Assign( *snap_image ); Image *anal_image = new Image( *snap_image );
//alarm_image.Assign( *snap_image );
for( int i = 0; i < n_zones; i++ ) { for( int i = 0; i < n_zones; i++ ) {
if ( zones[i]->Alarmed() ) { if ( zones[i]->Alarmed() ) {
if ( zones[i]->AlarmImage() ) { if ( zones[i]->AlarmImage() ) {
alarm_image.Overlay( *(zones[i]->AlarmImage()) ); anal_image->Overlay( *(zones[i]->AlarmImage()) );
got_anal_image = true; got_anal_image = true;
} }
if ( config.record_event_stats || state == ALARM ) { if ( config.record_event_stats || state == ALARM ) {
@ -1466,7 +1468,9 @@ bool Monitor::Analyse() {
} }
} // end foreach zone } // end foreach zone
if ( got_anal_image ) { if ( got_anal_image ) {
(*analysis_it)->analysis_image = &alarm_image; (*analysis_it)->analysis_image = anal_image;
} else {
delete anal_image;
} }
} else if ( config.record_event_stats && state == ALARM ) { } else if ( config.record_event_stats && state == ALARM ) {
for ( int i = 0; i < n_zones; i++ ) { for ( int i = 0; i < n_zones; i++ ) {
@ -2791,6 +2795,7 @@ int Monitor::Capture() {
} }
} else { } else {
captureResult = camera->Capture(*packet); captureResult = camera->Capture(*packet);
Debug(2, "Reset timestamp");
gettimeofday( packet->timestamp, NULL ); gettimeofday( packet->timestamp, NULL );
if ( captureResult < 0 ) { if ( captureResult < 0 ) {
// Unable to capture image for temporary reason // Unable to capture image for temporary reason