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 secondary detection to webstream

Browse Source
This commit is contained in:
MrDave
2019-10-20 13:01:05 -06:00
committed by Mr-Dave
parent 720a5a0f6e
commit 6f45d3c469
7 changed files with 103 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/motion_loop.cpp
View File

@@ -373,6 +373,7 @@ static void mlp_init_buffers(struct ctx_cam *cam){
cam->imgs.labelsize =(int*) mymalloc((cam->imgs.motionsize/2+1) * sizeof(*cam->imgs.labelsize));
cam->imgs.image_preview.image_norm =(unsigned char*) mymalloc(cam->imgs.size_norm);
cam->imgs.common_buffer =(unsigned char*) mymalloc(3 * cam->imgs.width * cam->imgs.height);
cam->imgs.image_secondary =(unsigned char*) mymalloc(3 * cam->imgs.width * cam->imgs.height);
if (cam->imgs.size_high > 0){
cam->imgs.image_preview.image_high =(unsigned char*) mymalloc(cam->imgs.size_high);
}
@@ -399,6 +400,7 @@ static void mlp_init_values(struct ctx_cam *cam) {
cam->event_stop = FALSE;
cam->passflag = FALSE; //only purpose to flag first frame
/* Make sure to default the high res to zero */
cam->imgs.width_high = 0;
cam->imgs.height_high = 0;
@@ -568,6 +570,9 @@ void mlp_cleanup(struct ctx_cam *cam) {
free(cam->imgs.common_buffer);
cam->imgs.common_buffer = NULL;
free(cam->imgs.image_secondary);
cam->imgs.image_secondary = NULL;
free(cam->imgs.image_preview.image_norm);
cam->imgs.image_preview.image_norm = NULL;
@@ -1084,6 +1089,7 @@ static void mlp_actions_event_stop(struct ctx_cam *cam){
if ((cam->frame_curr_ts.tv_sec - cam->lasttime >= cam->conf.event_gap) && cam->conf.event_gap > 0) {
cam->event_stop = TRUE;
MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("222En222dddd of event %d"), cam->event_nr);
}
if (cam->event_stop) {