代码结构优化

modules/TCPClient/include/TCPClient.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-09-13 17:30:20
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-10-13 09:41:07
+ * @LastEditTime: 2021-10-15 15:46:34
  */
 #pragma once
 #include <signal.h>
@@ -41,10 +41,40 @@ namespace MIVA
             DebugL;
         }
     protected:
+        /**
+         * @description: 连接成功时触发
+         * @param {SockException} &ex  连接info
+         * @return {*}
+         * @author: lishengyin
+         */   
         virtual void onConnect(const SockException &ex) override;
+        /**
+         * @description: 接收数据时触发
+         * @param {Ptr} &pBuf 接受到的数据
+         * @return {*}
+         * @author: lishengyin
+         */    
         virtual void onRecv(const Buffer::Ptr &pBuf) override;
+         /**
+         * @description: 发送阻塞时触发
+         * @param {*}
+         * @return {*}
+         * @author: lishengyin
+         */  
         virtual void onFlush() override;
+        /**
+         * @description: EOF时触发
+         * @param {SockException} &ex 错误信息
+         * @return {*}
+         * @author: lishengyin
+         */   
         virtual void onErr(const SockException &ex) override;
+         /**
+         * @description: 心跳 2S触发一次
+         * @param {*}
+         * @return {*}
+         * @author: lishengyin
+         */ 
         virtual void onManager() override;
     private:
         int _nTick = 0;

modules/TCPClient/src/TCPClient.cpp

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-09-14 09:12:25
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-10-13 09:49:17
+ * @LastEditTime: 2021-10-15 15:46:12
  */
 #include "TCPClient.h"
 
@@ -12,7 +12,7 @@ namespace MIVA
 {
     /**
      * @description: 连接成功时触发
-     * @param {SockException} &ex
+     * @param {SockException} &ex 连接info
      * @return {*}
      * @author: lishengyin
      */    
@@ -21,8 +21,8 @@ namespace MIVA
         InfoL << (ex ?  ex.what() : "success");
     }
     /**
-     * @description: 接到数据时触发
-     * @param {Ptr} &pBuf
+     * @description: 接收数据时触发
+     * @param {Ptr} &pBuf 接受到的数据
      * @return {*}
      * @author: lishengyin
      */    
@@ -44,7 +44,7 @@ namespace MIVA
     }
     /**
      * @description: EOF时触发
-     * @param {SockException} &ex
+     * @param {SockException} &ex 错误信息
      * @return {*}
      * @author: lishengyin
      */    

modules/inference/include/inference.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:37:51
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-10-13 09:40:21
+ * @LastEditTime: 2021-10-15 15:36:31
  */
 #pragma once
 #include <iostream>
@@ -47,48 +47,136 @@ 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;
-
         GstElement *transform = NULL;
-
         GstBus *bus = NULL;
         guint bus_watch_id;
         GstPad *tiler_src_pad = NULL;
         guint tiler_rows, tiler_columns;
         guint pgie_batch_size;
-
         std::vector<DataSource> m_DataList;
 
     public:
+        /**
+         * @description: 创建对象
+         * @param {*}
+         * @return {*} 智能指针
+         * @author: lishengyin
+         */        
         static std::shared_ptr<Inference> CreateNew();
         Inference();
         ~Inference();
     public:
-        
+        /**
+         * @description: 推理模块初始化
+         * @param {vector<DataSource>} DataList 数据源集合
+         * @return {*}
+         * @author: lishengyin
+         */        
         int32_t Init(std::vector<DataSource> DataList);
+        /**
+         * @description: 释放数据
+         * @param {*}
+         * @return {*}
+         * @author: lishengyin
+         */        
         void Destory();
+        /**
+         * @description: 准备任务
+         * @param {*}
+         * @return {*}
+         * @author: lishengyin
+         */        
         void ReadyTask();
+        /**
+         * @description: 启动任务
+         * @param {*}
+         * @return {*}
+         * @author: lishengyin
+         */        
         void StartTask();
+        /**
+         * @description: 暂停任务
+         * @param {*}
+         * @return {*}
+         * @author: lishengyin
+         */        
         void PauseTask();
+        /**
+         * @description: 停止任务
+         * @param {*}
+         * @return {*}
+         * @author: lishengyin
+         */        
         void StopTask();
+        /**
+         * @description: 重启任务
+         * @param {*}
+         * @return {*}
+         * @author: lishengyin
+         */        
         void RestartTask();
         
-
     private:
