Provide consolidated image for each port being streamed

Author: Mr-Dave

doc/motion_config.html

@@ -2536,11 +2536,20 @@ <h3><a name="stream_preview_newline"></a> stream_preview_newline </h3>
         <h3><a name="stream_allcam_params"></a> stream_allcam_params</h3>
         <ul>
          <li> Values: String | Default: Not Defined</li>
-          Comma separated parameters for the video streams and consolidated image.
+          Comma separated parameters for the consolidated image video streams.
           The consolidated image puts together a single image of all the cameras currently
-          running. Format is parm1=value1,parm2=value2 etc.
+          running on the webcontrol_port. Format is parm1=value1,parm2=value2 etc.
           <p></p>
           <div>
+            <i><h4>Muliple webcontrol ports</h4></i>
+            <ul>
+              Since consolidated cameras streams may be available on multiple ports,
+              parameter names can be customized to provide different values per port.
+              Simply append the applicable port number to the parameter name.  For example,
+              the parameter values of <code>row=2;row8082=3</code> would indicate that the
+              default row would be 2 and for the consolidated stream provided
+              on <code>webcontrol_port 8082</code> the row would be 3
+            </ul>
             <i><h4>row</h4></i>
             <ul>
               <li> Values: positive integers | Default: Not Defined </li>
@@ -2592,6 +2601,14 @@ <h3><a name="stream_allcam_params"></a> stream_allcam_params</h3>
             </ul>
             <p></p>
           </div>
+          <div>
+            <i><h4>scale</h4></i>
+            <ul>
+              <li> Values: Integers | Default: 100 </li>
+              The percentage to scale the image.  Numbers greater than 100 are permitted.
+            </ul>
+            <p></p>
+          </div>
 
           <p></p>
           Note that the row and col must be continuous without gaps in the numbers.

src/Makefile.am

@@ -36,7 +36,6 @@ motion_SOURCES = \
 	libcam.hpp         libcam.cpp \
 	logger.hpp         logger.cpp \
 	motion.hpp         motion.cpp \
-	allcam.hpp         allcam.cpp \
 	schedule.hpp       schedule.cpp \
 	camera.hpp         camera.cpp \
 	movie.hpp          movie.cpp \
@@ -49,6 +48,7 @@ motion_SOURCES = \
 	video_convert.hpp  video_convert.cpp \
 	video_loopback.hpp video_loopback.cpp \
 	webu.hpp           webu.cpp \
+	webu_allcam.hpp    webu_allcam.cpp \
 	webu_ans.hpp       webu_ans.cpp \
 	webu_file.hpp      webu_file.cpp \
 	webu_html.hpp      webu_html.cpp \

src/camera.cpp

@@ -2093,9 +2093,6 @@ cls_camera::cls_camera(cls_motapp *p_app)
     device_status = STATUS_CLOSED;
     memset(&imgs, 0, sizeof(ctx_images));
     memset(&stream, 0, sizeof(ctx_stream));
-    memset(&all_loc, 0, sizeof(ctx_all_loc));
-    memset(&all_sizes, 0, sizeof(ctx_all_sizes));
-    all_sizes.reset = true;
 }
 
 cls_camera::~cls_camera()

src/camera.hpp

@@ -144,8 +144,6 @@ class cls_camera {
         cls_rotate      *rotate;
         cls_netcam      *netcam;
         cls_netcam      *netcam_high;
-        ctx_all_loc     all_loc;
-        ctx_all_sizes   all_sizes;
         cls_draw        *draw;
         cls_picture     *picture;
 
@@ -159,6 +157,7 @@ class cls_camera {
         bool    restart;
         bool    finish;
         bool    conf_chg;
+        bool    allcam_reset;
         int     threadnr;
         int     noise;
         bool    detecting_motion;

src/motion.cpp

@@ -20,12 +20,12 @@
 #include "util.hpp"
 #include "conf.hpp"
 #include "logger.hpp"
-#include "allcam.hpp"
 #include "schedule.hpp"
 #include "camera.hpp"
 #include "sound.hpp"
 #include "dbse.hpp"
 #include "webu.hpp"
+#include "webu_allcam.hpp"
 #include "video_v4l2.hpp"
 #include "movie.hpp"
 #include "netcam.hpp"
@@ -455,6 +455,7 @@ void cls_motapp::check_restart()
                     webu_list[indx1]->cfg = cam_list[indx2]->cfg;
                 }
             }
