Implement updating many of the parameters via the webcontrol without restarting camera

Author: Mr-Dave

doc/motion_config.html

@@ -1235,7 +1235,11 @@ <h3><a name="v4l2_params"></a>v4l2_params</h3>
         <h3><a name="libcam_device"></a>libcam_device</h3>
         <ul>
           <li> Values: String | Default: Not Defined </li>
-          The libcamera device.  The value of 'camera0' is the only currently supported device.
+          The libcamera device.  The log will list the availble devices.  If
+          the user specifies 'camera0' the first device found will be used.  (Useful
+          when there is only one camera on system).  Otherwise, the specify the
+          device description in the log or using the command <code>cam -l</code> Note that
+          you can also specify v4l2 devices(webcams) for the libcam_device.
         </ul>
         <p></p>
 
@@ -1246,6 +1250,10 @@ <h3><a name="libcam_params"></a>libcam_params</h3>
           Comma separated list of configuration parameters (aka controls) for the libcamera device.
         </ul>
         <ul>
+          <i><h4>pixelformat</h4></i>
+           User requested pixelformat to use.  Default of YU12 is most efficient.  Usually
+           this parameter is specified as the fourcc character code.
+
           <i><h4> Transform(string)</h4></i>
            (These are libcamera transform and rotate options and may not provide result you anticipate.)
           <div><ul>

src/camera.cpp

@@ -1154,6 +1154,7 @@ void cls_camera::init()
     }
 
     cfg->parms_copy(conf_src);
+    conf_chg = false;
 
     mythreadname_set("cl",cfg->device_id, cfg->device_name.c_str());
 
@@ -1864,6 +1865,54 @@ void cls_camera::check_schedule()
     */
 }
 
+/* Apply any changes to the configuration parameters set by webcontrol*/
+void cls_camera::check_config()
+{
+    std::string parm_nm, parm_vl_cur, parm_vl_src;
+    PARM_CAT    parm_ct;
+    PARM_CHG    parm_ch;
+    int indx;
+
+    if ((restart == true) || (handler_stop == true) || (conf_chg == false)) {
+        return;
+    }
+
+    indx=0;
+    while (config_parms[indx].parm_name != "") {
+        parm_nm = config_parms[indx].parm_name;
+        parm_ct = config_parms[indx].parm_cat;
+        parm_ch = config_parms[indx].parm_chg;
+        conf_src->edit_get(parm_nm, parm_vl_src, parm_ct);
+        cfg->edit_get(parm_nm, parm_vl_cur, parm_ct);
+        if (parm_vl_cur != parm_vl_src) {
+            if (parm_ch == PARM_CHG_COPY) {
+                cfg->edit_set(parm_nm, parm_vl_src);
+                MOTION_LOG(INF, TYPE_EVENTS, NO_ERRNO
+                    , _("%s:%s applied")
+                    , parm_nm.c_str(), parm_vl_src.c_str());
+            } else if (parm_ch == PARM_CHG_CODE) {
+                if ((parm_nm == "v4l2_params")  &&
+                    (camera_type == CAMERA_TYPE_V4L2)) {
+                    v4l2cam->parms_update();
+                } else if ((parm_nm == "libcam_params")  &&
+                    (camera_type == CAMERA_TYPE_LIBCAM)) {
+                    libcam->parms_update();
+                } else {
+                    MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO
+                        , _("Programming error for changes to parameter %s")
+                        ,parm_nm.c_str());
+                }
+                cfg->edit_set(parm_nm, parm_vl_src);
+                MOTION_LOG(INF, TYPE_EVENTS, NO_ERRNO
+                    , _("%s:%s applied")
+                    , parm_nm.c_str(), parm_vl_src.c_str());
+            }
+        }
+        indx++;
+    }
+    conf_chg = false;
+}
+
 /* sleep the loop to get framerate requested */
 void cls_camera::frametiming()
 {
@@ -1908,6 +1957,7 @@ void cls_camera::handler()
         timelapse();
         loopback();
         check_schedule();
+        check_config();
         frametiming();
     }
 
@@ -2036,6 +2086,7 @@ cls_camera::cls_camera(cls_motapp *p_app)
     handler_stop = true;
     restart = false;
     finish = false;
+    conf_chg = false;
     watchdog = 90;
     passflag = false;
     pthread_mutex_init(&stream.mutex, NULL);

