feature: report msg

opencv-motion-detect/evpusher.cpp

@@ -30,7 +30,6 @@ private:
     string urlOut, urlPub, urlDealer, devSn, pullerGid, mgrSn, selfId;
     int iid;
     int *streamList = nullptr;
-    AVDictionary *pOptsRemux = nullptr;
     AVFormatContext *pAVFormatRemux = nullptr;
     AVFormatContext *pAVFormatInput = nullptr;
     json config;
@@ -303,8 +302,25 @@ private:
 
     int setupStream()
     {
-        int ret = 0;
+        int ret = -1;
+        AVDictionary *pOptsRemux = nullptr;
         string proto = urlOut.substr(0, 4);
+        int cnt = 0;
+        while(ret < 0)
+        {
+            if(cnt > 3) {
+                string msg = fmt::format("evpusher {} failed to write stream \"{}\": {}, {}", selfId, urlOut, ret, av_err2str(ret));
+                json meta;
+                json data;
+                data["msg"] = msg;
+                data["modId"] = selfId;
+                data["type"] = EV_MSG_META_TYPE_REPORT;
+                data["level"] = EV_MSG_META_VALUE_REPORT_LEVEL_FATAL;
+                meta["type"] = EV_MSG_META_TYPE_REPORT;
+                meta["value"] = EV_MSG_META_VALUE_REPORT_LEVEL_FATAL;
+                z_send(pDaemon, "evcloudsvc", meta.dump(), data.dump());
+                exit(1);
+            }
             if(proto == "rtsp") {
                 // rtsp tcp
                 if(av_dict_set(&pOptsRemux, "rtsp_transport", "tcp", 0) < 0) {
@@ -372,10 +388,32 @@ private:
                 if (ret < 0) {
                     spdlog::error("evpusher {} {} could not open output file '%s'", devSn, iid, urlOut);
                     // TODO: message report to cloud
+                    string msg = fmt::format("evpusher {} failed to open output stream \"{}\": {}, {}", selfId, urlOut, ret, av_err2str(ret));
+                    json meta;
+                    json data;
+                    data["msg"] = msg;
+                    data["modId"] = selfId;
+                    data["type"] = EV_MSG_META_TYPE_REPORT;
+                    data["level"] = EV_MSG_META_VALUE_REPORT_LEVEL_FATAL;
+                    meta["type"] = EV_MSG_META_TYPE_REPORT;
+                    meta["value"] = EV_MSG_META_VALUE_REPORT_LEVEL_FATAL;
+                    z_send(pDaemon, "evcloudsvc", meta.dump(), data.dump());
+                    spdlog::error(msg);
                     exit(1);
                 }
             }
 
+            ret = avformat_write_header(pAVFormatRemux, &pOptsRemux);
+            if (ret < 0) { 
+                // TODO: report message to cloud
+                string msg = fmt::format("evpusher {} failed to write stream \"{}\": {}, {}", selfId, urlOut, ret, av_err2str(ret));
+                spdlog::error(msg);
+            }
+
+            cnt++;
+        }
+        
+
         return ret;
     }
 
@@ -405,12 +443,6 @@ protected:
         zmq_msg_t msg;
         AVPacket packet;
         uint64_t pktCnt = 0;
-        uint64_t failedCnt = 0, lastFailedCnt = 0;
-        // const uint64_t PKT_SKIP = 38;
-        bool bInited = false;
-
-        setupStream();
-
         while (true) {
             ret =zmq_msg_init(&msg);
             if(ret != 0) {
@@ -440,30 +472,6 @@ protected:
             zmq_msg_close(&msg);
 
             spdlog::debug("packet stream indx: {:d}", packet.stream_index);
-
-            if(!bInited) {
-                ret = avformat_write_header(pAVFormatRemux, &pOptsRemux);
-                //  -1482175736, Server returned 4XX Client Error, but not one of 40{0,1,3,4}
-                // ignore 406 error
-                if (ret < 0 && ret != -1482175736) { 
-                    // TODO: report message to cloud
-                    string msg = fmt::format("evpusher {} failed to write stream \"{}\": {}, {}", selfId, urlOut, ret, av_err2str(ret));
-                    json meta;
-                    json data;
-                    data["msg"] = msg;
-                    data["modId"] = selfId;
-                    data["type"] = EV_MSG_META_TYPE_REPORT;
-                    data["level"] = EV_MSG_META_VALUE_REPORT_LEVEL_FATAL;
-                    meta["type"] = EV_MSG_META_TYPE_REPORT;
-                    meta["value"] = EV_MSG_META_VALUE_REPORT_LEVEL_FATAL;
-                    z_send(pDaemon, "evcloudsvc", meta.dump(), data.dump());
-                    spdlog::error(msg);
-                    exit(1);
-                }
-
-                bInited = true;   
-            }
-
             // relay
             AVStream *in_stream =NULL, *out_stream = nullptr;
             in_stream  = pAVFormatInput->streams[packet.stream_index];
@@ -488,13 +496,9 @@ protected:
 
             ret = av_interleaved_write_frame(pAVFormatRemux, &packet);
             av_packet_unref(&packet);
-            // error write stream, restreaming: -22 ,Invalid argument
             if (ret < 0) {
                 // TODO: report message to cloud
-                failedCnt++;
-                if(ret != -22){
                 string msg = fmt::format("evpusher {} error write stream, restreaming: {} ,{}", selfId, ret, av_err2str(ret));
-                    //if(failedCnt % 2 == 0) {
                 json meta;
                 json data;
                 data["msg"] = msg;
@@ -504,7 +508,6 @@ protected:
                 meta["type"] = EV_MSG_META_TYPE_REPORT;
                 meta["value"] = EV_MSG_META_VALUE_REPORT_LEVEL_ERROR;
                 z_send(pDaemon, "evcloudsvc", meta.dump(), data.dump());
-                    // }
 
                 spdlog::error(msg);
                 if(packet.pts == AV_NOPTS_VALUE) {
@@ -514,12 +517,10 @@ protected:
                     getInputFormat();
                     setupStream();
                     pktCnt = 0;
-                        bInited = false;
                     continue;
                 }
             }
         }
-        }
         av_write_trailer(pAVFormatRemux);
     }
 
@@ -593,7 +594,9 @@ public:
         thEdgeMsgHandler.detach();
 
         getInputFormat();
-        //setupStream();
+        ret = 0;
+
+        setupStream();
     }
 
     ~EvPusher()