+            webu_list[indx1]->webuindx = indx1;
             webu_list[indx1]->startup();
             webu_list[indx1]->restart = false;
             MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO
@@ -516,6 +517,8 @@ void cls_motapp::init_webu()
 
     p_webu = nullptr;
 
+    webu_list.clear();
+
     if (cfg->webcontrol_port != 0) {
         p_webu = new cls_webu(this, cfg);
         webu_list.push_back(p_webu);
@@ -542,6 +545,7 @@ void cls_motapp::init_webu()
     }
 
     for (indx1=0; indx1<webu_cnt; indx1++) {
+        webu_list[indx1]->webuindx = indx1;
         webu_list[indx1]->startup();
     }
 
@@ -563,7 +567,6 @@ void cls_motapp::init(int p_argc, char *p_argv[])
     conf_src = nullptr;
     cfg = nullptr;
     dbse = nullptr;
-    allcam = nullptr;
     schedule = nullptr;
     cam_list.clear();
     snd_list.clear();
@@ -597,7 +600,6 @@ void cls_motapp::init(int p_argc, char *p_argv[])
     av_init();
 
     dbse = new cls_dbse(this);
-    allcam = new cls_allcam(this);
     schedule = new cls_schedule(this);
     init_webu();
 
@@ -624,28 +626,35 @@ void cls_motapp::deinit()
     av_deinit();
     pid_remove();
 
-    mydelete(dbse);
-    mydelete(allcam)
-    mydelete(schedule)
-    mydelete(conf_src);
-    mydelete(cfg);
-
     for (indx = 0; indx < cam_cnt;indx++) {
+        cam_list[indx]->handler_shutdown();
         mydelete(cam_list[indx]);
     }
 
     for (indx = 0; indx < snd_cnt;indx++) {
+        snd_list[indx]->handler_shutdown();
         mydelete(snd_list[indx]);
     }
 
     for (indx = 0; indx < webu_cnt;indx++) {
+        webu_list[indx]->shutdown();
         mydelete(webu_list[indx]);
     }
 
+    dbse->shutdown();
+    mydelete(dbse);
+
+    schedule->handler_shutdown();
+    mydelete(schedule)
+
+    mydelete(conf_src);
+    mydelete(cfg);
+
     pthread_mutex_destroy(&mutex_camlst);
     pthread_mutex_destroy(&mutex_post);
 
 }
