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

Add motion roi option

Browse Source
This commit is contained in:
MrDave
2019-11-23 21:13:03 -07:00
committed by Mr-Dave
parent 14c0d79ba4
commit 88cd8dcb5c
6 changed files with 85 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/motion_loop.cpp
View File

@@ -229,7 +229,7 @@ static void mlp_detected(struct ctx_cam *cam, int dev, struct ctx_image_data *im
if (conf->stream_motion && !cam->motapp->setup_mode && img->shot != 1){
event(cam, EVENT_STREAM, img, NULL, NULL, &img->imgts);
}
if (conf->picture_output_motion){
if (conf->picture_output_motion != "off"){
event(cam, EVENT_IMAGEM_DETECTED, NULL, NULL, NULL, &img->imgts);
}
}
@@ -947,16 +947,24 @@ static void mlp_overlay(struct ctx_cam *cam){
char tmp[PATH_MAX];
if (cam->smartmask_speed &&
(cam->conf->picture_output_motion || cam->conf->movie_output_motion ||
cam->motapp->setup_mode || (cam->stream.motion.cnct_count > 0)))
((cam->conf->picture_output_motion != "off") ||
cam->conf->movie_output_motion ||
cam->motapp->setup_mode ||
(cam->stream.motion.cnct_count > 0)))
draw_smartmask(cam, cam->imgs.image_motion.image_norm);
if (cam->imgs.largest_label && (cam->conf->picture_output_motion || cam->conf->movie_output_motion ||
cam->motapp->setup_mode || (cam->stream.motion.cnct_count > 0)))
if (cam->imgs.largest_label &&
((cam->conf->picture_output_motion != "off") ||
cam->conf->movie_output_motion ||
cam->motapp->setup_mode ||
(cam->stream.motion.cnct_count > 0)))
draw_largest_label(cam, cam->imgs.image_motion.image_norm);
if (cam->imgs.mask && (cam->conf->picture_output_motion || cam->conf->movie_output_motion ||
cam->motapp->setup_mode || (cam->stream.motion.cnct_count > 0)))
if (cam->imgs.mask &&
((cam->conf->picture_output_motion != "off") ||
cam->conf->movie_output_motion ||
cam->motapp->setup_mode ||
(cam->stream.motion.cnct_count > 0)))
draw_fixed_mask(cam, cam->imgs.image_motion.image_norm);
if (cam->conf->text_changes) {