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

Reworked to handle signal lost events better and to prevent untimed events. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3172 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2010-11-03 16:43:33 +00:00
parent 51a03d84ee
commit 2effcc506b
2 changed files with 77 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/zm_event.cpp
View File

@ -60,6 +60,13 @@ Event::Event( Monitor *p_monitor, struct timeval p_start_time, const std::string
std::string notes; std::string notes;
createNotes( notes ); createNotes( notes );
bool untimedEvent = false;
if ( !start_time.tv_sec )
{
untimedEvent = true;
gettimeofday( &start_time, 0 );
}
static char sql[BUFSIZ]; static char sql[BUFSIZ];
struct tm *stime = localtime( &start_time.tv_sec ); struct tm *stime = localtime( &start_time.tv_sec );
@ -70,6 +77,10 @@ Event::Event( Monitor *p_monitor, struct timeval p_start_time, const std::string
exit( mysql_errno( &dbconn ) ); exit( mysql_errno( &dbconn ) );
} }
id = mysql_insert_id( &dbconn ); id = mysql_insert_id( &dbconn );
if ( untimedEvent )
{
Warning( "Event %d has zero time, setting to current", id );
}
end_time.tv_sec = 0; end_time.tv_sec = 0;
frames = 0; frames = 0;
alarm_frames = 0; alarm_frames = 0;
@ -477,8 +488,15 @@ void Event::AddFrames( int n_frames, Image **images, struct timeval **timestamps
{ {
static char sql[BUFSIZ]; static char sql[BUFSIZ];
strncpy( sql, "insert into Frames ( EventId, FrameId, TimeStamp, Delta ) values ", BUFSIZ ); strncpy( sql, "insert into Frames ( EventId, FrameId, TimeStamp, Delta ) values ", BUFSIZ );
int frameCount = 0;
for ( int i = 0; i < n_frames; i++ ) for ( int i = 0; i < n_frames; i++ )
{ {
if ( !timestamps[i]->tv_sec )
{
Debug( 1, "Not adding pre-capture frame %d, zero timestamp", i );
continue;
}
frames++; frames++;
static char event_file[PATH_MAX]; static char event_file[PATH_MAX];
@ -492,21 +510,35 @@ void Event::AddFrames( int n_frames, Image **images, struct timeval **timestamps
int sql_len = strlen(sql); int sql_len = strlen(sql);
snprintf( sql+sql_len, sizeof(sql)-sql_len, "( %d, %d, from_unixtime(%ld), %s%ld.%02ld ), ", id, frames, timestamps[i]->tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec ); snprintf( sql+sql_len, sizeof(sql)-sql_len, "( %d, %d, from_unixtime(%ld), %s%ld.%02ld ), ", id, frames, timestamps[i]->tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec );
frameCount++;
} }
Debug( 1, "Adding %d frames to DB", n_frames ); if ( frameCount )
{
Debug( 1, "Adding %d/%d frames to DB", frameCount, n_frames );
*(sql+strlen(sql)-2) = '\0'; *(sql+strlen(sql)-2) = '\0';
if ( mysql_query( &dbconn, sql ) ) if ( mysql_query( &dbconn, sql ) )
{ {
Error( "Can't insert frames: %s", mysql_error( &dbconn ) ); Error( "Can't insert frames: %s", mysql_error( &dbconn ) );
exit( mysql_errno( &dbconn ) ); exit( mysql_errno( &dbconn ) );
} }
last_db_frame = frames; last_db_frame = frames;
} }
else
{
Debug( 1, "No valid pre-capture frames to add" );
}
}
void Event::AddFrame( Image *image, struct timeval timestamp, int score, Image *alarm_image ) void Event::AddFrame( Image *image, struct timeval timestamp, int score, Image *alarm_image )
{ {
if ( !timestamp.tv_sec )
{
Debug( 1, "Not adding new frame, zero timestamp" );
return;
}
frames++; frames++;
static char event_file[PATH_MAX]; static char event_file[PATH_MAX];

41
src/zm_monitor.cpp
View File

@ -1178,14 +1178,16 @@ bool Monitor::Analyse()
} }
if ( signal_change ) if ( signal_change )
{ {
score += 100;
const char *signalText; const char *signalText;
if ( !signal ) if ( !signal )
signalText = "Lost"; signalText = "Lost";
else else
{
signalText = "Reacquired"; signalText = "Reacquired";
score += 100;
}
Warning( "%s: %s", SIGNAL_CAUSE, signalText ); Warning( "%s: %s", SIGNAL_CAUSE, signalText );
if ( event ) if ( event && !signal )
{ {
Info( "%s: %03d - Closing event %d, signal loss", name, image_count, event->Id() ); Info( "%s: %03d - Closing event %d, signal loss", name, image_count, event->Id() );
closeEvent(); closeEvent();
@ -1204,7 +1206,7 @@ bool Monitor::Analyse()
shared_data->active = signal; shared_data->active = signal;
ref_image = *snap_image; ref_image = *snap_image;
} }
else if ( Active() && function != RECORD && function != NODECT ) else if ( signal && Active() && function != RECORD && function != NODECT )
{ {
Event::StringSet zoneSet; Event::StringSet zoneSet;
int motion_score = DetectMotion( *snap_image, zoneSet ); int motion_score = DetectMotion( *snap_image, zoneSet );
@ -1293,14 +1295,24 @@ bool Monitor::Analyse()
if ( false ) if ( false )
{ {
int pre_index = ((index+image_buffer_count)-pre_event_count)%image_buffer_count; int pre_index = ((index+image_buffer_count)-pre_event_count)%image_buffer_count;
for ( int i = 0; i < pre_event_count; i++ ) int pre_event_images = pre_event_count;
while ( pre_event_images && !image_buffer[pre_index].timestamp->tv_sec )
{
pre_index = (pre_index+1)%image_buffer_count;
pre_event_images--;
}
if ( pre_event_images )
{
for ( int i = 0; i < pre_event_images; i++ )
{ {
timestamps[i] = image_buffer[pre_index].timestamp; timestamps[i] = image_buffer[pre_index].timestamp;
images[i] = image_buffer[pre_index].image; images[i] = image_buffer[pre_index].image;
pre_index = (pre_index+1)%image_buffer_count; pre_index = (pre_index+1)%image_buffer_count;
} }
event->AddFrames( pre_event_count, images, timestamps ); event->AddFrames( pre_event_images, images, timestamps );
}
} }
} }
} }
@ -1320,19 +1332,29 @@ bool Monitor::Analyse()
else else
pre_index = ((index+image_buffer_count)-pre_event_count)%image_buffer_count; pre_index = ((index+image_buffer_count)-pre_event_count)%image_buffer_count;
int pre_event_images = pre_event_count;
while ( pre_event_images && !image_buffer[pre_index].timestamp->tv_sec )
{
pre_index = (pre_index+1)%image_buffer_count;
pre_event_images--;
}
event = new Event( this, *(image_buffer[pre_index].timestamp), cause, noteSetMap ); event = new Event( this, *(image_buffer[pre_index].timestamp), cause, noteSetMap );
shared_data->last_event = event->Id(); shared_data->last_event = event->Id();
Info( "%s: %03d - Opening new event %d, alarm start", name, image_count, event->Id() ); Info( "%s: %03d - Opening new event %d, alarm start", name, image_count, event->Id() );
for ( int i = 0; i < pre_event_count; i++ ) if ( pre_event_images )
{
for ( int i = 0; i < pre_event_images; i++ )
{ {
timestamps[i] = image_buffer[pre_index].timestamp; timestamps[i] = image_buffer[pre_index].timestamp;
images[i] = image_buffer[pre_index].image; images[i] = image_buffer[pre_index].image;
pre_index = (pre_index+1)%image_buffer_count; pre_index = (pre_index+1)%image_buffer_count;
} }
event->AddFrames( pre_event_count, images, timestamps ); event->AddFrames( pre_event_images, images, timestamps );
}
if ( alarm_frame_count ) if ( alarm_frame_count )
{ {
event->SavePreAlarmFrames(); event->SavePreAlarmFrames();
@ -1364,7 +1386,8 @@ bool Monitor::Analyse()
if ( image_count-last_alarm_count > post_event_count ) if ( image_count-last_alarm_count > post_event_count )
{ {
Info( "%s: %03d - Left alarm state (%d) - %d(%d) images", name, image_count, event->Id(), event->Frames(), event->AlarmFrames() ); Info( "%s: %03d - Left alarm state (%d) - %d(%d) images", name, image_count, event->Id(), event->Frames(), event->AlarmFrames() );
if ( function != MOCORD || event_close_mode == CLOSE_ALARM || event->Cause() == "Signal" ) //if ( function != MOCORD || event_close_mode == CLOSE_ALARM || event->Cause() == SIGNAL_CAUSE )
if ( function != MOCORD || event_close_mode == CLOSE_ALARM )
{ {
shared_data->state = state = IDLE; shared_data->state = state = IDLE;
Info( "%s: %03d - Closing event %d, alarm end%s", name, image_count, event->Id(), (function==MOCORD)?", section truncated":"" ); Info( "%s: %03d - Closing event %d, alarm end%s", name, image_count, event->Id(), (function==MOCORD)?", section truncated":"" );
@ -1498,7 +1521,7 @@ bool Monitor::Analyse()
shared_data->state = state = IDLE; shared_data->state = state = IDLE;
last_section_mod = 0; last_section_mod = 0;
} }
if ( !signal_change && (function == MODECT || function == MOCORD) && (config.blend_alarmed_images || state != ALARM) ) if ( signal && (function == MODECT || function == MOCORD) && (config.blend_alarmed_images || state != ALARM) )
{ {
ref_image.Blend( *snap_image, ref_blend_perc ); ref_image.Blend( *snap_image, ref_blend_perc );
} }