代码优化

Hu Chunming
1 parent 5accab74
Showing 9 changed files with 49 additions and 28 deletions
src/ai_engine_module/HumanFeature.h
src/ai_engine_module/HumanParsing.h
src/ai_engine_module/VPDProcess.h
src/ai_engine_module/VPTProcess.h
src/ai_engine_module/VehicleColor.h
src/ai_engine_module/VehiclePlate.h
src/ai_platform/FeatureAnalysis.cpp
src/ai_platform/header.h
src/ai_platform/mvpt.cpp
+#ifndef __AI_ENGINE_MODULE_HUMAN_FEATURE__
+#define __AI_ENGINE_MODULE_HUMAN_FEATURE__
+
 #include "acl/acl.h"
 #include "acl/ops/acl_dvpp.h"
@@ -8,7 +11,7 @@
 using namespace std;
 struct HFResult{
-    float feature[HUMANREID_FEATURESIZE];
+    float feature[HUMANREID_FEATURE_SIZE];
 };
 class HumanFeature
@@ -27,4 +30,6 @@ private:
     int m_devId; 
     aclrtContext m_algorthim_ctx;
     void* m_handle{nullptr};
-};
 \ No newline at end of file
+};
+
+#endif      // __AI_ENGINE_MODULE_HUMAN_FEATURE__
 \ No newline at end of file
+#ifndef __AI_ENGINE_MODULE_HUMAN_PARSING__
+#define __AI_ENGINE_MODULE_HUMAN_PARSING__
+
 #include <vector>
 #include "acl/acl.h"
 #include "acl/ops/acl_dvpp.h"
@@ -24,4 +27,6 @@ private:
     int m_devId; 
     aclrtContext m_algorthim_ctx;
     void* m_handle{nullptr};
-};
 \ No newline at end of file
+};
+
+#endif
 \ No newline at end of file
+#ifndef __AI_ENGINE_MODULE_VPD__
+#define __AI_ENGINE_MODULE_VPD__
+
 #include "acl/acl.h"
 #include "acl/ops/acl_dvpp.h"
@@ -30,4 +33,6 @@ private:
     int m_devId; 
     aclrtContext m_algorthim_ctx;
     void* m_handle{nullptr};
-};
 \ No newline at end of file
+};
+
+#endif      // __AI_ENGINE_MODULE_VPD__
 \ No newline at end of file
@@ -4,7 +4,9 @@
 * UpdateDate: 20170705
 * Content: 人车物监测跟踪
 ********************************************************************************************/
-#pragma once
+#ifndef __AI_ENGINE_MODULE_VPT__
+#define __AI_ENGINE_MODULE_VPT__
+
 #include <iostream>
 #include <vector>
 #include <string>
@@ -82,3 +84,6 @@ private:
 	int m_max_batchsize;
 	map<string, TaskTracker> taskTrackers;
 };
+
+
+#endif      // __AI_ENGINE_MODULE_VPT__
 \ No newline at end of file
+#ifndef __AI_ENGINE_MODULE_VEHICLE_COLOR__
+#define __AI_ENGINE_MODULE_VEHICLE_COLOR__
+
 #include "acl/acl.h"
 #include "acl/ops/acl_dvpp.h"
@@ -28,4 +31,6 @@ private:
     int m_devId; 
     aclrtContext m_algorthim_ctx;
     void* m_handle{nullptr};
-};
 \ No newline at end of file
+};
+
+#endif      // __AI_ENGINE_MODULE_VEHICLE_COLOR__
 \ No newline at end of file
+#ifndef __AI_ENGINE_MODULE_VEHICLE_PLATE__
+#define __AI_ENGINE_MODULE_VEHICLE_PLATE__
+
 #include "acl/acl.h"
 #include "acl/ops/acl_dvpp.h"
@@ -25,4 +28,6 @@ private:
     int m_devId; 
     aclrtContext m_algorthim_ctx;
     void* m_handle{nullptr};
-};
 \ No newline at end of file
+};
+
+#endif      // __AI_ENGINE_MODULE_VEHICLE_PLATE__
 \ No newline at end of file
