违法载人判断的优化

Hu Chunming
1 parent bb2c60a8
Showing 5 changed files with 48 additions and 39 deletions
src/PicAnalysis.cpp
src/ai_engine_module/VehicleAnalysis.cpp
src/ai_engine_module/VehicleHeadTail.h
src/common/sy_errorinfo.h
src/village_inc.h
@@ -36,14 +36,14 @@ int PicAnalysis::init(VillageParam param) {
         return -1;
     }
-    // head_tail_param ht_param;
-    // ht_param.devId = dev_id;
-    // ht_param.max_batch = 16;
-    // ht_param.sdk_path = param.sdk_path;
-    // ret = m_head_tail_algorithm.init(ht_param);
-    // if(0 != ret){
-    //     return -1;
-    // }
+    head_tail_param ht_param;
+    ht_param.devId = dev_id;
+    ht_param.max_batch = 16;
+    ht_param.sdk_root = param.sdk_path;
+    ret = m_head_tail_algorithm.init(ht_param);
+    if(0 != ret){
+        return -1;
+    }
     ret = m_clothes_algorithm.init(dev_id, param.sdk_path);
     if(0 != ret){
@@ -157,6 +157,7 @@ vector&lt;AnalysisResult&gt; PicAnalysis::va_result2AnalysisResult(va_result* result, 
             info.type                       = result_info.type                      ;         
             info.vpt_type                   = result_info.vpt_type                  ;
+
             auto pendant_result = result_info.vehicle_pendant_det_res;
             for (size_t j = 0; j < pendant_result.count; j++)
             {
@@ -243,7 +244,7 @@ vector&lt;AnalysisResult&gt; PicAnalysis::analysis_img(vector&lt;sy_img&gt; vec_img){
             }
             // 行人
-            if (6 == shot_type)
+            if (0 == result_info.vpt_type)
             {
                 ImageData* human_data = m_crop_util.crop(src, vehicle_rect.left_, vehicle_rect.top_, vehicle_rect.left_ + vehicle_rect.width_, vehicle_rect.top_ + vehicle_rect.height_);
@@ -262,20 +263,39 @@ vector&lt;AnalysisResult&gt; PicAnalysis::analysis_img(vector&lt;sy_img&gt; vec_img){
                 delete human_data;
                 human_data = nullptr;
-            } else if(1 == shot_type) {
-                // 车尾，判断是否 货车尾部货厢载人
-                if(result_info.vpt_type == 6 || result_info.vpt_type == 7){
-                    if(result_info.manned_res.hs_count > 0){
-                        result_info.truck_manned = 1;
-                    }	
-                }
+            } else if(result_info.vpt_type == 1 || result_info.vpt_type == 2 || result_info.vpt_type == 3){
+                if(result_info.manned_res.hs_count >= 3){
+                    // 摩托车、三轮车载人
+                    result_info.motor_manned = 1;
+                }	
             } else {
-                if(result_info.vpt_type == 1 || result_info.vpt_type == 2 || result_info.vpt_type == 3){
-                    if(result_info.manned_res.hs_count >= 3){
-                        // 摩托车、三轮车载人
-                        result_info.motor_manned = 1;
-                    }	
+                ImageData* vehicle_data = m_crop_util.crop(src, vehicle_rect.left_, vehicle_rect.top_, vehicle_rect.left_ + vehicle_rect.width_, vehicle_rect.top_ + vehicle_rect.height_);
+
+                sy_img img;
+                img.w_ = vehicle_data->alignWidth;
+                img.h_ = vehicle_data->alignHeight;
+                img.data_ = vehicle_data->data_naked;
+
+                vector<sy_img> vec_vehicle_img;
+                vec_vehicle_img.push_back(img);
+
+                vector<HeadTailResult> head_tail_result;
+                ret = m_head_tail_algorithm.detect(vec_vehicle_img, head_tail_result);
+                if (0 != ret) {
+                    LOG_ERROR("m_head_tail_algorithm failed!");
+                    head_tail_result.clear();
+                } else {
+                    auto one_ht_result = head_tail_result[0];
+
+                    if(result_info.vpt_type == 6 || result_info.vpt_type == 7){
+                        if (one_ht_result.cls == 0 && result_info.manned_res.hs_count > 0)
+                        { // 车尾，判断是否 货车尾部货厢载人
+                            result_info.truck_manned = 1;
+                        }	
+                    } 
                 }
+
+                
             }
             // 司乘
@@ -318,10 +338,6 @@ vector&lt;AnalysisResult&gt; PicAnalysis::analysis_img(vector&lt;sy_img&gt; vec_img){
             // 摩托车
             if(shot_type==2)//摩托车
             {
-                //摩托车驾驶人是否戴安全帽
-                // analysis_result.motor_helmeted = result_info.mta_res.motor_driver_helmeted.status;
-                // float score=result_info.mta_res.motor_driver_helmeted.confidence;
-
                 ImageData* motor_data = m_crop_util.crop(src, vehicle_rect.left_, vehicle_rect.top_, vehicle_rect.left_ + vehicle_rect.width_, vehicle_rect.top_ + vehicle_rect.height_);
                 sy_img img;
@@ -378,13 +394,6 @@ vector&lt;AnalysisResult&gt; PicAnalysis::analysis_img(vector&lt;sy_img&gt; vec_img){
         }
     }
-    // vector<HeadTailResult> head_tail_result;
-    // ret = m_head_tail_algorithm.detect(vec_img, head_tail_result);
-    // if (0 != ret) {
-    //     LOG_ERROR("m_head_tail_algorithm failed!");
-    //     head_tail_result.clear();
-    // }
-
     LOG_INFO("analysis finished!");
     return vec_result;
@@ -19,8 +19,8 @@ int VehicleAnalysis::init(int devId, std::string sdk_root, int max_batch_size) {
     param.vehicle_motor_tricycle_analysis_config= SY_CONFIG_OPEN;  //8.摩托车分析	
     param.vehicle_manned_config= SY_CONFIG_OPEN;  //8.开启载人分析	
     param.vehicle_illegal_config= SY_CONFIG_OPEN;  //7.开启车违规
-	param.vehicle_color_config= SY_CONFIG_CLOSE;  //3.开启车颜色识别
-	param.vehicle_feature_config= SY_CONFIG_CLOSE;  //8.开启车辆特征提取
+	param.vehicle_color_config= SY_CONFIG_OPEN;  //3.开启车颜色识别
+	param.vehicle_feature_config= SY_CONFIG_OPEN;  //8.开启车辆特征提取
 	param.gpuid=devId;
@@ -19,7 +19,7 @@ typedef struct head_tail_param
 } head_tail_param;
 struct HeadTailResult {
-    int cls;
+    int cls;        // {'车尾': 0, '车侧': 1, '车头': 2}
     float confidence;
 };
@@ -4,8 +4,8 @@
 //--------------------------------通用------------------------------------//
-#define SY_SUCCESS                        0         //成功
 #define SY_FAILED                         -1                    //失败
+#define SY_SUCCESS                        0         //成功
 //1.通用错误                           预留编号：（-199） - （-100）
 #define SY_PARAMS_NULL_ERROR              -100                  //参数为空
@@ -28,10 +28,10 @@ struct VillageParam {
 typedef struct pendant_info
 {
 	sy_rect rect;
-	int index;		                     //���� 0-driver 1-face 2-belt 3-sunshield 4-tag 5-decoration 6-napkinbox 7-zhuanjt 8-callPhone 9-sunRoof 10-holder 11-smoke
-	float confidence;	 
+	int index{-1};		                     //���� 0-driver 1-face 2-belt 3-sunshield 4-tag 5-decoration 6-napkinbox 7-zhuanjt 8-callPhone 9-sunRoof 10-holder 11-smoke
+	float confidence{0.0};	 
     int driver_copilot_info;               
-	int iColor;     // "棕", "橙", "灰", "白", "粉", "紫", "红", "绿", "蓝", "银", "青", "黄", "黑", ,"多色", "其他"
+	int iColor{14};     // "棕", "橙", "灰", "白", "粉", "紫", "红", "绿", "蓝", "银", "青", "黄", "黑", ,"多色", "其他"
 } pendant_info;
 typedef struct VehicleInfo {