优化逻辑

modules/dataType/include/Notices.h

@@ -7,5 +7,6 @@
 #define NOTICE_NETTY      "NOTICE_NETTY"
 #define NOTICE_CLOSED     "NOTICE_CLOSED"
 #define NOTICE_INFERDATA  "NOTICE_INFERDATA"
+#define NOTICE_RELEASE    "NOTICE_RELEASE"
 
 

modules/inference/include/inference.h

@@ -80,7 +80,6 @@ namespace MIVA{
         // 动态管理源
         gboolean add_sources (int source_Id, std::string uri);
         void stop_release_source (gint source_id);
-        void stop_release_source1();
     };
 }
 

modules/inference/src/inference.cpp

@@ -24,8 +24,8 @@
  * based on the fastest source's framerate. */
 #define MUXER_BATCH_TIMEOUT_USEC 5000
 
-#define TILED_OUTPUT_WIDTH 1920
-#define TILED_OUTPUT_HEIGHT 1080
+#define TILED_OUTPUT_WIDTH 1280
+#define TILED_OUTPUT_HEIGHT 720
 
 /* NVIDIA Decoder source pad memory feature. This feature signifies that source
  * pads having this capability will push GstBuffers containing cuda buffers. */
@@ -46,7 +46,7 @@ GstElement *g_streammux = NULL;
 
 namespace MIVA{
     std::shared_ptr<Inference> infer = NULL;
-    ThreadPool pool(6,ThreadPool::PRIORITY_HIGHEST, false);
+    ThreadPool pool(10,ThreadPool::PRIORITY_HIGHEST, false);
     std::shared_ptr<Inference> Inference::CreateNew()
     {
         if(infer == NULL) infer = std::make_shared<Inference>();
@@ -167,7 +167,7 @@ namespace MIVA{
 
         gst_bin_add_many (GST_BIN (this->pipeline), this->queue1, this->pgie, this->queue2, this->tiler, this->queue3,
             this->nvvidconv, this->queue4, this->nvosd, this->queue5, this->transform, this->sink, NULL);
-            
+
         if (!gst_element_link_many (streammux, this->queue1, this->pgie, this->queue2, this->tiler, this->queue3,
                 this->nvvidconv, this->queue4, this->nvosd, this->queue5, this->transform, this->sink, NULL)) {
             ErrorL << "Elements could not be linked. Exiting.";
@@ -206,7 +206,12 @@ namespace MIVA{
     void Inference::PauseTask()
     {
         InfoL << "Now Pause";
-        gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
+        std::vector<DataSource>::iterator iter;
+        for(iter = this->m_DataList.begin(); iter != this->m_DataList.end(); iter++){
+            if(iter->Play){
+                gst_element_set_state(iter->source_bin, GST_STATE_PAUSED);
+            }
+        }
     }
     
     void Inference::StopTask()
@@ -217,13 +222,14 @@ namespace MIVA{
             for (iter = this->m_DataList.begin(); iter != this->m_DataList.end(); iter++){
                 if(iter->Play){
                     this->stop_release_source(sourceId);
-                    sourceId++;
                     iter->Play = false;
                 }
+                sourceId++;
             }
+            NoticeCenter::Instance().emitEvent(NOTICE_RELEASE);
+            WarnL << "释放资源成功";
         });
         pool.start();
-        WarnL << "释放资源成功";
     }
     void Inference::RestartTask()
     {
@@ -377,54 +383,6 @@ namespace MIVA{
         state_return = gst_element_set_state (m_DataList[source_id].source_bin, GST_STATE_NULL);
         switch (state_return) {
             case GST_STATE_CHANGE_SUCCESS:
-
-                InfoL << "STATE CHANGE SUCCESS";
-                g_snprintf (pad_name, 15, "sink_%u", source_id);
-                sinkpad = gst_element_get_static_pad (streammux, pad_name);
-                gst_pad_send_event (sinkpad, gst_event_new_flush_stop (FALSE));
-                gst_element_release_request_pad (streammux, sinkpad);
-                InfoL << "STATE CHANGE SUCCESS:" << source_id;
-                gst_object_unref (sinkpad);
-                gst_bin_remove (GST_BIN (this->pipeline), m_DataList[source_id].source_bin);
-                break;
-            case GST_STATE_CHANGE_FAILURE:
-                ErrorL << "STATE CHANGE FAILURE";
-                break;
-            case GST_STATE_CHANGE_ASYNC:
-                InfoL << "STATE CHANGE ASYNC";
-                state_return =
-                    gst_element_get_state (m_DataList[source_id].source_bin, NULL, NULL,
-                    GST_CLOCK_TIME_NONE);
-                    g_snprintf (pad_name, 15, "sink_%u", source_id);
-                    sinkpad = gst_element_get_static_pad (streammux, pad_name);
-                    gst_pad_send_event (sinkpad, gst_event_new_flush_stop (FALSE));
-                    gst_element_release_request_pad (streammux, sinkpad);
-                    g_print ("STATE CHANGE ASYNC %p\n\n", sinkpad);
-                    gst_object_unref (sinkpad);
-                    gst_bin_remove (GST_BIN (this->pipeline), m_DataList[source_id].source_bin);
-                break;
-            case GST_STATE_CHANGE_NO_PREROLL:
-                InfoL << "STATE CHANGE NO PREROLL";
-                break;
-            default:
-                break;
-        }
-    }
-
-    void Inference::stop_release_source1()
-    {
-        static int source_id = 0;
-        if(source_id == m_DataList.size()){
-            source_id = 0;
-        }
-
-        GstStateChangeReturn state_return;
-        gchar pad_name[16];
-        GstPad *sinkpad = NULL;
-
-        state_return = gst_element_set_state (m_DataList[source_id].source_bin, GST_STATE_NULL);
-        switch (state_return) {
-            case GST_STATE_CHANGE_SUCCESS:
                 InfoL << "STATE CHANGE SUCCESS";
                 g_snprintf (pad_name, 15, "sink_%u", source_id);
                 sinkpad = gst_element_get_static_pad (streammux, pad_name);
@@ -433,7 +391,6 @@ namespace MIVA{
                 InfoL << "STATE CHANGE SUCCESS:" << source_id;
                 gst_object_unref (sinkpad);
                 gst_bin_remove (GST_BIN (this->pipeline), m_DataList[source_id].source_bin);
-                m_DataList[source_id].source_bin = NULL;
                 break;
             case GST_STATE_CHANGE_FAILURE:
                 ErrorL << "STATE CHANGE FAILURE";
@@ -457,9 +414,7 @@ namespace MIVA{
             default:
                 break;
         }
-        source_id++;
     }
-
     void Inference::cb_newpad (GstElement * decodebin, GstPad * pad, gpointer data)
     {
         GstCaps *caps = gst_pad_query_caps (pad, NULL);

modules/userApp/include/user_app.h

@@ -82,7 +82,8 @@ namespace MIVA
         std::string character;
 
         int device_id;
-        bool play = true;
+        bool play = false;
+        bool start = true;
     private:
         std::shared_ptr<TCPClient> m_tcpClient = NULL;
         std::shared_ptr<Inference> m_Infer = NULL;
@@ -93,12 +94,12 @@ namespace MIVA
         Timer::Ptr m_timer1;
         Timer::Ptr m_timer2;
         
-
     private:
         void ListenInfer(int Source_id, int num);
         void ListenNettyData(const Buffer::Ptr &pBuf);
         void ListenPISData(const Buffer::Ptr &buf, struct sockaddr *addr);
         void ListenClosed();
+        void ListenRelease();
         void ListenInferData();
         void ConnectNetty();
         void ReportData();

modules/userApp/src/user_app.cpp

@@ -121,6 +121,11 @@ namespace MIVA
                 this->ListenClosed();
         });
 
+        // 监听资源释放
+        NoticeCenter::Instance().addListener(0, NOTICE_RELEASE,[&](){
+                this->ListenRelease();
+        });
+
         // 监听推理数据广播
         NoticeCenter::Instance().addListener(0, NOTICE_INFERDATA,[&](){
                 this->ListenInferData();
@@ -168,14 +173,15 @@ namespace MIVA
     // 监听推理广播
     void UserApp::ListenInfer(int Source_id, int num)
     {   
-        if(this->play == true){
-            this->m_timer2 = std::make_shared<Timer>(5.0f,[&](){
+        if(this->start == true){
+            this->m_timer2 = std::make_shared<Timer>(10.0f,[&](){
+                // this->m_Infer->PauseTask();
                 this->m_Infer->StopTask();
                 // 推理结束发布InferData事件
                 NoticeCenter::Instance().emitEvent(NOTICE_INFERDATA);
                 return false;
             }, nullptr);
-            this->play = false;
+            this->start = false;
         }
         char ctime[80];
         vector<vector<std::string>> sqlRet;
@@ -184,8 +190,11 @@ namespace MIVA
         int id = this->DataList[Source_id].Id;
         SqlWriter updataSql("UPDATE MIVA_DB.DataSources SET Num = '?',DataTime = '?' WHERE Id = '?';");
         updataSql << num << ctime << id << sqlRet;
-    }   
-
+    } 
+    void UserApp::ListenRelease()
+    {
+        this->play = false;
+    }
     // 连接Netty
     void UserApp::ConnectNetty()
     {
@@ -286,8 +295,11 @@ namespace MIVA
     //监听关门信号
     void UserApp::ListenClosed()
     {
-        if(this->m_Infer != NULL) m_Infer->StartTask();
-        this->play = true;
+        if(this->play == false){
+            if(this->m_Infer != NULL) m_Infer->StartTask();
+            this->play = true;
+            this->start = true;
+        }
     }
     // 监听推理数据
     void UserApp::ListenInferData()