mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-05-03 20:33:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refine alternative primary method

Browse Source
This commit is contained in:
MrDave
2019-10-22 17:47:07 -06:00
committed by Mr-Dave
parent 8d58e73260
commit a8c993a217
2 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/alg.cpp
View File

@@ -20,6 +20,8 @@
#define DIFF(x, y) (ABS((x)-(y)))
#define NDIFF(x, y) (ABS(x) * NORM / (ABS(x) + 2 * DIFF(x, y)))
#define MAXS 10000 /* max depth of stack */
#define ACCEPT_STATIC_OBJECT_TIME 10 /* Seconds */
#define EXCLUDE_LEVEL_PERCENT 20
#define PUSH(Y, XL, XR, DY) /* push new segment on stack */ \
if (sp<stack+MAXS && Y+(DY) >= 0 && Y+(DY) < height) \
@@ -916,8 +918,6 @@ void alg_switchfilter(struct ctx_cam *cam) {
* action - UPDATE_REF_FRAME or RESET_REF_FRAME
*
*/
#define ACCEPT_STATIC_OBJECT_TIME 10 /* Seconds */
#define EXCLUDE_LEVEL_PERCENT 20
void alg_update_reference_frame(struct ctx_cam *cam, int action)
{
int accept_timer = cam->lastrate * ACCEPT_STATIC_OBJECT_TIME;
@@ -1156,40 +1156,44 @@ static void alg_new_stddev(ctx_cam *cam){
* The above is the default if nothing is specified by the user.
*/
if (cam->conf->threshold_sdevx >0){
if (cam->current_image->location.stddev_x < cam->conf->threshold_sdevx){
if (cam->current_image->location.stddev_x > cam->conf->threshold_sdevx){
cam->current_image->diffs = 0;
return;
}
} else {
} else if (cam->conf->threshold_sdevy >0){
if (cam->current_image->location.stddev_y > cam->conf->threshold_sdevy){
cam->current_image->diffs = 0;
return;
}
} else if (cam->conf->threshold_sdevxy >0){
if (cam->current_image->location.stddev_xy > cam->conf->threshold_sdevxy){
cam->current_image->diffs = 0;
return;
}
}
/* Default standard deviation testing. The 8 is just a developer choice of
* that would say if the deviation is within 1/8th of the screen count it
*/
if ((cam->conf->threshold_sdevxy == 0) &&
(cam->conf->threshold_sdevx == 0) &&
(cam->conf->threshold_sdevy == 0)) {
chk_stddev = (long)((cam->imgs.width/8) - cam->current_image->location.stddev_x);
if (chk_stddev < 0) {
if (chk_stddev > 0) {
cam->current_image->diffs = 0;
return;
}
}
if (cam->conf->threshold_sdevy >0){
if (cam->current_image->location.stddev_y < cam->conf->threshold_sdevy){
cam->current_image->diffs = 0;
return;
}
} else {
chk_stddev = (long)((cam->imgs.height/8) - cam->current_image->location.stddev_y);
if (chk_stddev < 0) {
if (chk_stddev > 0) {
cam->current_image->diffs = 0;
return;
}
}
if (cam->conf->threshold_sdevxy >0){
if (cam->current_image->location.stddev_xy < cam->conf->threshold_sdevxy){
cam->current_image->diffs = 0;
return;
}
} else {
chk_stddev = (long)((sqrt(cam->imgs.height*cam->imgs.width)/8) -
cam->current_image->location.stddev_xy);
if (chk_stddev < 0) {
if (chk_stddev > 0) {
cam->current_image->diffs = 0;
return;
}
@@ -1229,12 +1233,16 @@ static void alg_new_diff_base(ctx_cam *cam) {
}
cam->current_image->diffs = diffs;
return;
}
void alg_new_diff(ctx_cam *cam) {
alg_new_diff_base(cam);
alg_despeckle(cam);
alg_new_location(cam);
alg_new_update_frame(cam);