motion detect: merge

opencv-motion-detect/evslicer.cpp

@@ -840,7 +840,7 @@ protected:
     }
 
     // find video files
-    vector<string> findSlicesByRange(long tss, long tse, int offsetS, int offsetE)
+    vector<string> findSlicesByRange(long tss, long tse, long & offsetS, long &offsetE)
     {
         vector<string> ret;
 
@@ -883,6 +883,7 @@ protected:
         if(found  == 1) {
             string sf;
             auto itr = tmp.begin();
+            offsetS = tss - *itr;
             for(; itr != tmp.end(); itr++) {
                 string fname = videoFileTs2Name(*itr, true);
                 sf += "\n\t" + this->urlOut + "/" + fname + ".mp4, " + to_string(*itr);
@@ -1070,8 +1071,8 @@ public:
                         params["startTime"] = to_string(tss);
                         params["endTime"] = to_string(tse);
                         params["cameraId"] = ipcSn;
-                        params["headOffset"] = to_string(offsetS);
-                        params["tailOffset"] = to_string(offsetE);
+                        params["headOffset"] = "0";//to_string(offsetS);
+                        params["tailOffset"] = "0";//to_string(offsetE);
                         params["type"] = jEvt["type"].get<string>();
                         json fileNames;
                         string sf;