-        // static 
+        /**
+         * @description: 获取推理结果
+         * @param {GstPad *} pad
+         * @param {GstPadProbeInfo *} info
+         * @param {gpointer} u_data
+         * @return {*}
+         * @author: lishengyin
+         */        
         static GstPadProbeReturn tiler_src_pad_buffer_probe(GstPad * pad, GstPadProbeInfo * info, gpointer u_data);
+        /**
+         * @description: 监听bus
+         * @param {GstBus *} bus
+         * @param {GstMessage *} msg
+         * @param {gpointer} data
+         * @return {*}
+         * @author: lishengyin
+         */        
         static gboolean bus_call (GstBus * bus, GstMessage * msg, gpointer data);
+        /**
+         * @description: 解码模块监听child_added
+         * @param {*}
+         * @return {*}
+         * @author: lishengyin
+         */        
         static void decodebin_child_added (GstChildProxy * child_proxy, GObject * object,
             gchar * name, gpointer user_data);
-
+        /**
+         * @description: 创建解码bin
+         * @param {guint} index
+         * @param {gchar *} filename
+         * @return {*}
+         * @author: lishengyin
+         */        
         static GstElement * create_uridecode_bin (guint index, gchar * filename);
+        /**
+         * @description: 解码模块监听pad-added
+         * @param {GstElement *} decodebin
+         * @param {GstPad *} pad
+         * @param {gpointer} data
+         * @return {*}
+         * @author: lishengyin
+         */        
         static void cb_newpad (GstElement * decodebin, GstPad * pad, gpointer data);
-
-        // 动态管理源
+        /**
+         * @description: 添加数据源
+         * @param {int} source_Id 数据源ID
+         * @param {string} uri 数据源Url
+         * @return {*} 是否添加成功
+         * @author: lishengyin
+         */        
         gboolean add_sources (int source_Id, std::string uri);
+        /**
+         * @description: 删除数据源
+         * @param {gint} source_id
+         * @return {*}
+         * @author: lishengyin
+         */        
         void stop_release_source (gint source_id);
     };
 }

modules/inference/src/inference.cpp

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:35:37
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-10-14 15:12:36
+ * @LastEditTime: 2021-10-15 15:42:42
  */
 #include "inference.h"
 
