Added blend alarmed images feature.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@432 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2003-03-27 09:31:13 +00:00
parent 64de2c08f0
commit 03796df14d
3 changed files with 14 additions and 2 deletions

View File

@ -41,3 +41,4 @@
#define ZM_STRICT_VIDEO_CONFIG <from zmconfig> // Whether to allow errors in setting video config to be fatal #define ZM_STRICT_VIDEO_CONFIG <from zmconfig> // Whether to allow errors in setting video config to be fatal
#define ZM_OPT_LOCAL_BGR_INVERT <from zmconfig> // Invert BGR colours to RGB #define ZM_OPT_LOCAL_BGR_INVERT <from zmconfig> // Invert BGR colours to RGB
#define ZM_BLEND_ALARM_IMAGES <from zmconfig> // Whether alarmed images are blended to update the reference image

View File

@ -499,8 +499,12 @@ bool Monitor::Analyse()
} }
} }
} }
if ( ZM_BLEND_ALARMED_IMAGES || state != ALARM )
{
ref_image.Blend( *image, ref_blend_perc ); ref_image.Blend( *image, ref_blend_perc );
//DumpImage( image ); //DumpImage( image );
}
shared_images->last_read_index = index%image_buffer_count; shared_images->last_read_index = index%image_buffer_count;
image_count++; image_count++;

View File

@ -219,6 +219,13 @@ my @options =
help => "Some cameras or video cards capture images in BGR (Blue-Green-Red) order even when the paletter says RGB. If you see strange colours casts on your images then it may be worth trying this option to see if that corrects the issue. Note this option will apply only to local cameras and not those over a network.", help => "Some cameras or video cards capture images in BGR (Blue-Green-Red) order even when the paletter says RGB. If you see strange colours casts on your images then it may be worth trying this option to see if that corrects the issue. Note this option will apply only to local cameras and not those over a network.",
type => $types{boolean}, type => $types{boolean},
}, },
{
name => "ZM_OPT_BLEND_ALARMED_IMAGES",
default => "yes",
description => "Whether alarmed images are blended to update the reference image ",
help => "To detect alarms ZoneMinder compares an image with a reference image which is formed from a composite of the previous images. This option determines whether images that cause events are included in this process. Doing so may increase the precision of the alarmed region but can cause problems if wholescale lighting changes cause alarms as this would not get fed back into the image.",
type => $types{boolean},
},
{ {
name => "ZM_OPT_REMOTE_CAMERAS", name => "ZM_OPT_REMOTE_CAMERAS",
default => "no", default => "no",