加入动态管理输出图片/视频

.vscode/settings.json

@@ -77,7 +77,10 @@
         "__bit_reference": "cpp",
         "__hash_table": "cpp",
         "__split_buffer": "cpp",
-        "__tree": "cpp"
+        "__tree": "cpp",
+        "locale": "cpp",
+        "stack": "cpp",
+        "__node_handle": "cpp"
     },
     "C_Cpp.errorSquiggles": "Disabled",
     "commentTranslate.targetLanguage": "en"

modules/HttpClient/include/HttpClient.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-11-03 14:08:44
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-11-18 17:29:04
+ * @LastEditTime: 2022-01-06 14:33:57
  */
 #pragma once
 
@@ -57,7 +57,6 @@ namespace MIVA
         std::string refreshToken = "";
 
         
-
     public:
         HttpClient();
         ~HttpClient();
@@ -114,6 +113,13 @@ namespace MIVA
         int32_t GetVideoConfig();
 
         /**
+         * @description: 获取系统设置
+         * @param {*}
+         * @return {*}
+         */        
+        int32_t GetSystemConfig();
+
+        /**
          * @description: 获取时间
          * @param {char} *ctime
          * @return {*}

modules/HttpClient/src/HttpClient.cpp

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-11-03 14:08:57
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-11-29 09:18:16
+ * @LastEditTime: 2022-01-05 10:34:50
  */
 
 #include "HttpClient.h"
@@ -260,6 +260,16 @@ namespace MIVA
     }
 
     /**
+     * @description: 获取系统设置
+     * @param {*}
+     * @return {*}
+     */    
+    int32_t HttpClient::GetSystemConfig(){
+        
+        return OK;
+    }
+
+    /**
      * @description: 获取时间
      * @param {char} *ctime
      * @return {*}

modules/inference/include/inference.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:37:51
  * @LastEditors: lishengyin
- * @LastEditTime: 2022-01-05 09:17:44
+ * @LastEditTime: 2022-01-06 15:15:22
  */
 #pragma once
 #include <iostream>