@@ -56,11 +56,11 @@ namespace MIVA{
     std::shared_ptr<Inference> infer = NULL;
     ThreadPool pool(1,ThreadPool::PRIORITY_HIGHEST, false);
     /**
-     * @description: 创建对象 单例
+     * @description: 创建对象
      * @param {*}
-     * @return {*}
+     * @return {*} 智能指针
      * @author: lishengyin
-     */    
+     */  
     std::shared_ptr<Inference> Inference::CreateNew()
     {
         if(infer == NULL) infer = std::make_shared<Inference>();
@@ -70,22 +70,19 @@ namespace MIVA{
     {
         
     }
-  
     Inference::~Inference()
     {
         Destory();
-    }
+    } 
     /**
      * @description: 推理模块初始化
-     * @param {vector<DataSource>} DataList
-     * @return {*}
+     * @param {vector<DataSource>} DataList 数据源集合
+     * @return {*} 是否初始化成功
      * @author: lishengyin
-     */    
+     */   
     int32_t Inference::Init(vector<DataSource> DataList)
     {
         // init
-        this->loop = g_main_loop_new (NULL, FALSE);
-
         // 创建管道
         this->pipeline = gst_pipeline_new("dstest3-pipeline");
 
@@ -182,7 +179,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, this->loop);
+        this->bus_watch_id = gst_bus_add_watch (this->bus, bus_call, NULL);
         gst_object_unref (this->bus);
 
         gst_bin_add_many (GST_BIN (this->pipeline), this->queue1, this->pgie, this->queue2, this->tiler, this->queue3,
@@ -205,23 +202,22 @@ namespace MIVA{
         return OK;
     }
     /**
-     * @description: deepstream配置为准备状态
+     * @description: 准备任务
      * @param {*}
      * @return {*}
      * @author: lishengyin
-     */    
+     */  
     void Inference::ReadyTask()
     {
          InfoL << "Now ReadyTask";
          gst_element_set_state(this->pipeline, GST_STATE_READY);
-         g_main_loop_run(this->loop);
     }
     /**
      * @description: 启动任务
      * @param {*}
      * @return {*}
      * @author: lishengyin
-     */    
+     */   
     void Inference::StartTask()
     {
         static int ret = 0;
@@ -232,17 +228,16 @@ namespace MIVA{
             ret++;
             pool.async([&](){
                 gst_element_set_state(this->pipeline, GST_STATE_PLAYING);
-                g_main_loop_run(this->loop);
             });
             pool.start();
         }
     }
     /**
-     * @description: 暂停各数据源的任务
+     * @description: 暂停任务
      * @param {*}
      * @return {*}
      * @author: lishengyin
-     */
+     */  
     void Inference::PauseTask()
     {
         InfoL << "Now Pause";
@@ -254,11 +249,11 @@ namespace MIVA{
         }
     }
     /**
-     * @description: 停止个数据源的任务
+     * @description: 停止任务
      * @param {*}
      * @return {*}
      * @author: lishengyin
-     */    
+     */  
     void Inference::StopTask()
     {
         int sourceId = 0;
@@ -274,7 +269,7 @@ namespace MIVA{
         NoticeCenter::Instance().emitEvent(NOTICE_RELEASE);
     }
     /**
-     * @description: 重启各数据源任务
+     * @description: 重启任务
      * @param {*}
      * @return {*}
      * @author: lishengyin
@@ -295,20 +290,25 @@ namespace MIVA{
      * @param {*}
      * @return {*}
      * @author: lishengyin
-     */
+     */    
     void 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);
         infer = NULL;
     }
-
+    /**
+     * @description: 获取推理结果
+     * @param {GstPad *} pad 推理模块的pad
+     * @param {GstPadProbeInfo *} info 推理结果数据集
+     * @param {gpointer} u_data NULL
+     * @return {*} 
+     * @author: lishengyin
+     */   
     GstPadProbeReturn 
     Inference::tiler_src_pad_buffer_probe(GstPad * pad, GstPadProbeInfo * info, gpointer u_data)
     {
@@ -333,47 +333,24 @@ namespace MIVA{
                     num++;
                 }
             }
-            //画左上角的统计信息
-            // display_meta = nvds_acquire_display_meta_from_pool(batch_meta);
-            // NvOSD_TextParams *txt_params  = &display_meta->text_params[0];
-            // display_meta->num_labels = 1;
-            // txt_params->display_text = (char *)g_malloc0 (MAX_DISPLAY_LEN);
-
-            // snprintf(txt_params->display_text, MAX_DISPLAY_LEN, "Number of people: %d \n", num);
-
             // 推理广播
             NoticeCenter::Instance().emitEvent(NOTICE_INFER,frame_meta->source_id, num);
-
-            // txt_params->x_offset = 30;
-            // txt_params->y_offset = 30;
-
-            // /* Font , font-color and font-size */
-            // txt_params->font_params.font_name = (char *)"Serif";
-            // txt_params->font_params.font_size = 10;
-            // txt_params->font_params.font_color.red = 1.0;
-            // txt_params->font_params.font_color.green = 1.0;
-            // txt_params->font_params.font_color.blue = 1.0;
-            // txt_params->font_params.font_color.alpha = 1.0;
-
-            // /* Text background color */
-            // txt_params->set_bg_clr = 1;
-            // txt_params->text_bg_clr.red = 0.0;
-            // txt_params->text_bg_clr.green = 0.0;
-            // txt_params->text_bg_clr.blue = 0.0;
-            // txt_params->text_bg_clr.alpha = 1.0;
-
-            //nvds_add_display_meta_to_frame(frame_meta, display_meta);
         }
         return GST_PAD_PROBE_OK;
     }
