Add functionality for movie_all_frames

Author: Mr-Dave

doc/motion_config.html

@@ -388,12 +388,15 @@ <h2><a name="Configuration_OptionsTopic"></a>  Configuration Options-Listed by T
               <td bgcolor="#edf4f9" ><a href="#movie_filename" >movie_filename</a> </td>
               <td bgcolor="#edf4f9" ><a href="#movie_extpipe_use" >movie_extpipe_use</a> </td>
               <td bgcolor="#edf4f9" ><a href="#movie_extpipe" >movie_extpipe</a> </td>
-              <td bgcolor="#edf4f9" ><a href="#timelapse_filename" >timelapse_filename</a> </td>
+              <td bgcolor="#edf4f9" ><a href="#movie_all_frames" >movie_all_frames</a> </td>
             </tr>
             <tr>
+              <td bgcolor="#edf4f9" ><a href="#timelapse_filename" >timelapse_filename</a> </td>
               <td bgcolor="#edf4f9" ><a href="#timelapse_interval" >timelapse_interval</a> </td>
               <td bgcolor="#edf4f9" ><a href="#timelapse_mode" >timelapse_mode</a> </td>
               <td bgcolor="#edf4f9" ><a href="#timelapse_container" >timelapse_container</a> </td>
+            </tr>
+            <tr>
               <td bgcolor="#edf4f9" ><a href="#timelapse_fps" >timelapse_fps</a> </td>
             </tr>
           </tbody>
@@ -2260,6 +2263,14 @@ <h3><a name="movie_extpipe"></a> movie_extpipe </h3>
         </ul>
         <p></p>
 
+        <h3><a name="movie_all_frames"></a> movie_all_frames </h3>
+        <ul>
+          <li> Values: on, off | Default: on</li>
+          Specifies whether to send all frames for encoding during an event instead of just
+          those associated with motion or pre/post capture.
+        </ul>
+        <p></p>
+
         <h3><a name="timelapse_interval"></a> timelapse_interval </h3>
         <ul>
           <li> Values: Integer | Default: 0</li>

src/camera.cpp

@@ -1562,6 +1562,8 @@ void cls_camera::actions_emulate()
         imgs.image_ring[indx].save_movie = true;
     }
 
+    lasttime = current_image->monots.tv_sec;
+
     detected();
 }
 
@@ -1609,10 +1611,14 @@ void cls_camera::actions_motion()
         current_image->save_pic = true;
         current_image->save_movie = true;
         postcap--;
+    } else if ((cfg->movie_all_frames) && (event_curr_nbr == event_prev_nbr)) {
+        current_image->save_movie = true;
     } else {
         current_image->precap = true;
     }
 
+    lasttime = current_image->monots.tv_sec;
+
     detected();
 }
 
@@ -1712,6 +1718,8 @@ void cls_camera::actions()
         current_image->save_pic = true;
         current_image->save_movie = true;
         postcap--;
+    } else if ((cfg->movie_all_frames) && (event_curr_nbr == event_prev_nbr)) {
+        current_image->save_movie = true;
     } else {
         current_image->precap = true;
         if ((cfg->event_gap == 0) && detecting_motion) {
@@ -1720,10 +1728,6 @@ void cls_camera::actions()
         detecting_motion = false;
     }
 
-    if ((current_image->save_pic) || (current_image->save_movie )) {
-        lasttime = current_image->monots.tv_sec;
-    }
-
     if (detecting_motion) {
         algsec->detect();
     }

src/conf.cpp

@@ -140,6 +140,7 @@ ctx_parm config_parms[] = {
     {"movie_passthrough",         PARM_TYP_BOOL,   PARM_CAT_10, PARM_LEVEL_LIMITED },
     {"movie_filename",            PARM_TYP_STRING, PARM_CAT_10, PARM_LEVEL_LIMITED },
     {"movie_retain",              PARM_TYP_LIST,   PARM_CAT_10, PARM_LEVEL_LIMITED },
+    {"movie_all_frames",          PARM_TYP_BOOL,   PARM_CAT_10, PARM_LEVEL_LIMITED },
     {"movie_extpipe_use",         PARM_TYP_BOOL,   PARM_CAT_10, PARM_LEVEL_RESTRICTED },
     {"movie_extpipe",             PARM_TYP_STRING, PARM_CAT_10, PARM_LEVEL_RESTRICTED },
 
@@ -2110,6 +2111,19 @@ void cls_config::edit_movie_retain(std::string &parm, enum PARM_ACT pact)
     MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_retain",_("movie_retain"));
 }
 
+void cls_config::edit_movie_all_frames(std::string &parm, enum PARM_ACT pact)
+{
+    if (pact == PARM_ACT_DFLT) {
+        movie_all_frames = true;
+    } else if (pact == PARM_ACT_SET) {
+        edit_set_bool(movie_all_frames, parm);
+    } else if (pact == PARM_ACT_GET) {
+        edit_get_bool(parm, movie_all_frames);
+    }
+    return;
+    MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_all_frames",_("movie_all_frames"));
+}
+
 void cls_config::edit_movie_extpipe_use(std::string &parm, enum PARM_ACT pact)
 {
     if (pact == PARM_ACT_DFLT) {
@@ -3311,6 +3325,7 @@ void cls_config::edit_cat10(std::string parm_nm, std::string &parm_val, enum PAR
     } else if (parm_nm == "movie_passthrough") {       edit_movie_passthrough(parm_val, pact);
     } else if (parm_nm == "movie_filename") {          edit_movie_filename(parm_val, pact);
     } else if (parm_nm == "movie_retain") {            edit_movie_retain(parm_val, pact);
+    } else if (parm_nm == "movie_all_frames") {        edit_movie_all_frames(parm_val, pact);
     } else if (parm_nm == "movie_extpipe_use") {       edit_movie_extpipe_use(parm_val, pact);
     } else if (parm_nm == "movie_extpipe") {           edit_movie_extpipe(parm_val, pact);
     }

src/conf.hpp

@@ -204,6 +204,7 @@
             bool            movie_passthrough;
             std::string     movie_filename;
             std::string     movie_retain;
+            bool            movie_all_frames;
             bool            movie_extpipe_use;
             std::string     movie_extpipe;
 
@@ -441,6 +442,7 @@
             void edit_snapshot_filename(std::string &parm, enum PARM_ACT pact);
             void edit_snapshot_interval(std::string &parm, enum PARM_ACT pact);
 
+            void edit_movie_all_frames(std::string &parm, enum PARM_ACT pact);
             void edit_movie_bps(std::string &parm, enum PARM_ACT pact);
             void edit_movie_container(std::string &parm, enum PARM_ACT pact);
             void edit_movie_extpipe(std::string &parm, enum PARM_ACT pact);