@@ -74,7 +74,6 @@ namespace MIVA{
         guint tiler_rows, tiler_columns;
         guint pgie_batch_size;
 
-
     public:
         std::shared_ptr<std::vector<DataSource>> m_DataList = NULL;
         std::shared_ptr<InferInfo> m_InferInfo = nullptr;
@@ -83,13 +82,6 @@ namespace MIVA{
         bool Play = false;
         bool enable = false;
 
-        /**
-         * @description: 创建对象
-         * @param {*}
-         * @return {*} 智能指针
-         * @author: lishengyin
-         */        
-        static std::shared_ptr<Inference> CreateNew();
         Inference();
         ~Inference();
     public:
@@ -103,22 +95,6 @@ namespace MIVA{
         int32_t Init();
 
         /**
-         * @description: 释放数据
-         * @param {*}
-         * @return {*}
-         * @author: lishengyin
-         */        
-        void Destory();
-
-        /**
-         * @description: 准备任务
-         * @param {*}
-         * @return {*}
-         * @author: lishengyin
-         */        
-        void ReadyTask();
-
-        /**
          * @description: 启动任务
          * @param {*}
          * @return {*}
@@ -149,6 +125,17 @@ namespace MIVA{
          */        
         int32_t Recorder();
 
+        void PausedTask();
+
+        void CheckTask();
+
+        /**
+         * @description: 状态返回
+         * @param {*}
+         * @return {*}
+         */        
+        static void StateResulit(GstStateChangeReturn& state_return);
+
     public:
 
         /**

modules/inference/src/inference.cpp

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:35:37
  * @LastEditors: lishengyin
- * @LastEditTime: 2022-01-05 09:23:06
+ * @LastEditTime: 2022-01-06 15:13:45
  */
 #include "inference.h"
 
@@ -56,19 +56,8 @@ std::shared_ptr<InferInfo> g_InferInfo = NULL;
 map<string, map<int, queue<std::shared_ptr<cv::Mat>>>> m_frames;
 
 namespace MIVA{
-    std::shared_ptr<Inference> infer = NULL;
-    ThreadPool pool(2,ThreadPool::PRIORITY_HIGHEST, false);
-    /**
-     * @description: 创建对象
-     * @param {*}
-     * @return {*} 智能指针
-     * @author: lishengyin
-     */  
-    std::shared_ptr<Inference> Inference::CreateNew()
-    {
-        if(infer == NULL) infer = std::make_shared<Inference>();
-        return infer;
-    }
+    ThreadPool pool(4,ThreadPool::PRIORITY_HIGHEST, false);
+
     Inference::Inference()
     {
         
@@ -76,16 +65,24 @@ namespace MIVA{
     Inference::~Inference()
     {
         DebugL << "Returned, stopping playback" << endl;
-        GstState state;
-        gst_element_get_state(this->pipeline,&state,NULL, GST_CLOCK_TIME_NONE);
-        if(state == GST_STATE_PLAYING)  gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
-        gst_element_set_state(this->pipeline, GST_STATE_NULL);
+        // GstState state;
+        GstStateChangeReturn state_return;
+        // gst_element_get_state(this->pipeline,&state,NULL, GST_CLOCK_TIME_NONE);
+        // if(state == GST_STATE_PLAYING){
+        //     DebugL << "pipeline状态设置为暂停" << endl;
+        //     state_return = gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
+        //     StateResulit(state_return);
+        // } 
         g_main_loop_quit (this->loop);
+        state_return = gst_element_set_state(this->pipeline, GST_STATE_NULL);
+        StateResulit(state_return);
         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);
+
         this->m_InferInfo = NULL;
     } 
     /**
@@ -185,7 +182,7 @@ namespace MIVA{
             WarnL << "WARNING: Overriding infer-config batch-size:" << this->pgie_batch_size << "with number of sources ("<<  g_num_sources << ")";
             g_object_set (G_OBJECT (this->pgie), "batch-size", g_num_sources, NULL);
         }
-
+        
         // this->tiler_rows = (guint) sqrt (g_num_sources);
         // this->tiler_columns = (guint) ceil (1.0 * g_num_sources / this->tiler_rows);
 
@@ -203,16 +200,17 @@ namespace MIVA{
         gst_object_unref (this->bus);
         
         gst_bin_add_many (GST_BIN (this->pipeline), this->queue1, this->pgie, this->queue2, this->nvvidconv, this->queue3,
-                this->nvosd, this->queue4, this->sink, NULL);
+                this->nvosd, this->queue4,this->sink, NULL);
 
         if (!gst_element_link_many (streammux, this->queue1, this->pgie, this->queue2, this->nvvidconv, this->queue3,
-                    this->nvosd, this->queue4, this->sink, NULL)) {
+                    this->nvosd, this->queue4,this->sink, NULL)) {
             ErrorL << "Elements could not be linked. Exiting.";
             return -1;
         }
         // this->tiler, this->queue4,
-    
-        this->tiler_sink_pad = gst_element_get_static_pad (this->queue3, "sink");
+        // this->nvosd, this->queue4,
+        
+        this->tiler_sink_pad = gst_element_get_static_pad (this->nvvidconv, "src");
         gst_pad_add_probe (this->tiler_sink_pad, GST_PAD_PROBE_TYPE_BUFFER,
                 tiler_sink_pad_buffer_probe, NULL, NULL);
 
@@ -223,17 +221,6 @@ namespace MIVA{
     }
 
     /**
-     * @description: 准备任务
-     * @param {*}
-     * @return {*}
-     * @author: lishengyin
-     */  
-    void Inference::ReadyTask()
-    {
-         InfoL << "Now ReadyTask";
-         gst_element_set_state(this->pipeline, GST_STATE_READY);
-    }
-    /**
      * @description: 启动任务
      * @param {*}
      * @return {*}
@@ -241,22 +228,18 @@ namespace MIVA{
      */   
     int32_t Inference::StartTask()
     {
-        InfoL << "Now palying";
-
-        GstState state;
-        gst_element_get_state(this->pipeline,&state,NULL, GST_CLOCK_TIME_NONE);
-        DebugL << "state:" << state << endl;
-        if(state == GST_STATE_NULL){
-            pool.async([&](){
+        static int num = 0;
+        InfoL << "启动" << endl;
+        pool.async([&](){
+            if(num == 0){
+                num++;
                 if(m_recorder != nullptr && this->RestartTask() == OK) m_recorder->Start();
                 // 不能去掉, 去掉会触发Deepstream内部句柄无法释放的Bug
                 g_main_loop_run(this->loop);
-            });
-        }else{
-            pool.async([&](){
+            }else{
                 if(m_recorder != nullptr && this->RestartTask() == OK) m_recorder->Start();
-            });
-        }
+            }
+        });
         pool.start();
         return OK;
     }
@@ -279,37 +262,20 @@ namespace MIVA{
      */  
     void Inference::StopTask()
     {
-        int sourceId = 0;
         GstStateChangeReturn state_return;
         std::vector<DataSource>::iterator iter;
         // gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
         for (iter = this->m_InferInfo->DataSources.begin(); iter != this->m_InferInfo->DataSources.end(); iter++){
             if(iter->source_bin != NULL){
                 state_return = gst_element_set_state(iter->source_bin, GST_STATE_NULL);
-                switch (state_return) {
-                    case GST_STATE_CHANGE_SUCCESS:
-                        InfoL << "STATE CHANGE SUCCESS";
-                        break;
-                    case GST_STATE_CHANGE_FAILURE:
-                        WarnL << "STATE CHANGE FAILURE";
-                        break;
-                    case GST_STATE_CHANGE_ASYNC:
-                        ErrorL << "STATE CHANGE ASYNC";
-                        break;
-                    case GST_STATE_CHANGE_NO_PREROLL:
-                        ErrorL << "STATE CHANGE NO PREROLL";
-                        break;
-                    default:
-                        break;
-                }
+                StateResulit(state_return);
             }
-            sourceId++;
         }
-
+        // state_return = gst_element_set_state(this->streammux, GST_STATE_NULL);
+        // StateResulit(state_return);
         if(m_recorder != nullptr){
             m_recorder->Finish();
         }
-
         this->Play = false;
         NoticeCenter::Instance().emitEvent(NOTICE_RELEASE);
     }
@@ -332,36 +298,70 @@ namespace MIVA{
             this->Play = false;
             return ERR;
         }
-        DebugL << "RestartTask" << endl;
+        DebugL << "StartTask" << endl;
         GstState state;
-        gst_element_get_state(this->pipeline,&state,NULL, GST_CLOCK_TIME_NONE);
-        DebugL << "state:" << state << endl;
-        
-        if(state == GST_STATE_PLAYING){
-            gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
-            for (iter = this->m_InferInfo->DataSources.begin(); iter != this->m_InferInfo->DataSources.end(); iter++){
-                if(iter->source_bin != NULL){
-                    gst_element_set_state(iter->source_bin, GST_STATE_PLAYING);
-                }
-            }
-        } 
-        gst_element_set_state(this->pipeline, GST_STATE_PLAYING);
+        GstStateChangeReturn state_return;
+        state_return = gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
+        // gst_element_get_state(this->pipeline,&state,NULL, GST_CLOCK_TIME_NONE);
+        // if(state == GST_STATE_PLAYING){
+        //     state_return = gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
+        //     StateResulit(state_return);
+        //     // for (iter = this->m_InferInfo->DataSources.begin(); iter != this->m_InferInfo->DataSources.end(); iter++){
+        //     //     if(iter->source_bin != NULL){
+        //     //         state_return = gst_element_set_state(iter->source_bin, GST_STATE_PLAYING);
+        //     //         StateResulit(state_return);
+        //     //     }
+        //     // }
+        // } 
+        state_return = gst_element_set_state(this->pipeline, GST_STATE_PLAYING);
+        StateResulit(state_return);
+
         m_frames.clear();
         this->Play = true;
         return OK;
     }
 
     /**
-     * @description: 释放数据
+     * @description: 暂停
      * @param {*}
      * @return {*}
-     * @author: lishengyin
      */    
-    void Inference::Destory()
-    {
-        infer = NULL;
+    void Inference::PausedTask(){
+        GstState state;
+        GstStateChangeReturn state_return;
+        gst_element_get_state(this->pipeline,&state,NULL, GST_CLOCK_TIME_NONE);
+        if(state == GST_STATE_PLAYING){
+            state_return = gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
+            StateResulit(state_return);
+        } 
     }
-    
+
+    /**
+     * @description: 状态返回
+     * @param {*}
+     * @return {*}
+     */    
+    void Inference::StateResulit(GstStateChangeReturn& state_return)
+    {   
+        switch (state_return) {
+            case GST_STATE_CHANGE_SUCCESS:
+                InfoL << "STATE CHANGE SUCCESS";
+                break;
+            case GST_STATE_CHANGE_FAILURE:
+                WarnL << "STATE CHANGE FAILURE";
+                break;
+            case GST_STATE_CHANGE_ASYNC:
+                ErrorL << "STATE CHANGE ASYNC";
+                break;
+            case GST_STATE_CHANGE_NO_PREROLL:
+                ErrorL << "STATE CHANGE NO PREROLL";
+                break;
+            default:
+                ErrorL << "状态未知" << endl;
+                break;
+        }
+    }
+
     /**
      * @description: osd_sink探头
      * @param {GstPad *} pad
@@ -719,6 +719,25 @@ namespace MIVA{
             gst_bin_remove (GST_BIN (this->pipeline), this->m_InferInfo->DataSources[source_id].source_bin);
         }else{
             ErrorL << "该source_bin未设置为NULL" << endl;
+            GstStateChangeReturn state_return = gst_element_set_state(this->m_InferInfo->DataSources[source_id].source_bin, GST_STATE_NULL);
+            switch (state_return) {
+                case GST_STATE_CHANGE_SUCCESS:
+                    InfoL << "STATE CHANGE SUCCESS";
+                    gst_bin_remove (GST_BIN (this->pipeline), this->m_InferInfo->DataSources[source_id].source_bin);
+                    DebugL << "该source_bin移除成功" << endl;
+                    break;
+                case GST_STATE_CHANGE_FAILURE:
+                    WarnL << "STATE CHANGE FAILURE";
+                    break;
+                case GST_STATE_CHANGE_ASYNC:
+                    ErrorL << "STATE CHANGE ASYNC";
+                    break;
+                case GST_STATE_CHANGE_NO_PREROLL:
+                    ErrorL << "STATE CHANGE NO PREROLL";
+                    break;
+                default:
+                    break;
+            }
         }
         g_mutex_unlock (&eos_lock);
     }
@@ -772,7 +791,7 @@ namespace MIVA{
         bin = gst_element_factory_make ("uridecodebin", bin_name);
 
         // 设置为低延迟模式
-        // g_object_set (G_OBJECT (bin), "buffer-size", 3, NULL);
+        // g_object_set (G_OBJECT (bin), "buffer-duration", 1, NULL);
         // g_object_set (G_OBJECT (bin), "use-buffering", TRUE, NULL);
 
         g_object_set (G_OBJECT (bin), "uri", filename, NULL);
@@ -845,5 +864,19 @@ namespace MIVA{
         if(this->m_InferInfo->DataSources[sourceId].source_bin != NULL)
         gst_bin_add (GST_BIN (this->pipeline), this->m_InferInfo->DataSources[sourceId].source_bin);
     }
-}
 
+    void Inference::CheckTask()
+    {
+        GstState state;
+        GstStateChangeReturn state_return;
+        for (auto iter = this->m_InferInfo->DataSources.begin(); iter != this->m_InferInfo->DataSources.end(); iter++){
+            if(iter->source_bin != NULL){
+                gst_element_get_state(iter->source_bin,&state,NULL, GST_CLOCK_TIME_NONE);
+                if(state == GST_STATE_PLAYING){
+                    state_return = gst_element_set_state(iter->source_bin, GST_STATE_NULL);
+                    StateResulit(state_return);
+                }
+            }
+        }
+    }
+}

modules/userApp/include/user_app.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:41:50
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-12-29 15:57:08
+ * @LastEditTime: 2022-01-06 15:24:42
  */
 #pragma once
 
@@ -163,7 +163,6 @@ namespace MIVA
         std::string uri;
         std::string port;
 
-
         int device_id;
         bool play = false;
         bool start = true;

modules/userApp/src/user_app.cpp

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:35:42
  * @LastEditors: lishengyin
- * @LastEditTime: 2022-01-04 16:09:50
+ * @LastEditTime: 2022-01-06 15:37:54
  */
 #include "user_app.h"
 
@@ -15,7 +15,6 @@ struct timespec time3 = {0, 0};
 
 namespace MIVA
 {  
-    ThreadPool poolInfer(6,ThreadPool::PRIORITY_HIGHEST, false);
     /**
      * @description: 创建对象
      * @param {*}
@@ -52,7 +51,7 @@ namespace MIVA
             ErrorL << "No configuration file is found, please check if the configuration file exists!";
             return ERR;
         }
-
+        
         int ret = 0;
         this->Netty_ip = m_ini.getStringValue("Netty", "Netty_ip", ret);
         this->Netty_port = m_ini.getIntValue("Netty", "Netty_port", ret);
@@ -67,7 +66,6 @@ namespace MIVA
         this->user = m_ini.getStringValue("MySql", "user", ret);
         this->password = m_ini.getStringValue("MySql", "password", ret);
         this->character = m_ini.getStringValue("MySql", "character", ret);
-
         this->device_id = m_ini.getIntValue("USER", "device_id", ret);
 
         // 链接Mysql
@@ -87,21 +85,33 @@ namespace MIVA
             vector<vector<string>> sql;
             // 创建数据库
             SqlWriter("create database MIVA_DB;", false) << sql;
-
             // 创建表
         #endif
 
+        vector<vector<string>> sqlRet;
+        
+        this->m_recorder = recorder::CreateNew();
+        // 查询基础配置
+        SqlWriter sqlSelectConfig("SELECT account,outType,outPath,outEnable FROM MIVA_DB.`MivaConfig`");
+        sqlSelectConfig << sqlRet;
+        for(auto &line : sqlRet)
+        {
+            this->account = line[0];
+            this->m_recorder->outType = std::atoi(line[1].c_str());
+            this->m_recorder->Dir = line[2];
+            this->m_recorder->RecordEnable = std::atoi(line[3].c_str()) ? true:false;
+        }
+
         // 链接Netty后端
         this->ConnectNetty();
+        
+        // 获取数据
+        this->GetNettyDatas();
 
         // UDP绑定端口
         this->m_udpClient = Socket::createSocket();
         this->m_udpClient->bindUdpSock(this->PIS_port);
 
-        // 获取数据
-        this->GetNettyDatas();
-
-        vector<vector<string>> sqlRet;
          // 清洗旧数据
         SqlWriter sqlTruncate("truncate table MIVA_DB.InferTime");
         sqlTruncate << sqlRet;
@@ -115,7 +125,8 @@ namespace MIVA
         this->m_InferInfo = InferInfo::CreateNew();
 
         // 初始化Deepstream
-        m_Infer = Inference::CreateNew();
+        m_Infer = std::make_shared<Inference>();
+
         if(m_Infer == NULL){
             ErrorL << "Inference module creation failed!";
             return ERR;
@@ -141,9 +152,8 @@ namespace MIVA
         }else{
             InfoL << "The stream to be played is not found, please add it in the background.";
         }
-        
-        this->m_recorder = recorder::CreateNew();
-        
+
+ 
         // 监听推理广播
         NoticeCenter::Instance().addListener(0,NOTICE_INFER,
                 [&](int Source_id, int num){
@@ -156,11 +166,6 @@ namespace MIVA
                 this->ListenNettyData(pBuf);
         });
         
-        // 监听关门广播
-        NoticeCenter::Instance().addListener(0, NOTICE_CLOSED,[&](){
-                this->ListenClosed();
-        });
-
         // 监听资源释放
         NoticeCenter::Instance().addListener(0, NOTICE_RELEASE,[&](){
                 this->ListenRelease();
@@ -199,7 +204,6 @@ namespace MIVA
         this->m_timer2 = NULL;
         this->m_udpClient = NULL;
         this->m_tcpClient = NULL; 
-        this->m_Infer->Destory();
         this->m_Infer = NULL;
     }
     
@@ -252,8 +256,7 @@ namespace MIVA
 
         // 记录时间
         clock_gettime(CLOCK_BOOTTIME, &time1);
-        poolInfer.start();
-        InfoL << "Task started successfully!";
+        InfoL << "Task started successfully!" << endl;
     }
 
     /**
@@ -274,7 +277,7 @@ namespace MIVA
 
         SqlWriter selectSql("SELECT * FROM MIVA_DB.`DataSources` WHERE Play = 1 and Del = 0 and finish=0");
         selectSql << sqlRet;
-        if(sqlRet.size() == 0) NoticeCenter::Instance().emitEvent(NOTICE_INFEREPER);
+        if(sqlRet.size() == 0) this->ListenInferPer();
     }
 
     /**
@@ -286,7 +289,7 @@ namespace MIVA
     {
         if(this->m_Infer->Play == true){
              // 推理结束发布InferData事件
-            NoticeCenter::Instance().emitEvent(NOTICE_INFERDATA);
+            this->ListenInferData();
             this->m_Infer->Recorder();
             this->m_Infer->StopTask();
         }
@@ -319,7 +322,7 @@ namespace MIVA
         if(this->m_httpClient == NULL) this->m_httpClient = HttpClient::CreateNew();
         
         DebugL << "登录Netty" << endl;
-        if(this->m_httpClient->Init("nettyUser2",this->Netty_ip,8760) != OK){
+        if(this->m_httpClient->Init(this->account,this->Netty_ip,8760) != OK){
             ErrorL << "HttpClient登录Netty失败" << endl;
         }else{
             DebugL << "登录Netty成功！！！！" << endl;
@@ -495,7 +498,8 @@ namespace MIVA
             if((serverResultMag.DoorFlag & 0x80))
             {  
                 // 广播收到关门的信号
-                if(this->m_Infer->Play == false) NoticeCenter::Instance().emitEvent(NOTICE_CLOSED);
+                if(this->m_Infer->Play == false) this->ListenClosed();
+                else WarnL << "推理未结束" << endl;
             }
         }
     }
@@ -523,6 +527,10 @@ namespace MIVA
             DebugL << "获取摄像头设置失败，请检查网络是否正常" << endl;
             return ERR;
         }
+        if(this->m_httpClient->GetSystemConfig() != OK){
+            DebugL << "获取系统设置失败，请检查网络是否正常" << endl;
+            return ERR;
+        }
         return OK;
     }
 
@@ -535,6 +543,16 @@ namespace MIVA
     {
         vector<vector<string>> sqlRet;
         vector<DataSource>::iterator iter;
+
+        SqlWriter sqlSelectConfig("SELECT account,outType,outPath,outEnable FROM MIVA_DB.`MivaConfig`");
+        sqlSelectConfig << sqlRet;
+        for(auto &line : sqlRet)
+        {
+            this->account = line[0];
+            this->m_recorder->outType = std::atoi(line[1].c_str());
+            this->m_recorder->Dir = line[2];
+            this->m_recorder->RecordEnable = std::atoi(line[3].c_str()) ? true:false;
+        }
         
         if(this->m_Infer->enable == false || this->m_InferInfo->DataSources.empty()){
             SqlWriter sqlSelect("SELECT Id,Uri,RecognitionRange,PId FROM MIVA_DB.`DataSources` WHERE Play = 1 and Del = 0");
@@ -554,9 +572,16 @@ namespace MIVA
                 sourceId++;
             }
             if(this->m_InferInfo->DataSources.empty()) return;
-            // 初始化Deepstream
-            if(this->m_Infer->Init() != OK){
-                ErrorL << "Inference module initialization failed";
+            if(!this->m_Infer->enable){
+                // 初始化Deepstream
+                if(this->m_Infer->Init() != OK){
+                    ErrorL << "Inference module initialization failed" << endl;
+                }
+            }else{
+                // 添加数据源
+                for(auto& data : this->m_InferInfo->DataSources){
+                    data.source_bin = this->m_Infer->add_sources(data.sourceId, data.uri);
+                }
             }
             return;
         }
@@ -648,15 +673,16 @@ namespace MIVA
         SqlWriter sqlUpdata("UPDATE MIVA_DB.DataSources SET Num=0,finish=0");
         sqlUpdata << sqlRet;
         if(m_Infer->StartTask() == OK){
-            // if(!this->m_Infer->Play) return;
             this->start = true;
             // 超时处理
-            this->m_timer5 = std::make_shared<Timer>(20.0f,[&](){
+            this->m_timer5 = std::make_shared<Timer>(30.0f,[&](){
                 if(this->m_Infer->Play){
-                    NoticeCenter::Instance().emitEvent(NOTICE_INFEREPER);
+                    this->ListenInferPer();
                     WarnL << "推理时间过长。。。。。。。。" << endl;
                 }
+                this->m_Infer->CheckTask();
                 WarnL << "推理超时定时器" << endl;
+                
                 return false;
             },nullptr);
         }

source/bin/check_fd.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+clear
+lsof -p $(pidof main) | wc -l