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

Revise the vid_control_params option name

Browse Source
This commit is contained in:
MrDave
2020-10-12 19:15:16 -06:00
committed by Mr-Dave
parent 2cea5f9f6c
commit 69cab76d63
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/conf.cpp
View File

@@ -95,7 +95,7 @@ struct ctx_parm config_parms[] = {
0,PARM_TYP_STRING,PARM_CAT_01,WEBUI_LEVEL_ADVANCED
},
{
"vid_control_params",
"v4l2_parms",
"# Parameters to control video device. See motionplus_guide.html",
0,PARM_TYP_STRING,PARM_CAT_01,WEBUI_LEVEL_LIMITED},
{
@@ -717,32 +717,32 @@ struct ctx_parm_depr config_parms_depr[] = {
{
"brightness",
"4.1.1",
"\"brightness\" replaced with \"vid_control_params\"",
"vid_control_params"
"\"brightness\" replaced with \"v4l2_parms\"",
"v4l2_parms"
},
{
"contrast",
"4.1.1",
"\"contrast\" replaced with \"vid_control_params\"",
"vid_control_params"
"\"contrast\" replaced with \"v4l2_parms\"",
"v4l2_parms"
},
{
"saturation",
"4.1.1",
"\"saturation\" replaced with \"vid_control_params\"",
"vid_control_params"
"\"saturation\" replaced with \"v4l2_parms\"",
"v4l2_parms"
},
{
"hue",
"4.1.1",
"\"hue\" replaced with \"vid_control_params\"",
"vid_control_params"
"\"hue\" replaced with \"v4l2_parms\"",
"v4l2_parms"
},
{
"power_line_frequency",
"4.1.1",
"\"power_line_frequency\" replaced with \"vid_control_params\"",
"vid_control_params"
"\"power_line_frequency\" replaced with \"v4l2_parms\"",
"v4l2_parms"
},
{
"text_double",
@@ -1073,16 +1073,16 @@ static void conf_edit_v4l2_device(struct ctx_cam *cam, std::string &parm, enum P
return;
MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","v4l2_device",_("v4l2_device"));
}
static void conf_edit_vid_control_params(struct ctx_cam *cam, std::string &parm, enum PARM_ACT pact) {
static void conf_edit_v4l2_parms(struct ctx_cam *cam, std::string &parm, enum PARM_ACT pact) {
if (pact == PARM_ACT_DFLT) {
cam->conf->vid_control_params = "";
cam->conf->v4l2_parms = "";
} else if (pact == PARM_ACT_SET){
cam->conf->vid_control_params = parm;
cam->conf->v4l2_parms = parm;
} else if (pact == PARM_ACT_GET){
parm = cam->conf->vid_control_params;
parm = cam->conf->v4l2_parms;
}
return;
MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","vid_control_params",_("vid_control_params"));
MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","v4l2_parms",_("v4l2_parms"));
}
static void conf_edit_v4l2_palette(struct ctx_cam *cam, std::string &parm, enum PARM_ACT pact) {
int parm_in;
@@ -3002,7 +3002,7 @@ static void conf_edit_cat01(struct ctx_cam *cam, std::string parm_nm, std::strin
} else if (parm_nm == "camera_id"){ conf_edit_camera_id(cam, parm_val, pact);
} else if (parm_nm == "target_dir"){ conf_edit_target_dir(cam, parm_val, pact);
} else if (parm_nm == "v4l2_device"){ conf_edit_v4l2_device(cam, parm_val, pact);
} else if (parm_nm == "vid_control_params"){ conf_edit_vid_control_params(cam, parm_val, pact);
} else if (parm_nm == "v4l2_parms"){ conf_edit_v4l2_parms(cam, parm_val, pact);
} else if (parm_nm == "v4l2_palette"){ conf_edit_v4l2_palette(cam, parm_val, pact);
} else if (parm_nm == "input"){ conf_edit_input(cam, parm_val, pact);
} else if (parm_nm == "norm"){ conf_edit_norm(cam, parm_val, pact);
@@ -3241,7 +3241,7 @@ static void conf_edit_depr_vid(struct ctx_motapp *motapp, int threadnbr
, std::string parm_nm, std::string newname, std::string parm_val){
std::string parm_curr, parm_new;
conf_edit_vid_control_params(motapp->cam_list[threadnbr], parm_curr, PARM_ACT_GET);
conf_edit_v4l2_parms(motapp->cam_list[threadnbr], parm_curr, PARM_ACT_GET);
if (parm_curr == ""){
if (parm_nm == "power_line_frequency"){
parm_new = "\"power line frequency\"=" + parm_val;

2
src/conf.hpp
View File

@@ -34,7 +34,7 @@
/* Capture device configuration parameters */
std::string v4l2_device;
std::string vid_control_params;
std::string v4l2_parms;
int v4l2_palette;
int input;
int norm;

16
src/video_common.cpp
View File

@@ -555,15 +555,15 @@ int vid_parms_parse(struct ctx_cam *cam){
}
vdevctx->usrctrl_count = 0;
if (cam->conf->vid_control_params != ""){
MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO,_("Parsing controls: %s"),cam->conf->vid_control_params.c_str());
if (cam->conf->v4l2_parms != ""){
MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO,_("Parsing controls: %s"),cam->conf->v4l2_parms.c_str());
indx_parm = 0;
parmdesc_st = parmval_st = -1;
parmdesc_len = parmval_len = 0;
qte_open = FALSE;
parmdesc = parmval = NULL;
tst = cam->conf->vid_control_params[indx_parm];
tst = cam->conf->v4l2_parms[indx_parm];
while (tst != '\0') {
if (!qte_open) {
if (tst == '\"') { /* This is the opening quotation */
@@ -578,7 +578,7 @@ int vid_parms_parse(struct ctx_cam *cam){
if ((parmval_st >= 0) && (parmval_len > 0)){
if (parmval != NULL) free(parmval);
parmval =(char*) mymalloc(parmval_len);
snprintf(parmval, parmval_len,"%s",&cam->conf->vid_control_params[parmval_st]);
snprintf(parmval, parmval_len,"%s",&cam->conf->v4l2_parms[parmval_st]);
}
parmdesc_st = indx_parm + 1;
parmval_st = -1;
@@ -587,7 +587,7 @@ int vid_parms_parse(struct ctx_cam *cam){
if ((parmdesc_st >= 0) && (parmdesc_len > 0)) {
if (parmdesc != NULL) free(parmdesc);
parmdesc =(char*) mymalloc(parmdesc_len);
snprintf(parmdesc, parmdesc_len,"%s",&cam->conf->vid_control_params[parmdesc_st]);
snprintf(parmdesc, parmdesc_len,"%s",&cam->conf->v4l2_parms[parmdesc_st]);
}
parmdesc_st = -1;
parmval_st = indx_parm + 1;
@@ -607,7 +607,7 @@ int vid_parms_parse(struct ctx_cam *cam){
if (parmdesc_len > 0 ){
if (parmdesc != NULL) free(parmdesc);
parmdesc =(char*) mymalloc(parmdesc_len);
snprintf(parmdesc, parmdesc_len,"%s",&cam->conf->vid_control_params[parmdesc_st]);
snprintf(parmdesc, parmdesc_len,"%s",&cam->conf->v4l2_parms[parmdesc_st]);
}
parmdesc_st = -1;
parmval_st = indx_parm + 1;
@@ -624,13 +624,13 @@ int vid_parms_parse(struct ctx_cam *cam){
}
indx_parm++;
tst = cam->conf->vid_control_params[indx_parm];
tst = cam->conf->v4l2_parms[indx_parm];
}
/* Process the last parameter */
if ((parmval_st >= 0) && (parmval_len > 0)){
if (parmval != NULL) free(parmval);
parmval =(char*) mymalloc(parmval_len+1);
snprintf(parmval, parmval_len,"%s",&cam->conf->vid_control_params[parmval_st]);
snprintf(parmval, parmval_len,"%s",&cam->conf->v4l2_parms[parmval_st]);
}
if ((parmdesc != NULL) && (parmval != NULL)){
vid_parms_add(vdevctx, parmdesc, parmval);

2
src/webu.cpp
View File

@@ -716,7 +716,7 @@ static int webu_process_config_set(struct webui_ctx *webui) {
,config_parms[indx].parm_name, webui->uri_value1);
/*If we are updating vid parms, set the flag to update the device.*/
if ((config_parms[indx].parm_name == "vid_control_params") &&
if ((config_parms[indx].parm_name == "v4l2_parms") &&
(webui->camlst[webui->thread_nbr]->vdev != NULL)){
webui->camlst[webui->thread_nbr]->vdev->update_parms = TRUE;
}