修复释放程序资源的部分bug

modules/inference/include/inference.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:37:51
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-10-15 15:36:31
+ * @LastEditTime: 2021-10-18 13:57:48
  */
 #pragma once
 #include <iostream>
@@ -47,6 +47,7 @@ namespace MIVA{
     {
     private:
         // Deepstream
+        GMainLoop *loop = NULL;
         GstElement *pipeline = NULL,*streammux =NULL, *sink = NULL, *pgie = NULL,
         *queue1, *queue2, *queue3, *queue4, *queue5, *nvvidconv = NULL,
         *nvosd = NULL, *tiler = NULL;

modules/inference/src/inference.cpp

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:35:37
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-10-15 15:42:42
+ * @LastEditTime: 2021-10-18 15:00:56
  */
 #include "inference.h"
 
@@ -72,7 +72,14 @@ namespace MIVA{
     }
     Inference::~Inference()
     {
-        Destory();
+        DebugL << "Returned, stopping playback";
+        gst_element_set_state(this->pipeline, GST_STATE_NULL);
+        g_main_loop_quit (this->loop);
+        DebugL << "Deleting pipeline";
+        gst_object_unref(GST_OBJECT(this->pipeline));
+        g_source_remove(this->bus_watch_id);
+        g_main_loop_unref(this->loop);
+        g_mutex_clear (&eos_lock);
     } 
     /**
      * @description: 推理模块初始化
@@ -83,6 +90,7 @@ namespace MIVA{
     int32_t Inference::Init(vector<DataSource> DataList)
     {
         // init
+        this->loop = g_main_loop_new (NULL, FALSE);
         // 创建管道
         this->pipeline = gst_pipeline_new("dstest3-pipeline");
 
@@ -179,7 +187,7 @@ namespace MIVA{
             
     
         this->bus = gst_pipeline_get_bus (GST_PIPELINE (this->pipeline));
-        this->bus_watch_id = gst_bus_add_watch (this->bus, bus_call, NULL);
+        this->bus_watch_id = gst_bus_add_watch (this->bus, bus_call, this->loop);
         gst_object_unref (this->bus);
 
         gst_bin_add_many (GST_BIN (this->pipeline), this->queue1, this->pgie, this->queue2, this->tiler, this->queue3,
@@ -228,6 +236,7 @@ namespace MIVA{
             ret++;
             pool.async([&](){
                 gst_element_set_state(this->pipeline, GST_STATE_PLAYING);
+                g_main_loop_run(this->loop);
             });
             pool.start();
         }
@@ -293,12 +302,6 @@ namespace MIVA{
      */    
     void Inference::Destory()
     {
-        DebugL << "Returned, stopping playback";
-        gst_element_set_state(this->pipeline, GST_STATE_NULL);
-        DebugL << "Deleting pipeline";
-        gst_object_unref(GST_OBJECT(this->pipeline));
-        g_source_remove(this->bus_watch_id);
-        g_mutex_clear (&eos_lock);
         infer = NULL;
     }
     /**

modules/userApp/src/user_app.cpp

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:35:42
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-10-15 15:56:39
+ * @LastEditTime: 2021-10-18 15:00:36
  */
 #include "user_app.h"
 
@@ -170,8 +170,9 @@ namespace MIVA
         this->m_timer1 = NULL;
         this->m_timer2 = NULL;
         this->m_udpClient = NULL;
-        this->m_Infer = NULL;
         this->m_tcpClient = NULL; 
+        this->m_Infer->Destory();
+        this->m_Infer = NULL;
     }
     /**
      * @description: 启动任务