+
 /* Check for whether to add a new cam */
 void cls_motapp::camera_add()
 {
@@ -664,8 +673,9 @@ void cls_motapp::camera_add()
 /* Check for whether to delete a new cam */
 void cls_motapp::camera_delete()
 {
-    cls_camera *cam;
-    int     indx, chk_indx;
+    cls_camera  *cam;
+    cls_webu    *webu;
+    int indx, indx2, chk_indx;
 
     if (cam_delete < 0) {
         return;
@@ -692,54 +702,39 @@ void cls_motapp::camera_delete()
         return;
     }
     MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, "Camera stopped");
-
-    /* Determine whether to close a webcontrol port or assign
-    a different config file for any other cameras using same port*/
-    if ((cam->cfg->webcontrol_port != cfg->webcontrol_port) &&
-        (cam->cfg->webcontrol_port != 0)) {
-        /* Determine if a web control is using this config*/
-        chk_indx = -1;
-        for (indx = 0; indx < webu_cnt; indx++) {
-            if (webu_list[indx]->cfg == cam->cfg) {
-                chk_indx = indx;
-            }
-        }
-        if (chk_indx != -1 ) {
-            /*This config IS being used.  Either change web control
-            to use a different cam for the config or shutdown the
-            webcontrol*/
+    /* Reverse sequence so we can remove elements*/
+    for (indx = webu_cnt-1; indx >=0; indx--) {
+        webu = webu_list[indx];
+        if ((cam->cfg->webcontrol_port == webu->cfg->webcontrol_port) ||
+            (webu->cfg == cfg)) {
             chk_indx = -1;
-            for (indx = 0; indx < cam_cnt; indx++) {
-                if ((cam_list[indx]->cfg->webcontrol_port ==
-                    cam->cfg->webcontrol_port) &&
-                    (indx != cam_delete)) {
-                    chk_indx = indx;
+            for (indx2 = 0; indx2 < webu->cam_cnt; indx2++) {
+                if (webu->cam_list[indx2] == cam) {
+                    chk_indx = indx2;
                 }
             }
-            if (chk_indx == -1 ) {
-                /* This was only cam on the web port so shut it down*/
-                for (indx = 0; indx < webu_cnt; indx++) {
-                    if (webu_list[indx]->cfg->webcontrol_port ==
-                        cam->cfg->webcontrol_port) {
-                        chk_indx = indx;
-                    }
-                }
-                webu_list[chk_indx]->shutdown();
-                mydelete(webu_list[chk_indx]);
-                webu_list.erase(webu_list.begin() + chk_indx);
+            if (chk_indx != -1) {
+                pthread_mutex_lock(&webu->mutex_camlst);
+                    mydelete(webu->cam_list[chk_indx]);
+                    webu->cam_list.erase(cam_list.begin() + chk_indx);
+                    webu->cam_cnt--;
+                pthread_mutex_unlock(&webu->mutex_camlst);
+            }
+            if (webu->cam_cnt == 0) {
+                webu->shutdown();
+                mydelete(webu);
+                webu_list.erase(webu_list.begin() + indx);
                 webu_cnt--;
             } else {
-                /* The web port is being used by different cam*/
-                /* assign the config for the different cam to the webu*/
-                /* chk_indx has the index of the different cam*/
-                for (indx = 0; indx < webu_cnt; indx++) {
-                    if (webu_list[indx]->cfg->webcontrol_port ==
-                        cam->cfg->webcontrol_port) {
-                        webu_list[indx]->cfg = cam_list[indx]->cfg;
-                        webu_list[chk_indx]->shutdown();
-                        webu_list[chk_indx]->startup();
-                    }
+                if (webu->cfg == cam->cfg) {
+                    /*The cfg used was is the cam being deleted so we need
+                    to pick a different cfg for webcontrol.  Just use the
+                    first camera at index 0.*/
+                    webu->cfg = webu->cam_list[0]->cfg;
+                    webu->shutdown();
+                    webu->startup();
                 }
+                webu->allcam->reset = true;
             }
         }
     }
@@ -751,7 +746,6 @@ void cls_motapp::camera_delete()
     pthread_mutex_unlock(&mutex_camlst);
 
     cam_delete = -1;
-    allcam->all_sizes.reset = true;
 
 }
 

src/motion.hpp

@@ -131,30 +131,6 @@ enum DEVICE_STATUS {
     STATUS_OPENED    /* Successfully started the device */
 };
 
-struct ctx_all_loc {
-    int     row;
-    int     col;
-    int     offset_row;
-    int     offset_col;
-    int     offset_user_row;
-    int     offset_user_col;
-    int     scale;
-    int     xpct_st;    /*Starting x location of image on percentage basis*/
-    int     xpct_en;    /*Ending x location of image on percentage basis*/
-    int     ypct_st;    /*Starting y location of image on percentage basis*/
-    int     ypct_en;    /*Ending y location of image on percentage basis*/
-};
-
-struct ctx_all_sizes {
-    int     src_w;
-    int     src_h;
-    int     src_sz;
-    int     dst_w;
-    int     dst_h;
-    int     dst_sz;
-    bool    reset;
-};
-
 struct ctx_stream_data {
     u_char  *jpg_data;  /* Image compressed as JPG */
     int     jpg_sz;     /* The number of bytes for jpg */
@@ -197,7 +173,6 @@ class cls_motapp {
         cls_config          *conf_src;
         cls_config          *cfg;
         cls_dbse            *dbse;
-        cls_allcam          *allcam;
         cls_schedule        *schedule;
 
         pthread_mutex_t     mutex_camlst;       /* Lock the list of cams while adding/removing */

src/schedule.hpp

@@ -28,6 +28,7 @@ class cls_schedule {
         bool            handler_running;
         pthread_t       handler_thread;
         void            handler();
+        void            handler_shutdown();
 
         bool    restart;
         bool    finish;
@@ -38,7 +39,6 @@ class cls_schedule {
         int watchdog;
 
         void handler_startup();
-        void handler_shutdown();
         void timing();
         void cleandir_cam(cls_camera *p_cam);
         void cleandir_run(cls_camera *p_cam);