mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-04-18 21:17:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Image Ring Process (#1283)

Browse Source 
* Revise image ring process
This commit is contained in:
Mr-DaveDev
2020-12-15 20:23:44 -07:00
committed by GitHub
parent 02fed650b3
commit fdaa9ded5d
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/motion.c
View File

@@ -41,8 +41,6 @@
#include "dbse.h"
#define IMAGE_BUFFER_FLUSH ((unsigned int)-1)
/**
* tls_key_threadnr
*
@@ -635,10 +633,8 @@ static void motion_detected(struct context *cnt, int dev, struct image_data *img
* Parameters:
*
* cnt - current thread's context struct
* max_images - Max number of images to process
* Set to IMAGE_BUFFER_FLUSH to send/save all images in buffer
*/
static void process_image_ring(struct context *cnt, unsigned int max_images)
static void process_image_ring(struct context *cnt)
{
/*
* We are going to send an event, in the events there is still
@@ -765,14 +761,6 @@ static void process_image_ring(struct context *cnt, unsigned int max_images)
cnt->imgs.image_ring_out = 0;
}
if (max_images != IMAGE_BUFFER_FLUSH) {
max_images--;
/* breakout if we have done max_images */
if (max_images == 0) {
break;
}
}
/* loop until out and in is same e.g. buffer empty */
} while (cnt->imgs.image_ring_out != cnt->imgs.image_ring_in);
@@ -2438,6 +2426,8 @@ static void mlp_actions(struct context *cnt)
mlp_areadetect(cnt);
process_image_ring(cnt);
/* Check for movie length */
if ((cnt->conf.movie_max_time > 0) &&
(cnt->event_nr == cnt->prev_event) &&
@@ -2457,8 +2447,6 @@ static void mlp_actions(struct context *cnt)
/* When prev_event = event_nr, there is currently
* an event occurring so trigger ending events */
process_image_ring(cnt, IMAGE_BUFFER_FLUSH); /* Flush image buffer */
/* Save preview_shot here at the end of event */
if (cnt->imgs.preview_image.diffs) {
/* Do not save if it was saved at start */
@@ -2486,9 +2474,6 @@ static void mlp_actions(struct context *cnt)
cnt->event_user = FALSE;
}
/* Save/send to movie some images */
process_image_ring(cnt, 2);
}
static void mlp_setupmode(struct context *cnt)