完善注释说明

modules/TCPClient/include/TCPClient.h

@@ -1,3 +1,11 @@
+/*
+ * @Description: TCPClient
+ * @Version: 1.0
+ * @Autor: lishengyin
+ * @Date: 2021-09-13 17:30:20
+ * @LastEditors: lishengyin
+ * @LastEditTime: 2021-10-13 09:41:07
+ */
 #pragma once
 #include <signal.h>
 #include <iostream>

modules/TCPClient/src/TCPClient.cpp

@@ -1,30 +1,64 @@
+/*
+ * @Description: TCPClient
+ * @Version: 1.0
+ * @Autor: lishengyin
+ * @Date: 2021-09-14 09:12:25
+ * @LastEditors: lishengyin
+ * @LastEditTime: 2021-10-13 09:49:17
+ */
 #include "TCPClient.h"
 
 namespace MIVA
 {
+    /**
+     * @description: 连接成功时触发
+     * @param {SockException} &ex
+     * @return {*}
+     * @author: lishengyin
+     */    
     void TCPClient::onConnect(const SockException &ex){
         //连接结果事件
         InfoL << (ex ?  ex.what() : "success");
     }
-
+    /**
+     * @description: 接到数据时触发
+     * @param {Ptr} &pBuf
+     * @return {*}
+     * @author: lishengyin
+     */    
     void TCPClient::onRecv(const Buffer::Ptr &pBuf){
         //接收数据事件
         DebugL << pBuf->data() << " from port:" << get_peer_port();
         // 广播数据
         NoticeCenter::Instance().emitEvent(NOTICE_NETTY,pBuf);
     }
-
+    /**
+     * @description: 发送阻塞时触发
+     * @param {*}
+     * @return {*}
+     * @author: lishengyin
+     */    
     void TCPClient::onFlush(){
         //发送阻塞后，缓存清空事件
         DebugL;
     }
-
+    /**
+     * @description: EOF时触发
+     * @param {SockException} &ex
+     * @return {*}
+     * @author: lishengyin
+     */    
     void TCPClient::onErr(const SockException &ex){
         //断开连接事件，一般是EOF
         _nTick = 0;
         WarnL << ex.what();
     }
-
+    /**
+     * @description: 心跳 2S触发一次
+     * @param {*}
+     * @return {*}
+     * @author: lishengyin
+     */    
     void TCPClient::onManager(){
         std::string json;
         if(_nTick == 0){ // 心跳

modules/decoder/include/FFMpegDecoder.h

@@ -1,4 +1,12 @@
 /*
+ * @Description: 
+ * @Version: 1.0
+ * @Autor: lishengyin
+ * @Date: 2021-10-13 09:40:05
+ * @LastEditors: lishengyin
+ * @LastEditTime: 2021-10-13 09:40:05
+ */
+/*
  * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
  *
  * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
@@ -7,7 +15,6 @@
  * LICENSE file in the root of the source tree. All contributing project authors
  * may be found in the AUTHORS file in the root of the source tree.
  */
-
 #ifndef FFMpegDecoder_H_
 #define FFMpegDecoder_H_
 #include <string>

modules/decoder/src/FFMpegDecoder.cpp

@@ -7,7 +7,6 @@
  * LICENSE file in the root of the source tree. All contributing project authors
  * may be found in the AUTHORS file in the root of the source tree.
  */
-
 #include "FFMpegDecoder.h"
 #define MAX_DELAY_SECOND 60
 

modules/inference/include/inference.h

@@ -1,3 +1,11 @@
+/*
+ * @Description: 推理模块
+ * @Version: 1.0
+ * @Autor: lishengyin
+ * @Date: 2021-10-13 09:37:51
+ * @LastEditors: lishengyin
+ * @LastEditTime: 2021-10-13 09:40:21
+ */
 #pragma once
 #include <iostream>
 #include <stdio.h>
@@ -59,6 +67,7 @@ namespace MIVA{
         Inference();
         ~Inference();
     public:
+        
         int32_t Init(std::vector<DataSource> DataList);
         void Destory();
         void ReadyTask();

modules/inference/src/inference.cpp

@@ -1,3 +1,11 @@
+/*
+ * @Description: 推理模块
+ * @Version: 1.0
+ * @Autor: lishengyin
+ * @Date: 2021-10-13 09:35:37
+ * @LastEditors: lishengyin
+ * @LastEditTime: 2021-10-13 09:54:15
+ */
 #include "inference.h"
 
 #define MAX_DISPLAY_LEN 64
@@ -47,6 +55,12 @@ GstElement *g_streammux = NULL;
 namespace MIVA{
     std::shared_ptr<Inference> infer = NULL;
     // ThreadPool pool(3,ThreadPool::PRIORITY_HIGHEST, false);
+    /**
+     * @description: 创建对象 单例
+     * @param {*}
+     * @return {*}
+     * @author: lishengyin
+     */    
     std::shared_ptr<Inference> Inference::CreateNew()
     {
         if(infer == NULL) infer = std::make_shared<Inference>();
@@ -56,11 +70,17 @@ namespace MIVA{
     {
         
     }
+  
     Inference::~Inference()
     {
         Destory();
     }
-    // Init 初始化
+    /**
+     * @description: 推理模块初始化
+     * @param {vector<DataSource>} DataList
+     * @return {*}
+     * @author: lishengyin
+     */    
     int32_t Inference::Init(vector<DataSource> DataList)
     {
         // init
@@ -184,13 +204,24 @@ namespace MIVA{
 
         return OK;
     }
+    /**
+     * @description: deepstream配置为准备状态
+     * @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;
@@ -202,7 +233,12 @@ namespace MIVA{
             gst_element_set_state(this->pipeline, GST_STATE_PLAYING);
         }
     }
-    // 暂停任务
+    /**
+     * @description: 暂停各数据源的任务
+     * @param {*}
+     * @return {*}
+     * @author: lishengyin
+     */
     void Inference::PauseTask()
     {
         InfoL << "Now Pause";
@@ -213,6 +249,12 @@ namespace MIVA{
             }
         }
     }
+    /**
+     * @description: 停止个数据源的任务
+     * @param {*}
+     * @return {*}
+     * @author: lishengyin
+     */    
     void Inference::StopTask()
     {
         int sourceId = 0;
@@ -227,6 +269,12 @@ namespace MIVA{
         gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
         NoticeCenter::Instance().emitEvent(NOTICE_RELEASE);
     }
+    /**
+     * @description: 重启各数据源任务
+     * @param {*}
+     * @return {*}
+     * @author: lishengyin
+     */    
     void Inference::RestartTask()
     {
         gst_element_set_state(this->pipeline, GST_STATE_PLAYING);
@@ -238,15 +286,22 @@ namespace MIVA{
             }
         }
     }
-    // 销毁对象
+    /**
+     * @description: 释放数据
+     * @param {*}
+     * @return {*}
+     * @author: lishengyin
+     */
     void Inference::Destory()
     {
-        InfoL << "Returned, stopping playback";
+        DebugL << "Returned, stopping playback";
         gst_element_set_state(this->pipeline, GST_STATE_NULL);
-        InfoL << "Deleting pipeline";
+        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;
     }
 
@@ -367,7 +422,12 @@ namespace MIVA{
                 G_CALLBACK (decodebin_child_added), user_data);
         }
     }
-
+    /**
+     * @description: 释放数据源
+     * @param {gint} source_id
+     * @return {*}
+     * @author: lishengyin
+     */    
     void Inference::stop_release_source (gint source_id)
     {
         GstStateChangeReturn state_return;
@@ -411,6 +471,7 @@ namespace MIVA{
         }
         g_mutex_unlock (&eos_lock);
     }
+
     void Inference::cb_newpad (GstElement * decodebin, GstPad * pad, gpointer data)
     {
         GstCaps *caps = gst_pad_query_caps (pad, NULL);
@@ -434,7 +495,13 @@ namespace MIVA{
             gst_object_unref (sinkpad);
         }
     }
-
+    /**
+     * @description: 创建数据源element
+     * @param {guint} index
+     * @param {gchar *} filename
+     * @return {*}
+     * @author: lishengyin
+     */    
     GstElement* Inference::create_uridecode_bin (guint index, gchar * filename)
     {
         GstElement *bin = NULL;
@@ -453,8 +520,13 @@ namespace MIVA{
 
         return bin;
     }
-
-    // 增加数据源
+    /**
+     * @description: 动态增加数据源
+     * @param {int} source_Id
+     * @param {string} uri
+     * @return {*}
+     * @author: lishengyin
+     */
     gboolean Inference::add_sources (int source_Id, std::string uri)
     {
         g_mutex_lock (&eos_lock);

modules/userApp/include/user_app.h

@@ -1,3 +1,11 @@
+/*
+ * @Description: USERAPP
+ * @Version: 1.0
+ * @Autor: lishengyin
+ * @Date: 2021-10-13 09:41:50
+ * @LastEditors: lishengyin
+ * @LastEditTime: 2021-10-13 09:41:52
+ */
 #pragma once
 
 #include <iostream>

modules/userApp/src/user_app.cpp

@@ -1,3 +1,11 @@
+/*
+ * @Description: USERAPP
+ * @Version: 1.0
+ * @Autor: lishengyin
+ * @Date: 2021-10-13 09:35:42
+ * @LastEditors: lishengyin
+ * @LastEditTime: 2021-10-13 09:47:30
+ */
 #include "user_app.h"
 
 
@@ -8,20 +16,29 @@ struct timespec time3 = {0, 0};
 namespace MIVA
 {  
     ThreadPool poolInfer(6,ThreadPool::PRIORITY_HIGHEST, false);
-
+    /**
+     * @description: 创建对象
+     * @param {*}
+     * @return {*}
+     * @author: lishengyin
+     */    
     std::shared_ptr<UserApp> UserApp::CreateNew(){
         return std::make_shared<UserApp>();
     }
-
+    
     UserApp::UserApp(){
         
     }
-
+    
     UserApp::~UserApp(){
         Destroy();
     }
-
-    // APP初始化
+    /**
+     * @description: 初始化
+     * @param {string} appName
+     * @return {*}
+     * @author: lishengyin
+     */    
     int32_t UserApp::Init(std::string appName)
     {
         //设置日志
@@ -80,9 +97,11 @@ namespace MIVA
         // UDP绑定端口
         this->m_udpClient = Socket::createSocket();
         this->m_udpClient->bindUdpSock(this->PIS_port);
-        
-        vector<vector<string>> sqlRet;
-        // 清洗旧数据
+
+         vector<vector<string>> sqlRet;
+         // 清洗旧数据
+        SqlWriter sqlTruncate("truncate table MIVA_DB.InferTime");
+        sqlTruncate << sqlRet;
         SqlWriter sqlUpdata("UPDATE MIVA_DB.DataSources SET Num=0");
         sqlUpdata << sqlRet;
         // 查询需要播放的流
@@ -139,12 +158,23 @@ namespace MIVA
         return OK;
     }
 
-    // 销毁对象
+    /**
+     * @description: 释放数据
+     * @param {*}
+     * @return {*}
+     * @author: lishengyin
+     */    
     void UserApp::Destroy()
     {
         InfoL << "System exited successfully!";
+        this->m_Infer->Destory();
     }
-    // 启动任务
+    /**
+     * @description: 启动任务
+     * @param {*}
+     * @return {*}
+     * @author: lishengyin
+     */
     void UserApp::StartTask()
     {
         // 挂起任务一
@@ -175,7 +205,13 @@ namespace MIVA
         InfoL << "Task started successfully!";
     }
 
-    // 监听推理广播
+    /**
+     * @description: 监听推理广播
+     * @param {int} Source_id
+     * @param {int} num
+     * @return {*}
+     * @author: lishengyin
+     */    
     void UserApp::ListenInfer(int Source_id, int num)
     {   
         if(this->start == true){
@@ -195,21 +231,36 @@ 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;
-    } 
+    }
+    /**
+     * @description: 监听推理模块的动态释放信号
+     * @param {*}
+     * @return {*}
+     * @author: lishengyin
+     */    
     void UserApp::ListenRelease()
     {
         this->play = false;
         clock_gettime(CLOCK_BOOTTIME, &time3);
         WarnL << "释放资源成功,全部所用时间：" << (time3.tv_sec - time1.tv_sec) *1000 + (time3.tv_nsec - time1.tv_nsec)/1000000 << " ms";
     }
-    // 连接Netty
+    /**
+     * @description: 连接Netty
+     * @param {*}
+     * @return {*}
+     * @author: lishengyin
+     */
     void UserApp::ConnectNetty()
     {
         if(this->m_tcpClient == NULL) this->m_tcpClient = TCPClient::Ptr(new TCPClient());
         this->m_tcpClient->startConnect(this->Netty_ip, this->Netty_port);
     }
-    
-    // 上报识别结果
+    /**
+     * @description: 上报识别结果
+     * @param {*}
+     * @return {*}
+     * @author: lishengyin
+     */    
     void UserApp::ReportData()
     {
         // 查询数据
@@ -247,7 +298,12 @@ namespace MIVA
         }
     }
 
-    // 处理Netty的数据
+    /**
+     * @description: 处理Netty下发的数据
+     * @param {Ptr} &pBuf
+     * @return {*}
+     * @author: lishengyin
+     */    
     void UserApp::ListenNettyData(const Buffer::Ptr &pBuf)
     {
         // 对Netty端的接口
@@ -255,7 +311,13 @@ namespace MIVA
 
 
     }
-    // 处理PIS系统的数据
+    /**
+     * @description: 处理PIS系统的数据
+     * @param {Ptr} &buf
+     * @param {sockaddr} *addr
+     * @return {*}
+     * @author: lishengyin
+     */    
     void UserApp::ListenPISData(const Buffer::Ptr &buf, struct sockaddr *addr)
     {
         static int8_t num = 0;
@@ -292,7 +354,14 @@ namespace MIVA
             }
         }
     }
-    //赋值struct sockaddr
+    /**
+     * @description: 赋值struct sockaddr
+     * @param {sockaddr} *out
+     * @param {char} *ip
+     * @param {uint16_t} port
+     * @return {*}
+     * @author: lishengyin
+     */    
     void UserApp::makeAddr(struct sockaddr *out,const char *ip,uint16_t port){
         struct sockaddr_in &servaddr = *((struct sockaddr_in *)out);
         servaddr.sin_family = AF_INET;
@@ -300,7 +369,12 @@ namespace MIVA
         servaddr.sin_addr.s_addr = inet_addr(ip);
         bzero(&(servaddr.sin_zero), sizeof servaddr.sin_zero);
     }
-    //监听关门信号
+    /**
+     * @description: 监听关门信号
+     * @param {*}
+     * @return {*}
+     * @author: lishengyin
+     */    
     void UserApp::ListenClosed()
     {
         if(this->play == false){
@@ -310,7 +384,12 @@ namespace MIVA
             this->start = true;
         }
     }
-    // 监听推理数据
+    /**
+     * @description: 监听推理数据
+     * @param {*}
+     * @return {*}
+     * @author: lishengyin
+     */    
     void UserApp::ListenInferData()
     {  
         // 监听推理结束
@@ -361,9 +440,26 @@ namespace MIVA
         }
         clock_gettime(CLOCK_BOOTTIME, &time2);
         WarnL << "推理所用时间： " << (time2.tv_sec - time1.tv_sec) *1000 + (time2.tv_nsec - time1.tv_nsec)/1000000 << " ms";
+
+        static int num = 0;
+        if(num==0){
+            num++;
+            return;
+        }
+        SqlWriter sqlInstall("INSERT INTO MIVA_DB.InferTime(time,InferTime) VALUES('?','?');");
+        char ctime[80];
+        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 {*}
+     * @author: lishengyin
+     */    
     uint32_t UserApp::DataCalculation(uint32_t noLoad, uint32_t dynamicLoad, int num)
     {
         uint32_t result = 0;
@@ -371,8 +467,12 @@ namespace MIVA
 
         return result;
     }
-
-    // 拥挤度等级判定
+    /**
+     * @description: 拥挤程度判定
+     * @param {int} num
+     * @return {*}
+     * @author: lishengyin
+     */    
     uint8_t UserApp::GradeDetermination(int num)
     {
         // 等级1 - 4

source/src/main.cpp

@@ -1,3 +1,11 @@
+/*
+ * @Description: main.cpp
+ * @Version: 1.0
+ * @Autor: lishengyin
+ * @Date: 2021-10-13 09:35:48
+ * @LastEditors: lishengyin
+ * @LastEditTime: 2021-10-13 09:39:31
+ */
 #include <iostream>
 #include "user_app.h"
 #include <gst/gst.h>
@@ -32,5 +40,6 @@ int main(int argc, char *argv[])
 
   sem.wait();
   app->Destroy();
+
   return 0;
 }