mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-04-30 10:55:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revised cleanup for watchdog recovery

Browse Source
This commit is contained in:
Mr-Dave
2022-04-16 18:09:08 -06:00
parent 364a4f9872
commit 003305217e
4 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/motion_loop.cpp
View File

@@ -728,17 +728,30 @@ static int mlp_init(struct ctx_cam *cam)
/** clean up all memory etc. from motion init */
void mlp_cleanup(struct ctx_cam *cam)
{
/* When the watchdog counter is less than zero we
* only do the minimal necessary to free the memory variables
* rather than finish off any event processing
*/
if (cam->watchdog > 0) {
event(cam, EVENT_TLAPSE_END, NULL, NULL, NULL, NULL);
if (cam->event_nr == cam->prev_event) {
mlp_ring_process(cam);
if (cam->imgs.image_preview.diffs) {
event(cam, EVENT_IMAGE_PREVIEW, NULL, NULL, NULL, &cam->current_image->imgts);
cam->imgs.image_preview.diffs = 0;
}
event(cam, EVENT_TLAPSE_END, NULL, NULL, NULL, NULL);
if (cam->event_nr == cam->prev_event) {
mlp_ring_process(cam);
if (cam->imgs.image_preview.diffs) {
event(cam, EVENT_IMAGE_PREVIEW, NULL, NULL, NULL, &cam->current_image->imgts);
cam->imgs.image_preview.diffs = 0;
event(cam, EVENT_END, NULL, NULL, NULL, &cam->current_image->imgts);
}
} else {
movie_free(cam->movie_norm);
cam->movie_norm = NULL;
event(cam, EVENT_END, NULL, NULL, NULL, &cam->current_image->imgts);
movie_free(cam->movie_motion);
cam->movie_motion = NULL;
movie_free(cam->movie_timelapse);
cam->movie_timelapse = NULL;
}
webu_stream_deinit(cam);