@@ -88,7 +88,7 @@ void FeatureAnalysis::update_human_info(ObjectInfo&amp; res_obj, vpc_img_info&amp; img_i
         if (vec_hf_res.size() > 0)
         {
             HFResult hf_res = vec_hf_res[0];
-            memcpy(res_obj.hp_feature, hf_res.feature, sizeof(float) * HUMANREID_FEATURESIZE);
+            memcpy(res_obj.hp_feature, hf_res.feature, sizeof(float) * HUMANREID_FEATURE_SIZE);
         }
     }
-#pragma once
+#ifndef __AI_PLATFORM_HEADER__
+#define __AI_PLATFORM_HEADER__
 #ifdef _MSC_VER
 #include <windows.h>
@@ -13,11 +14,11 @@
 #include <vector>
 #include <string>
-#include "../ai_engine_module/humanreid.h"
-#include "../ai_engine_module/human_parsing.h"
-#define VEHICLE_FEA_SIZE  128
+#define HUMANREID_FEATURE_SIZE 384
+#define HP_ATTRI_SIZE 16
+
 #define PLATENUM 8                        //车牌号码位数
 #define MAX_PALTE_COUNT 10              //每张图片中最多检测出10个车牌
@@ -35,8 +36,6 @@ using namespace std;
 //返回的检测物体结果信息
-#ifndef __VIDEO_OBJECT_INFO__
-#define __VIDEO_OBJECT_INFO__
 typedef struct video_object_info {
     char task_id[128];              //该物体属于的任务ID号
     int task_frame_count;     //该物体当前出现的帧号
@@ -48,7 +47,6 @@ typedef struct video_object_info {
     int index;                //该物体所属类别的编号
     double confidence;        //该物体的置信度
 } video_object_info;
-#endif
@@ -106,8 +104,8 @@ typedef struct ObjectData {
     string ori_pic_path;
     string obj_pic_path;
-    hp_cls_info hp_cls[HP_ATTRI_INDEX_SIZE]; 
-    float hp_feature[HUMANREID_FEATURESIZE];
+    hp_cls_info hp_cls[HP_ATTRI_SIZE]; 
+    float hp_feature[HUMANREID_FEATURE_SIZE];
     int vehicle_color_index;
     float vehicle_color_prob;
@@ -118,9 +116,6 @@ typedef struct ObjectData {
 // TASK初始化参数
-#ifndef __TASK_PARAM__
-#define __TASK_PARAM__
-
 typedef struct task_param {
     string ipc_url;                      //rtsp流地址
     string task_id;                      //外部传入任务id
@@ -129,10 +124,8 @@ typedef struct task_param {
     string result_folder_little;         //目标快照抠图保存地址
 	string result_folder;                //目标快照大图保存地址
 } task_param;
-#endif
-#ifndef __AI_LOG_LEVEL__
-#define __AI_LOG_LEVEL__
+
 enum ai_log_level {
     AI_LOG_LEVEL_CLOSE = -1,  // 关闭日志
     AI_LOG_LEVEL_TRACE = 0,   // 跟踪变量
@@ -141,12 +134,9 @@ enum ai_log_level {
     AI_LOG_LEVEL_WARNING = 3,     // 警告日志通知，模块一切正常（如：重要流程通知）
     AI_LOG_LEVEL_ERROR = 4,       // 重要日志，如结果和严重错误
 };
-#endif
 //VPT初始化参数
-#ifndef __TSL_AIPLATFORM_PARAM__
-#define __TSL_AIPLATFORM_PARAM__
 typedef struct tsl_aiplatform_param {
     int gpuid;                                                     //指定显卡id
     string models_dir;              // 模型文件目录
@@ -156,4 +146,5 @@ typedef struct tsl_aiplatform_param {
     int log_days;               //日志保存周期
     double log_mem;                //每个日志最大大小
 } tsl_aiplatform_param;
-#endif
 \ No newline at end of file
+
+#endif      // __AI_PLATFORM_HEADER__
 \ No newline at end of file
@@ -22,7 +22,7 @@
 // #define VEHICLE_MULTI_BOXES
-#define AUTHORIZATION
+// #define AUTHORIZATION
 #define productSN "51C4B28135604F649671727185949A91" //linux 通途抓拍引擎产品序列号
 using namespace std;