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

Added pre-emptive blob recycling and optimised out some pixel blanking. Added alarm mid points on all check methods. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1648 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2005-12-02 10:16:31 +00:00
parent bf267d4ca7
commit 89b9b59803
1 changed files with 56 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/zm_zone.cpp
View File

@ -431,6 +431,39 @@ bool Zone::CheckAlarms( const Image *delta_image )
for ( i = (WHITE-1); i > 0; i-- ) for ( i = (WHITE-1); i > 0; i-- )
{ {
BlobStats *bs = &blob_stats[i]; BlobStats *bs = &blob_stats[i];
// See if we can recycle one first, only if it's at least two rows up
if ( bs->count && bs->hi_y < (y-1) )
{
if ( (min_blob_pixels && bs->count < min_blob_pixels) || (max_blob_pixels && bs->count > max_blob_pixels) )
{
if ( config.create_analysis_images || config.record_diag_images )
{
// I think blanking out the blob is unnecessary apart from in the diag image
for ( int sy = bs->lo_y; sy <= bs->hi_y; sy++ )
{
unsigned char *spdiff = diff_image->Buffer( bs->lo_x, sy );
for ( int sx = bs->lo_x; sx <= bs->hi_x; sx++, spdiff++ )
{
if ( *spdiff == bs->tag )
{
*spdiff = BLACK;
}
}
}
}
alarm_blobs--;
alarm_blob_pixels -= bs->count;
Debug( 6, ( "Eliminated blob %d, %d pixels (%d,%d - %d,%d), %d current blobs", i, bs->count, bs->lo_x, bs->lo_y, bs->hi_x, bs->hi_y, alarm_blobs ));
bs->tag = 0;
bs->count = 0;
bs->lo_x = 0;
bs->lo_y = 0;
bs->hi_x = 0;
bs->hi_y = 0;
}
}
if ( !bs->count ) if ( !bs->count )
{ {
Debug( 9, ( "Creating new blob %d", i )); Debug( 9, ( "Creating new blob %d", i ));
@ -447,12 +480,9 @@ bool Zone::CheckAlarms( const Image *delta_image )
} }
if ( i == 0 ) if ( i == 0 )
{ {
i = 1; Warning(( "Max blob count reached. Unable to allocate new blobs so terminating. Zone settings may be too sensitive." ));
Warning(( "Max blob count reached. Unable to allocate new blob so extending last one." )); x = hi_x+1;
BlobStats *bs = &blob_stats[i]; y = hi_y+1;
*pdiff = i;
if ( x > bs->hi_x ) bs->hi_x = x;
if ( y > bs->hi_y ) bs->hi_y = y;
} }
} }
} }
@ -481,6 +511,9 @@ bool Zone::CheckAlarms( const Image *delta_image )
{ {
if ( (min_blob_pixels && bs->count < min_blob_pixels) || (max_blob_pixels && bs->count > max_blob_pixels) ) if ( (min_blob_pixels && bs->count < min_blob_pixels) || (max_blob_pixels && bs->count > max_blob_pixels) )
{ {
if ( config.create_analysis_images || config.record_diag_images )
{
// I think blanking out the blob is unnecessary apart from in the diag image
for ( int sy = bs->lo_y; sy <= bs->hi_y; sy++ ) for ( int sy = bs->lo_y; sy <= bs->hi_y; sy++ )
{ {
unsigned char *spdiff = diff_image->Buffer( bs->lo_x, sy ); unsigned char *spdiff = diff_image->Buffer( bs->lo_x, sy );
@ -492,6 +525,7 @@ bool Zone::CheckAlarms( const Image *delta_image )
} }
} }
} }
}
alarm_blobs--; alarm_blobs--;
alarm_blob_pixels -= bs->count; alarm_blob_pixels -= bs->count;
@ -538,8 +572,7 @@ bool Zone::CheckAlarms( const Image *delta_image )
{ {
if ( bs->count == max_blob_size ) if ( bs->count == max_blob_size )
{ {
//if ( monitor->followMotion() ) if ( config.weighted_alarm_centres )
if ( true )
{ {
unsigned long x_total = 0; unsigned long x_total = 0;
unsigned long y_total = 0; unsigned long y_total = 0;
@ -556,10 +589,14 @@ bool Zone::CheckAlarms( const Image *delta_image )
} }
} }
} }
alarm_mid_x = int(round(x_total/bs->count)); alarm_mid_x = int(round(x_total/bs->count));
alarm_mid_y = int(round(y_total/bs->count)); alarm_mid_y = int(round(y_total/bs->count));
} }
else
{
alarm_mid_x = int((bs->hi_x+bs->lo_x+1)/2);
alarm_mid_y = int((bs->hi_y+bs->lo_y+1)/2);
}
} }
if ( alarm_lo_x > bs->lo_x ) alarm_lo_x = bs->lo_x; if ( alarm_lo_x > bs->lo_x ) alarm_lo_x = bs->lo_x;
@ -571,6 +608,11 @@ bool Zone::CheckAlarms( const Image *delta_image )
score = ((100*alarm_blob_pixels)/int(sqrt((double)alarm_blobs)))/(polygon.Area()); score = ((100*alarm_blob_pixels)/int(sqrt((double)alarm_blobs)))/(polygon.Area());
Debug( 5, ( "Current score is %d", score )); Debug( 5, ( "Current score is %d", score ));
} }
else
{
alarm_mid_x = int((alarm_hi_x+alarm_lo_x+1)/2);
alarm_mid_y = int((alarm_hi_y+alarm_lo_y+1)/2);
}
} }
if ( type == INCLUSIVE ) if ( type == INCLUSIVE )