mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-02-18 15:16:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add edit on framerate

Browse Source
This commit is contained in:
MrDave
2019-10-06 20:21:07 -06:00
committed by Mr-Dave
parent c23f3bb70e
commit 0ec54fb43f
2 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/motion_loop.cpp
View File

@@ -277,11 +277,12 @@ static void mlp_init_firstimage(struct ctx_cam *cam) {
int indx;
cam->current_image = &cam->imgs.image_ring[cam->imgs.ring_in];
/* Capture first image, or we will get an alarm on start */
if (cam->video_dev >= 0) {
for (indx = 0; indx < 5; indx++) {
if (vid_next(cam, cam->current_image) == 0)
break;
if (vid_next(cam, cam->current_image) == 0) break;
SLEEP(2, 0);
}
@@ -344,13 +345,13 @@ static int mlp_check_szimg(struct ctx_cam *cam){
MOTION_LOG(CRT, TYPE_NETCAM, NO_ERRNO
,_("Image width (%d) or height(%d) requested is not modulo 8.")
,cam->imgs.width, cam->imgs.height);
return -3;
return -1;
}
if ((cam->imgs.width < 64) || (cam->imgs.height < 64)){
MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO
,_("Motion only supports width and height greater than or equal to 64 %dx%d")
,cam->imgs.width, cam->imgs.height);
return -3;
return -1;
}
/* Substream size notification*/
if ((cam->imgs.width % 16) || (cam->imgs.height % 16)) {
@@ -505,10 +506,8 @@ static int mlp_init(struct ctx_cam *cam) {
memset(cam->imgs.smartmask_final, 255, cam->imgs.motionsize);
memset(cam->imgs.smartmask_buffer, 0, cam->imgs.motionsize * sizeof(*cam->imgs.smartmask_buffer));
/* Set noise level */
cam->noise = cam->conf.noise_level;
/* Set threshold value */
cam->threshold = cam->conf.threshold;
if (cam->conf.threshold_maximum > cam->conf.threshold ){
cam->threshold_maximum = cam->conf.threshold_maximum;
@@ -517,7 +516,6 @@ static int mlp_init(struct ctx_cam *cam) {
}
track_init(cam);
cam->frame_skip = 8;
/* Work out expected frame rate based on config setting */
if (cam->conf.framerate < 2)
@@ -530,11 +528,6 @@ static int mlp_init(struct ctx_cam *cam) {
cam->frame_delay = cam->required_frame_time;
cam->track_posx = 0;
cam->track_posy = 0;
if (cam->track.type)
cam->frame_skip = track_center(cam, cam->video_dev, 0, 0, 0);
mlp_init_areadetect(cam);
cam->timenow = 0;
@@ -1751,7 +1744,7 @@ static void mlp_frametiming(struct ctx_cam *cam){
SLEEP(0, avgtime);
}
}
cam->passflag = 1;
}
/** Thread function for each camera */