-
+    /**
+     * @description: 监听bus
+     * @param {GstBus *} bus Deepstream的bus
+     * @param {GstMessage *} msg 传递到bus中的msg
+     * @param {gpointer} data NULL
+     * @return {*}
+     * @author: lishengyin
+     */   
     gboolean Inference::bus_call (GstBus * bus, GstMessage * msg, gpointer data)
     {
-        GMainLoop *loop = (GMainLoop *) data;
         switch (GST_MESSAGE_TYPE (msg)) {
             case GST_MESSAGE_EOS:
                 InfoL << "End of stream";
-                g_main_loop_quit (loop);
                 break;
             case GST_MESSAGE_WARNING:
             {
@@ -396,7 +373,6 @@ namespace MIVA{
                     ErrorL << "Error details:" << debug;
                 g_free (debug);
                 g_error_free (error);
-                g_main_loop_quit (loop);
                 break;
             }
         #ifndef PLATFORM_TEGRA
@@ -416,7 +392,12 @@ namespace MIVA{
         }
         return TRUE;
     }
-
+    /**
+     * @description: 解码模块监听child_added
+     * @param {GstChildProxy *} 参数
+     * @return {*}
+     * @author: lishengyin
+     */   
     void Inference::decodebin_child_added (GstChildProxy * child_proxy, GObject * object,
         gchar * name, gpointer user_data)
     {
@@ -437,8 +418,8 @@ namespace MIVA{
         }
     }
     /**
-     * @description: 释放数据源
-     * @param {gint} source_id
+     * @description: 删除数据源
+     * @param {gint} source_id 数据源ID
      * @return {*}
      * @author: lishengyin
      */    
@@ -485,7 +466,14 @@ namespace MIVA{
         }
         g_mutex_unlock (&eos_lock);
     }
-
+    /**
+     * @description: 解码模块监听pad-added
+     * @param {GstElement *} decodebin
+     * @param {GstPad *} pad
+     * @param {gpointer} data
+     * @return {*}
+     * @author: lishengyin
+     */   
     void Inference::cb_newpad (GstElement * decodebin, GstPad * pad, gpointer data)
     {
         GstCaps *caps = gst_pad_query_caps (pad, NULL);
@@ -498,7 +486,6 @@ namespace MIVA{
             gchar pad_name[16] = { 0 };
             GstPad *sinkpad = NULL;
             g_snprintf (pad_name, 15, "sink_%u", source_id);
-            
             sinkpad = gst_element_get_static_pad (g_streammux, pad_name);
             if(sinkpad == NULL) sinkpad = gst_element_get_request_pad (g_streammux, pad_name);
             if (gst_pad_link (pad, sinkpad) != GST_PAD_LINK_OK) {
@@ -509,14 +496,13 @@ namespace MIVA{
             gst_object_unref (sinkpad);
         }
     }
-
     /**
-     * @description: 创建数据源element
-     * @param {guint} index
-     * @param {gchar *} filename
-     * @return {*}
+     * @description: 创建解码bin
+     * @param {guint} index 数据源索引
+     * @param {gchar *} filename 数据源Url
+     * @return {GstElement *} 返回解码模块bin
      * @author: lishengyin
-     */    
+     */        
     GstElement* Inference::create_uridecode_bin (guint index, gchar * filename)
     {
         GstElement *bin = NULL;
@@ -537,12 +523,12 @@ namespace MIVA{
         return bin;
     }
     /**
-     * @description: 动态增加数据源
-     * @param {int} source_Id
-     * @param {string} uri
-     * @return {*}
+     * @description: 添加数据源
+     * @param {int} source_Id 数据源ID
+     * @param {string} uri 数据源Url
+     * @return {*} 是否添加成功
      * @author: lishengyin
-     */
+     */ 
     gboolean Inference::add_sources (int source_Id, std::string uri)
     {
         g_mutex_lock (&eos_lock);

modules/userApp/include/user_app.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:41:50
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-10-13 09:41:52
+ * @LastEditTime: 2021-10-15 15:57:17
  */
 #pragma once
 
@@ -58,14 +58,60 @@ namespace MIVA
     class UserApp
     {
     public:
+        /**
+         * @description: 创建对象
+         * @param {*}
+         * @return {std::shared_ptr<UserApp>} 智能指针
+         * @author: lishengyin
+         */    
         static std::shared_ptr<UserApp> CreateNew();
         UserApp();
         ~UserApp();
+        /**
+         * @description: 模块初始化
+         * @param {string} appName 应用名
+         * @return {int} 是否成功
+         * @author: lishengyin
+         */        
         int32_t Init(std::string appName);
+        /**
+         * @description: 释放数据
+         * @param {*}
+         * @return {*}
+         * @author: lishengyin
+         */        
         void Destroy();
+        /**
+         * @description: 启动任务
+         * @param {*}
+         * @return {*}
+         * @author: lishengyin
+         */        
         void StartTask();
+        /**
+         * @description: 赋值struct sockaddr
+         * @param {sockaddr} *out
+         * @param {char} *ip
+         * @param {uint16_t} port
+         * @return {*}
+         * @author: lishengyin
+         */        
         static void makeAddr(struct sockaddr *out,const char *ip,uint16_t port);
+        /**
+         * @description: 最终的结果运算
+         * @param {uint32_t} noLoad 空载车厢载荷
+         * @param {uint32_t} dynamicLoad 动态车厢载荷
+         * @param {int} num 推理结果
+         * @return {uint32_t} 运算结构
+         * @author: lishengyin
+         */        
         static uint32_t DataCalculation(uint32_t noLoad, uint32_t dynamicLoad, int num);
+        /**
+         * @description: 拥挤成都判定
+         * @param {int} num 识别结果
+         * @return {uint8_t} 拥挤程度 1-4
+         * @author: lishengyin
+         */        
         static uint8_t GradeDetermination(int num);
     private:
         IniFile m_ini;
@@ -103,13 +149,63 @@ namespace MIVA
         Timer::Ptr m_timer2;
         
     private:
+        /**
+         * @description: 监听推理模块广播
+         * @param {int} Source_id 数据源ID
+         * @param {int} num 推理结果
+         * @return {*}
+         * @author: lishengyin
+         */        
         void ListenInfer(int Source_id, int num);
+        /**
+         * @description: 监听Netty下发的数据
+         * @param {Ptr} &pBuf 接受到的数据
+         * @return {*}
+         * @author: lishengyin
+         */        
         void ListenNettyData(const Buffer::Ptr &pBuf);
+        /**
+         * @description: 监听PIS系统的数据
+         * @param {Ptr} &buf 接受到的数据
+         * @param {sockaddr} *addr socker信息
+         * @return {*}
+         * @author: lishengyin
+         */        
         void ListenPISData(const Buffer::Ptr &buf, struct sockaddr *addr);
+        /**
+         * @description: 监听车厢关门广播
+         * @param {*}
+         * @return {*}
+         * @author: lishengyin
+         */        
         void ListenClosed();
+        /**
+         * @description: 监听重启识别广播
+         * @param {*}
+         * @return {*}
+         * @author: lishengyin
+         */        
         void ListenRelease();
+        /**
+         * @description: 监听推理数据广播
+         * @param {*}
+         * @return {*}
+         * @author: lishengyin
+         */        
         void ListenInferData();
+        /**
+         * @description: 连接Netty
+         * @param {*}
+         * @return {*}
+         * @author: lishengyin
+         */        
         void ConnectNetty();
+        /**
+         * @description: 上报数据
+         * @param {*}
+         * @return {*}
+         * @author: lishengyin
+         */        
         void ReportData();
     };
 }

modules/userApp/src/user_app.cpp

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:35:42
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-10-14 08:45:43
+ * @LastEditTime: 2021-10-15 15:56:39
  */
 #include "user_app.h"
 
@@ -166,7 +166,12 @@ namespace MIVA
     void UserApp::Destroy()
     {
         InfoL << "System exited successfully!";
-        this->m_Infer->Destory();
+        this->m_timer0 = NULL;
+        this->m_timer1 = NULL;
+        this->m_timer2 = NULL;
+        this->m_udpClient = NULL;
+        this->m_Infer = NULL;
+        this->m_tcpClient = NULL; 
     }
     /**
      * @description: 启动任务
@@ -452,13 +457,12 @@ namespace MIVA
         getDataTime(ctime);
         sqlInstall << ctime << (time2.tv_sec - time1.tv_sec) *1000 + (time2.tv_nsec - time1.tv_nsec)/1000000 << sqlRet;
     }
-
     /**
      * @description: 数据综合计算
-     * @param {uint32_t} noLoad
-     * @param {uint32_t} dynamicLoad
-     * @param {int} num
-     * @return {*}
+     * @param {uint32_t} noLoad 空载车厢载荷
+     * @param {uint32_t} dynamicLoad 动态车厢载荷
+     * @param {int} num 推理结果
+     * @return {uint32_t} 运算结果
      * @author: lishengyin
      */    
     uint32_t UserApp::DataCalculation(uint32_t noLoad, uint32_t dynamicLoad, int num)
@@ -470,8 +474,8 @@ namespace MIVA
     }
     /**
      * @description: 拥挤程度判定
-     * @param {int} num
-     * @return {*}
+     * @param {int} num 最终结果
+     * @return {uint8_t} 拥挤程度
      * @author: lishengyin
      */    
     uint8_t UserApp::GradeDetermination(int num)

source/src/main.cpp

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:35:48
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-10-13 15:05:32
+ * @LastEditTime: 2021-10-15 15:06:27
  */
 #include <iostream>
 #include "user_app.h"
@@ -41,6 +41,6 @@ int main(int argc, char *argv[])
 
   sem.wait();
   app->Destroy();
-
+  
   return 0;
 }