init

opencv-motion-detect/evpuller.cpp

@@ -89,7 +89,7 @@ private:
     void *pPubCtx = NULL; // for packets publishing
     void *pPub = NULL;
     AVFormatContext *pAVFormatInput = NULL;
-    string urlIn, urlPub;
+    string urlIn, urlPub, urlRep;
     int *streamList = NULL, numStreams = 0;
 
 public:
@@ -130,6 +130,12 @@ protected:
             spdlog::error("failed create avformatcontext for output: {}", av_err2str(AVERROR(ENOMEM)));
         }
 
+        // serialize formatctx to bytes
+        char *pBytes = NULL;
+        ret = AVFormatCtxSerializer::encode(pAVFormatInput, &pBytes);
+        auto repSrv = RepSrv(urlRep, pBytes, ret);
+        repSrv.detach();
+
         // find all video & audio streams for remuxing
         int i = 0, streamIdx = 0;
         for (; i < pAVFormatInput->nb_streams; i++) {
@@ -144,10 +150,8 @@ protected:
             streamList[i] = streamIdx++;
         }
 
-        
-
         bool bStopSig = false;
-        int pktCnt = 0;
+        uint64_t pktCnt = 0;
         while (true) {
             if(checkStop() == true) {
                 bStopSig = true;
@@ -167,9 +171,11 @@ protected:
                 av_packet_unref(&packet);
                 continue;
             }
-
+            if(pktCnt % 1024 == 0) {
+                spdlog::info("pktCnt: {:d}", pktCnt);
+            }
+            
             pktCnt++;
-
             packet.stream_index = streamList[packet.stream_index];
 
             /* copy packet */
@@ -187,6 +193,7 @@ protected:
             av_packet_unref(&packet);
         }
 
+        free(pBytes);
         // TODO:
         if(ret < 0 && !bStopSig) {
             // reconnect
@@ -215,10 +222,11 @@ private:
                 json data = jr["data"]["services"]["evpuller"];
                 urlIn = "rtsp://" + user + ":" + passwd + "@"+ ipc + "/h264/ch1/sub/av_stream";
                 urlPub = string("tcp://") +data["addr"].get<string>() + ":" + to_string(data["port-pub"]);
+                urlRep = string("tcp://") +data["addr"].get<string>() + ":" + to_string(data["port-rep"]);
             }
             catch(exception &e) {
                 bcnt = true;
-                spdlog::error(e.what());
+                spdlog::error("exception in EvPuller.init {:s} retrying", e.what());
             }
             if(bcnt) {
                 this_thread::sleep_for(chrono::milliseconds(1000*20));

opencv-motion-detect/evpusher.cpp

@@ -34,10 +34,8 @@ private:
     AVFormatContext *pAVFormatRemux = NULL;
     AVFormatContext *pAVFormatInput = NULL;
 
-    int getEnv(){
-        // TODO:
-        //urlOut = getenv("URL_OUT");
-        //urlIn=
+    int init(){
+
         urlOut = (char*)"rtsp://40.73.41.176:554/test1";
         return 0;
     }
@@ -81,10 +79,6 @@ private:
             avlogThrow(NULL, AV_LOG_FATAL,  "Failed to retrieve input stream information");
         }
 
-        //avformat_close_input(&pAVFormatInput);
-
-        pAVFormatInput->flags = AVFMT_FLAG_NOBUFFER | AVFMT_FLAG_FLUSH_PACKETS;
-
         ret = avformat_alloc_output_context2(&pAVFormatRemux, NULL, "rtsp", urlOut);
         if (ret < 0) {
             avlogThrow(NULL, AV_LOG_FATAL, "failed create avformatcontext for output: %s", av_err2str(ret));
@@ -217,7 +211,7 @@ protected:
 public:
     PacketPusher()
     {
-        getEnv();
+        init();
         setupMq();
         setupStream();
     }

opencv-motion-detect/inc/common.hpp

@@ -256,7 +256,7 @@ namespace cloudutils
    "code":0,
    "time":0,
    "data":{
-      "ipc":"192.168.0.23",
+      "ipc":"172.31.0.51",
       "username":"admin",
       "password":"FWBWTU",
       "services":{
@@ -293,7 +293,7 @@ namespace cloudutils
    }
 }
 */
-const char *config = "{\"code\":0,\"time\":0,\"data\":{\"ipc\":\"192.168.0.23\",\"username\":\"admin\",\"password\":\"FWBWTU\",\"services\":{\"evmgr\":{\"sn\":\"ILS-1\",\"addr\":\"0.0.0.0\",\"port-pub\":5556,\"port-rep\":5557,\"iid\":1},\"evpuller\":{\"sn\":\"ILS-2\",\"addr\":\"0.0.0.0\",\"port-pub\":5556,\"port-rep\":5557,\"iid\":2},\"evslicer\":[{\"sn\":\"ILS-3\",\"addr\":\"192.168.0.25\",\"iid\":3}],\"evml\":[{\"feature\":\"motion\",\"sn\":\"ILS-4\",\"addr\":\"192.168.0.26\",\"iid\":4}]}}}";
+const char *config = "{\"code\":0,\"time\":0,\"data\":{\"ipc\":\"172.31.0.51\",\"username\":\"admin\",\"password\":\"FWBWTU\",\"services\":{\"evmgr\":{\"sn\":\"ILS-1\",\"addr\":\"0.0.0.0\",\"port-pub\":5556,\"port-rep\":5557,\"iid\":1},\"evpuller\":{\"sn\":\"ILS-2\",\"addr\":\"0.0.0.0\",\"port-pub\":5556,\"port-rep\":5557,\"iid\":2},\"evslicer\":[{\"sn\":\"ILS-3\",\"addr\":\"192.168.0.25\",\"iid\":3}],\"evml\":[{\"feature\":\"motion\",\"sn\":\"ILS-4\",\"addr\":\"192.168.0.26\",\"iid\":4}]}}}";
 
 json registry(const char *sn, const char *scn, int iid)
 {