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

Revise camera_tmo to device_tmo

Browse Source
This commit is contained in:
Mr-Dave
2023-01-21 17:03:01 -07:00
parent 174442f6a4
commit 556bf36090
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/motion_loop.cpp
View File

@@ -841,7 +841,7 @@ static int mlp_capture(ctx_dev *cam)
cam->lost_connection = 0;
cam->connectionlosttime.tv_sec = 0;
if (cam->missing_frame_counter >= (cam->conf->camera_tmo * cam->conf->framerate)) {
if (cam->missing_frame_counter >= (cam->conf->device_tmo * cam->conf->framerate)) {
MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Video signal re-acquired"));
event(cam, EVENT_CAMERA_FOUND, NULL, NULL, NULL, NULL);
}
@@ -859,7 +859,7 @@ static int mlp_capture(ctx_dev *cam)
if ((cam->camera_status == STATUS_OPENED) &&
(cam->missing_frame_counter <
(cam->conf->camera_tmo * cam->conf->framerate))) {
(cam->conf->device_tmo * cam->conf->framerate))) {
memcpy(cam->current_image->image_norm, cam->imgs.image_vprvcy, cam->imgs.size_norm);
} else {
cam->lost_connection = 1;
@@ -876,14 +876,14 @@ static int mlp_capture(ctx_dev *cam)
10, 20 * cam->text_scale, tmpout, cam->text_scale);
/* Write error message only once */
if (cam->missing_frame_counter == (cam->conf->camera_tmo * cam->conf->framerate)) {
if (cam->missing_frame_counter == (cam->conf->device_tmo * cam->conf->framerate)) {
MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO
,_("Video signal lost - Adding grey image"));
event(cam, EVENT_CAMERA_LOST, NULL, NULL, NULL, &cam->connectionlosttime);
}
if ((cam->camera_status == STATUS_OPENED) &&
(cam->missing_frame_counter == ((cam->conf->camera_tmo * 4) * cam->conf->framerate))) {
(cam->missing_frame_counter == ((cam->conf->device_tmo * 4) * cam->conf->framerate))) {
MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO
,_("Video signal still lost - Trying to close video device"));
mlp_cam_close(cam);