src/camera.hpp

@@ -158,6 +158,7 @@ class cls_camera {
 
         bool    restart;
         bool    finish;
+        bool    conf_chg;
         int     threadnr;
         int     noise;
         bool    detecting_motion;
@@ -265,6 +266,7 @@ class cls_camera {
         void timelapse();
         void loopback();
         void check_schedule();
+        void check_config();
         void frametiming();
 };
 

src/conf.cpp

@@ -51,21 +51,27 @@
         , PARM_TYP_ARRAY
         , PARM_TYP_PARAMS
     };
-    enum PARM_LEVEL{
-        PARM_LEVEL_ALWAYS      = 0
-        ,PARM_LEVEL_LIMITED    = 1
-        ,PARM_LEVEL_ADVANCED   = 2
-        ,PARM_LEVEL_SCRIPTS    = 3
-        ,PARM_LEVEL_RESTRICTED = 4
-        ,PARM_LEVEL_NEVER      = 99
+    enum PARM_LVL{
+        PARM_LVL_00     = 0     /*Webcontrol Always Available Parameters*/
+        ,PARM_LVL_01    = 1     /*Webcontrol Limited Parameters */
+        ,PARM_LVL_02    = 2     /*Webcontrol Advanced Parameters*/
+        ,PARM_LVL_03    = 3     /*Webcontrol Scripts Parameters*/
+        ,PARM_LVL_04    = 4     /*Webcontrol Restricted Parameters*/
+        ,PARM_LVL_99    = 99    /*Webcontrol Never Available Parameters*/
+    };
+    enum PARM_CHG{  /*Method to apply webcontrol changes to parameter*/
+        PARM_CHG_COPY       = 0 /* Copy the new value to cfg to apply new value*/
+        ,PARM_CHG_CODE      = 1 /* A specific procedure is written to apply new values */
+        ,PARM_CHG_RESTART   = 2 /* Restart of the thread is required*/
     };
 
     /** Current parameters in the config file */
     struct ctx_parm {
-        const std::string   parm_name;      /* name for this parameter                  */
-        enum PARM_TYP       parm_type;      /* enum of parm_typ for bool,int or string. */
-        enum PARM_CAT       parm_cat;       /* enum of parm_cat for grouping. */
-        int                 webui_level;    /* Enum to display in webui: 0,1,2,3,99(always to never)*/
+        const std::string   parm_name;  /* name for this parameter                  */
+        enum PARM_TYP       parm_type;  /* enum of parm_typ for bool,int or string. */
+        enum PARM_CAT       parm_cat;   /* enum of parm_cat for grouping. */
+        int                 parm_lvl;   /* Enum of parm_lvl for webui*/
+        enum PARM_CHG       parm_chg;   /* Enum for whether a restart is needed to implement changes*/
     };
 
     enum PARM_ACT{

src/conf.hpp

@@ -90,6 +90,7 @@ class cls_dbse {
         void filelist_get(std::string sql, vec_files &p_flst);
         bool restart;
         bool finish;
+        bool conf_chg;
         void shutdown();
         void startup();
 

src/dbse.hpp

@@ -631,18 +631,15 @@ static void jpgutl_error_exit(j_common_ptr cinfo)
  */
 static void jpgutl_emit_message(j_common_ptr cinfo, int msg_level)
 {
-    char buffer[JMSG_LENGTH_MAX];
-    /* cinfo->err really points to a jpgutl_error_mgr struct, so coerce pointer. */
     struct jpgutl_error_mgr *myerr = (struct jpgutl_error_mgr *) cinfo->err;
     /*
      *  The JWRN_EXTRANEOUS_DATA is sent a lot without any particular negative effect.
      *  There are some messages above zero but they are just informational and not something
      *  that we are interested in.
     */
-    if ((cinfo->err->msg_code != JWRN_EXTRANEOUS_DATA) && (msg_level < 0) ) {
+    if ((cinfo->err->msg_code != JWRN_EXTRANEOUS_DATA) && (msg_level < 0)) {
         myerr->warning_seen++ ;
-        (*cinfo->err->format_message) (cinfo, buffer);
-            MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "msg_level: %d, %s", msg_level, buffer);
+        MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "msg_level: %d, Corrupt JPEG data", msg_level);
     }
 
 }