va库代码移到本项目中

Hu Chunming
1 parent 404df7cd
Showing 6 changed files with 220 additions and 269 deletions
src/PicAnalysis.cpp
src/ai_engine_module/VehicleAnalysis.cpp
src/ai_engine_module/VehicleAnalysis.h
src/ai_engine_module/VehicleAnalysisDevice.cpp
src/ai_engine_module/VehicleAnalysisDevice.h
src/ai_engine_module/VehicleAnalysisDevice.h0
@@ -38,10 +38,6 @@ int PicAnalysis::init(VillageParam param) {
     vehicle_analysis_param.devId = dev_id;
     vehicle_analysis_param.sdk_root = param.sdk_path;
     vehicle_analysis_param.max_batch_size = 16;
-    vehicle_analysis_param.log_level = param.log_level;
-    vehicle_analysis_param.log_path = param.log_path;
-    vehicle_analysis_param.log_days = param.log_days;
-    vehicle_analysis_param.log_mem = param.log_mem;
     ret = m_vehicle_analysis.init(vehicle_analysis_param);
     if(0 != ret){
         return -1;
 #include "VehicleAnalysis.h"
+#include "VehicleAnalysisDevice.h"
+
 VehicleAnalysis::VehicleAnalysis() {
     cout << va_get_version() << endl;
@@ -59,11 +61,6 @@ int VehicleAnalysis::init(VehicleAnalysisParam tParam) {
 	param.dbPath= (char*)dbPath.data();	
 	param.models_Path= (char*)models_path.data();	//所有模型的地址
-    param.log_level = tParam.log_level;
-    param.log_path = tParam.log_path;
-    param.log_days = tParam.log_days;
-    param.log_mem = tParam.log_mem;
-
     LOG_INFO("va_init start");
     // 内部有 ctx
     int ret = va_init(&m_handle, param);
@@ -15,10 +15,6 @@ struct VehicleAnalysisParam {
     int devId;
     std::string sdk_root;
     int max_batch_size;
-    int log_level{2};
-    int log_days{30};               //日志保存周期
-    std::string log_path{"logs"};             //日志文件路径
-    unsigned long log_mem{64 * 1024 * 1024};             //每个日志最大大小
 };
 struct VehicleAnalysisResult{
@@ -27,7 +27,7 @@
 #include "head_shoulder_det.h"//ͷ�磨����������ˣ�
-// #include "VehicleAnalysisDevice.h"
+#include "VehicleAnalysisDevice.h"
 #include "include.h"
@@ -41,7 +41,6 @@
 #define FEATURESIZE 256		             //��������
-
 #define VR_HEAD_THRE 0.7 //��ͷ����ʶ����ֵ
 #define VR_REAR_THRE 0.8 //��β����ʶ����ֵ
 #define VR_CLS_THRE 0.25 //������������ֵ
@@ -49,8 +48,6 @@
 #define VR_LOGO_THRE 0.9   //��logo����ֵ
 #define VR_15CLS_THRE 0.8   //����15�������ֵ
-#define IF_DEBUG_INFO 0 //�Ƿ��ӡdebug��Ϣ
-
 #define VERSION_WUXI 0 //�л����а汾�������汾�������汾��ֻ��topn���������������Ͳ���ʶ�𣬵�Ҫ���ӳ���15������������ȱʧ�ĳ����͡�
 #define VR_WUXI_LOGO 1 //�����汾���Ƿ�����logo������
 #define VPT_TOPN 10   //�˳���ȡtopn���з���
@@ -60,8 +57,6 @@
 using namespace std;
-//static int va_acl_flag=0;
-
 typedef struct va_handle                       
 {
 	void* vpt_handle;
@@ -121,33 +116,14 @@ const char * va_get_version()
 	return "sy_va_version:1.2.0.20231129.atlas310p.arm.withOfflineAuthorization";
 }
-
-int va_acl_init()
-{
-	if(IF_DEBUG_INFO) {
-		LOG_INFO("start aclInit	");
-	}
-    ACL_CALL(aclInit(nullptr), ACL_ERROR_NONE, SY_FAILED);
-	if(IF_DEBUG_INFO){
-		LOG_DEBUG("end aclInit	");
-	}
-	
-	return SUCCESS;
-}
-
 int va_init(void ** handle, va_param param)
 {
-	string log_path = param.log_path + "/va.log";
-
-    set_default_logger(LogLevel(param.log_level), "PicAnalysis", log_path.c_str(), param.log_mem, param.log_days);
-
 	va_handle *tools=new va_handle();
 	*handle=(void *)tools;
 	int ret = SUCCESS;		
 	tools->param = param;
-	
 	string str1=tools->param.models_Path;
@@ -654,41 +630,12 @@ int va_batch(void * handle, sy_img * img_data_array, int batch_size, va_result *
 		result[b].count=0;
 		for(int c=0;c<VD_MAXDETECTCOUNT;c++)
 		{
-			
-			//1.vd
-			result[b].info[c].vehicle_body_detect_res.rect = rect_init;	
-			result[b].info[c].vehicle_body_detect_res.score = 0;	
-
-			result[b].info[c].vehicle_detect_res.rect = rect_init;	
-			result[b].info[c].vehicle_detect_res.score = 0;	
-
-			result[b].info[c].vehicle_win_detect_res.rect = rect_init;	
-			result[b].info[c].vehicle_win_detect_res.score = 0;		
-			
-			//3.vc����ɫ
-			result[b].info[c].vehicle_color_res.index = -1;
-			result[b].info[c].vehicle_color_res.score = 0;	
-			//result[b].info[c].vehicle_fea_res.feature[FEATURESIZE + 8] = 0;//20201201wh�������ĳ���ɫ��Ϣ
-			
 			//4.vr����
 			memset(result[b].info[c].vehicle_recg_res.vehicle_brand, '\0', sizeof(result[b].info[c].vehicle_recg_res.vehicle_brand));
 			memset(result[b].info[c].vehicle_recg_res.vehicle_subbrand, '\0', sizeof(result[b].info[c].vehicle_recg_res.vehicle_subbrand));
 			memset(result[b].info[c].vehicle_recg_res.vehicle_issue_year, '\0', sizeof(result[b].info[c].vehicle_recg_res.vehicle_issue_year));
 			memset(result[b].info[c].vehicle_recg_res.vehicle_type, '\0', sizeof(result[b].info[c].vehicle_recg_res.vehicle_type));
 			memset(result[b].info[c].vehicle_recg_res.freight_ton, '\0', sizeof(result[b].info[c].vehicle_recg_res.freight_ton));
-			result[b].info[c].vehicle_recg_res.name_score = 0;
-			result[b].info[c].vehicle_recg_res.index = -1;
-			//result[b].info[c].vehicle_fea_res.feature[FEATURESIZE +9] = 0;//20201201wh��������vr��Ϣ
-			//result[b].info[c].vehicle_fea_res.feature[FEATURESIZE +10] = 0;//20201201wh��������vr��Ϣ
-
-			
-			//5.���Ƽ��ʶ��
-			result[b].info[c].vehicle_plate_det_recg_res.special_type = 0;//������������20200225
-			result[b].info[c].vehicle_plate_det_recg_res.type = -1;
-			result[b].info[c].vehicle_plate_det_recg_res.num_score = 0;	
-			result[b].info[c].vehicle_plate_det_recg_res.detect_score = 0;
-			
-			result[b].info[c].vehicle_plate_det_recg_res.rect = rect_init;
 			for(int p=0;p<PLATENUM;p++)
 			{
@@ -700,69 +647,13 @@ int va_batch(void * handle, sy_img * img_data_array, int batch_size, va_result *
 			{			
 				result[b].info[c].vehicle_fea_res.feature[FEATURESIZE*2+p] = 0;
 			}
-				
-			//6.������
-			result[b].info[c].vehicle_pendant_det_res.count=0;
-			for(int p=0; p<VPD_MAXNUM; p++)
-			{
-				//result[b].info[c].vehicle_pendant_det_res.vpd_res[p].rect = vpd_result_[win_idx].vpd_res[p].rect;
-				result[b].info[c].vehicle_pendant_det_res.vpd_res[p].rect = rect_init;				
-				result[b].info[c].vehicle_pendant_det_res.vpd_res[p].confidence = 0;
-				result[b].info[c].vehicle_pendant_det_res.vpd_res[p].index = -1;
-				result[b].info[c].vehicle_pendant_det_res.vpd_res[p].driver_copilot_info = 0;  //wh20210618����������������֮��
-				//memset(result[b].info[c].vehicle_pendant_det_res.vpd_res[p].feature,0,sizeof(float)*VPD_FACE_FEATURESIZE);//wh20210618������������������
-			}
-			//result[b].info[c].vehicle_fea_res.feature[FEATURESIZE +11] = 0;//20201201wh��������vpd��Ϣ
-			
-			//7.vid��Υ��
-			result[b].info[c].vehicle_illegal_det_res.driver.person.status = UNCERTAINTY;
-			result[b].info[c].vehicle_illegal_det_res.driver.person.confidence = 0;
-			result[b].info[c].vehicle_illegal_det_res.driver.belt.status = UNCERTAINTY;
-			result[b].info[c].vehicle_illegal_det_res.driver.belt.confidence = 0;
-			result[b].info[c].vehicle_illegal_det_res.driver.smoke.status = UNCERTAINTY;
-			result[b].info[c].vehicle_illegal_det_res.driver.smoke.confidence = 0;
-			result[b].info[c].vehicle_illegal_det_res.driver.phone.status = UNCERTAINTY;
-			result[b].info[c].vehicle_illegal_det_res.driver.phone.confidence = 0;
-			result[b].info[c].vehicle_illegal_det_res.driver.call.status = UNCERTAINTY;
-			result[b].info[c].vehicle_illegal_det_res.driver.call.confidence = 0;
-			
-			result[b].info[c].vehicle_illegal_det_res.copilot.person.status = UNCERTAINTY;
-			result[b].info[c].vehicle_illegal_det_res.copilot.person.confidence = 0;
-			result[b].info[c].vehicle_illegal_det_res.copilot.belt.status = UNCERTAINTY;
-			result[b].info[c].vehicle_illegal_det_res.copilot.belt.confidence = 0;
-			result[b].info[c].vehicle_illegal_det_res.copilot.smoke.status = UNCERTAINTY;
-			result[b].info[c].vehicle_illegal_det_res.copilot.smoke.confidence = 0;
-			result[b].info[c].vehicle_illegal_det_res.copilot.phone.status = UNCERTAINTY;
-			result[b].info[c].vehicle_illegal_det_res.copilot.phone.confidence = 0;
-			result[b].info[c].vehicle_illegal_det_res.copilot.call.status = UNCERTAINTY;
-			result[b].info[c].vehicle_illegal_det_res.copilot.call.confidence = 0;
 			//8.vf������
 			memset(result[b].info[c].vehicle_fea_res.feature,0,sizeof(float)*VA_FEATURESIZE);		
-			//mat
-			result[b].info[c].mta_res.motor_driver_helmeted.status=-1;
-			result[b].info[c].mta_res.motor_driver_helmeted.confidence=0;
-			result[b].info[c].mta_res.motor_manned.status=-1;
-			result[b].info[c].mta_res.motor_manned.confidence=0;
-			result[b].info[c].mta_res.tricycle_manned.status=-1;
-			result[b].info[c].mta_res.tricycle_manned.confidence=0;
-			
-			result[b].info[c].mta_res.motor_driver_hs_rect.rect = rect_init;
-			result[b].info[c].mta_res.motor_driver_hs_rect.score=0;
-
-			//���˷���manned_analysis
-			//result[b].info[c].manned_res.status = 0;
-			//result[b].info[c].manned_res.confidence = 0;
-			result[b].info[c].manned_res.hs_count = 0;
-			memset(result[b].info[c].manned_res.hs_rect,0,sizeof(vd_result)*10);
-			
 		}	
 	}//end result��ֵ	
-
-
-
-															
+									
 	//��ͷ��β�����ı�ǩ	
 	int car_body_num=0;//body�г�������
@@ -1093,8 +984,6 @@ int va_batch(void * handle, sy_img * img_data_array, int batch_size, va_result *
 						body_idx++;					
 					}
-					
-					
 				}		
 			}
@@ -1377,28 +1266,11 @@ int va_batch(void * handle, sy_img * img_data_array, int batch_size, va_result *
 							if (vp_result[head_idx].count==0 || max_index == -1 )//û��⵽����
 							{
-								info_c.vehicle_plate_det_recg_res.special_type = 0;//���⳵������20200225//���泵�ơ����ٳ��ơ���ʱ���ơ�0-common,1-low_speed_license_plate,2-temporary_license_plate.
-								info_c.vehicle_plate_det_recg_res.stain_vp_result.score = 0;
-								info_c.vehicle_plate_det_recg_res.stain_vp_result.type = -1;
-							
-								info_c.vehicle_plate_det_recg_res.type = 0;
-								info_c.vehicle_plate_det_recg_res.num_score = 0;
-								info_c.vehicle_plate_det_recg_res.detect_score = 0;
-								
-								info_c.vehicle_plate_det_recg_res.rect.left_ = 0;
-								info_c.vehicle_plate_det_recg_res.rect.top_ =  0;
-								info_c.vehicle_plate_det_recg_res.rect.width_ = 0;
-								info_c.vehicle_plate_det_recg_res.rect.height_ = 0;
-
 								for(int p=0;p<PLATENUM;p++)
 								{
-									info_c.vehicle_plate_det_recg_res.recg[p].index = 0;							
-									info_c.vehicle_plate_det_recg_res.recg[p].maxprob = 0;
-									//info_c.vehicle_plate_det_recg_res.recg[p].character = NULL;
 									memset(info_c.vehicle_plate_det_recg_res.recg[p].character, '\0', sizeof(info_c.vehicle_plate_det_recg_res.recg[p].character));
 								}
-								
-								//20201201wh���������ӳ�������
+
 								for(int p=0;p<PLATENUM;p++)
 								{
 									info_c.vehicle_fea_res.feature[FEATURESIZE*2+p] = 0;								
@@ -1412,18 +1284,13 @@ int va_batch(void * handle, sy_img * img_data_array, int batch_size, va_result *
 								info_c.vehicle_plate_det_recg_res.type = vp_result[head_idx].vehicle_plate_infos[max_index].type;
 								info_c.vehicle_plate_det_recg_res.num_score = vp_result[head_idx].vehicle_plate_infos[max_index].num_score;
 								info_c.vehicle_plate_det_recg_res.detect_score = vp_result[head_idx].vehicle_plate_infos[max_index].detect_score;
-								if (info_c.vehicle_plate_det_recg_res.detect_score > 0.1 && info_c.vehicle_plate_det_recg_res.stain_vp_result.type == 1)
-								{
-									info_c.vehicle_plate_det_recg_res.stain_vp_result.type = 2;
-									info_c.vehicle_plate_det_recg_res.stain_vp_result.score = info_c.vehicle_plate_det_recg_res.detect_score;
-								}
-								
-								
+
 								info_c.vehicle_plate_det_recg_res.rect.left_ = vp_result[head_idx].vehicle_plate_infos[max_index].rect.left_ * scale_w[head_idx]+ info_c.vehicle_detect_res.rect.left_;
 								info_c.vehicle_plate_det_recg_res.rect.top_ = vp_result[head_idx].vehicle_plate_infos[max_index].rect.top_ *  scale_h[head_idx]+ info_c.vehicle_detect_res.rect.top_;
 								info_c.vehicle_plate_det_recg_res.rect.width_ = vp_result[head_idx].vehicle_plate_infos[max_index].rect.width_ *  scale_w[head_idx];
 								info_c.vehicle_plate_det_recg_res.rect.height_ = vp_result[head_idx].vehicle_plate_infos[max_index].rect.height_*  scale_h[head_idx];
+								int space_char_num = 0;
 								for(int p=0;p<PLATENUM;p++)
 								{
 									info_c.vehicle_plate_det_recg_res.recg[p].index = vp_result[head_idx].vehicle_plate_infos[max_index].recg[p].index;							
@@ -1433,7 +1300,25 @@ int va_batch(void * handle, sy_img * img_data_array, int batch_size, va_result *
 									info_c.vehicle_plate_det_recg_res.recg[p].character[1] = vp_result[head_idx].vehicle_plate_infos[max_index].recg[p].character[1];
 									info_c.vehicle_plate_det_recg_res.recg[p].character[2] = vp_result[head_idx].vehicle_plate_infos[max_index].recg[p].character[2];
 									info_c.vehicle_plate_det_recg_res.recg[p].character[3] = vp_result[head_idx].vehicle_plate_infos[max_index].recg[p].character[3];
-								}	
+
+									if (fabs(info_c.vehicle_plate_det_recg_res.recg[p].maxprob) < 0.0001) {
+										space_char_num++ ;
+									}
+								}
+
+								auto plate_info = info_c.vehicle_plate_det_recg_res;
+								LOG_DEBUG("      号牌号码:{}{}{}{}{}{}{}{}", plate_info.recg[0].character, plate_info.recg[1].character, plate_info.recg[2].character, plate_info.recg[3].character, plate_info.recg[4].character, plate_info.recg[5].character, plate_info.recg[6].character, plate_info.recg[7].character);
+
+								if (info_c.vehicle_plate_det_recg_res.stain_vp_result.type == 0)
+								{
+									if (space_char_num == 0) {
+										info_c.vehicle_plate_det_recg_res.stain_vp_result.type = 1;
+										info_c.vehicle_plate_det_recg_res.stain_vp_result.score = info_c.vehicle_plate_det_recg_res.detect_score;
+									} else if (space_char_num > 0 && space_char_num < PLATENUM) {
+										info_c.vehicle_plate_det_recg_res.stain_vp_result.type = 2;
+										info_c.vehicle_plate_det_recg_res.stain_vp_result.score = info_c.vehicle_plate_det_recg_res.detect_score;
+									}
+								}
 								//20201201wh���������ӳ�����Ϣ
 								for(int p=0;p<PLATENUM;p++)
@@ -1728,25 +1613,9 @@ int va_batch(void * handle, sy_img * img_data_array, int batch_size, va_result *
 						}
 						if (vp_result[rear_idx].count==0 || vp_result[rear_idx].vehicle_plate_infos[max_index].rect.left_ == -1 )//û��⵽����
-						{
-							info_c.vehicle_plate_det_recg_res.special_type = 0;//���⳵������20200225
-							info_c.vehicle_plate_det_recg_res.stain_vp_result.score = 0;
-							info_c.vehicle_plate_det_recg_res.stain_vp_result.type = -1;
-
-							info_c.vehicle_plate_det_recg_res.type = 0;
-							info_c.vehicle_plate_det_recg_res.num_score = 0;
-							info_c.vehicle_plate_det_recg_res.detect_score = 0;
-							
-							info_c.vehicle_plate_det_recg_res.rect.left_ = 0;
-							info_c.vehicle_plate_det_recg_res.rect.top_ =  0;
-							info_c.vehicle_plate_det_recg_res.rect.width_ = 0;
-							info_c.vehicle_plate_det_recg_res.rect.height_ = 0;							
-														
+						{							
 							for(int p=0;p<PLATENUM;p++)
 							{
-								info_c.vehicle_plate_det_recg_res.recg[p].index = 0;
-								info_c.vehicle_plate_det_recg_res.recg[p].maxprob = 0;
-								//info_c.vehicle_plate_det_recg_res.recg[p].character = NULL;
 								memset(info_c.vehicle_plate_det_recg_res.recg[p].character, '\0', sizeof(info_c.vehicle_plate_det_recg_res.recg[p].character));
 							}
@@ -1763,29 +1632,42 @@ int va_batch(void * handle, sy_img * img_data_array, int batch_size, va_result *
 							info_c.vehicle_plate_det_recg_res.type = vp_result[rear_idx].vehicle_plate_infos[max_index].type;
 							info_c.vehicle_plate_det_recg_res.num_score = vp_result[rear_idx].vehicle_plate_infos[max_index].num_score;
 							info_c.vehicle_plate_det_recg_res.detect_score = vp_result[rear_idx].vehicle_plate_infos[max_index].detect_score;
-							if (info_c.vehicle_plate_det_recg_res.detect_score > 0.1 && info_c.vehicle_plate_det_recg_res.stain_vp_result.type == 1)
-							{
-								info_c.vehicle_plate_det_recg_res.stain_vp_result.type = 2;
-								info_c.vehicle_plate_det_recg_res.stain_vp_result.score = info_c.vehicle_plate_det_recg_res.detect_score;
-							}
 							info_c.vehicle_plate_det_recg_res.rect.left_ = vp_result[rear_idx].vehicle_plate_infos[max_index].rect.left_ * scale_w[rear_idx] + info_c.vehicle_body_detect_res.rect.left_;
 							info_c.vehicle_plate_det_recg_res.rect.top_ = vp_result[rear_idx].vehicle_plate_infos[max_index].rect.top_ *  scale_h[rear_idx] + info_c.vehicle_body_detect_res.rect.top_;
 							info_c.vehicle_plate_det_recg_res.rect.width_ = vp_result[rear_idx].vehicle_plate_infos[max_index].rect.width_* scale_w[rear_idx];
 							info_c.vehicle_plate_det_recg_res.rect.height_ = vp_result[rear_idx].vehicle_plate_infos[max_index].rect.height_*  scale_h[rear_idx];
+							int space_char_num = 0;
 							for(int p=0;p<PLATENUM;p++)
 							{
 								info_c.vehicle_plate_det_recg_res.recg[p].index = vp_result[rear_idx].vehicle_plate_infos[max_index].recg[p].index;
-
 								info_c.vehicle_plate_det_recg_res.recg[p].maxprob = vp_result[rear_idx].vehicle_plate_infos[max_index].recg[p].maxprob;
 								//info_c.vehicle_plate_det_recg_res.recg[p].character = vp_result[idx][j].recg[p].character;
 								info_c.vehicle_plate_det_recg_res.recg[p].character[0] = vp_result[rear_idx].vehicle_plate_infos[max_index].recg[p].character[0];
 								info_c.vehicle_plate_det_recg_res.recg[p].character[1] = vp_result[rear_idx].vehicle_plate_infos[max_index].recg[p].character[1];
 								info_c.vehicle_plate_det_recg_res.recg[p].character[2] = vp_result[rear_idx].vehicle_plate_infos[max_index].recg[p].character[2];
 								info_c.vehicle_plate_det_recg_res.recg[p].character[3] = vp_result[rear_idx].vehicle_plate_infos[max_index].recg[p].character[3];
+
+								if (fabs(info_c.vehicle_plate_det_recg_res.recg[p].maxprob) < 0.0001) {
+									space_char_num++ ;
+								}
 							}
-							//20201201���ӳ������ĳ�����Ϣ
+
+							auto plate_info = info_c.vehicle_plate_det_recg_res;
+							LOG_DEBUG("      号牌号码:{}{}{}{}{}{}{}{}", plate_info.recg[0].character, plate_info.recg[1].character, plate_info.recg[2].character, plate_info.recg[3].character, plate_info.recg[4].character, plate_info.recg[5].character, plate_info.recg[6].character, plate_info.recg[7].character);
+
+							if (info_c.vehicle_plate_det_recg_res.stain_vp_result.type == 0)
+							{
+								if (space_char_num == 0) {
+									info_c.vehicle_plate_det_recg_res.stain_vp_result.type = 1;
+									info_c.vehicle_plate_det_recg_res.stain_vp_result.score = info_c.vehicle_plate_det_recg_res.detect_score;
+								} else if (space_char_num > 0 && space_char_num < PLATENUM) {
+									info_c.vehicle_plate_det_recg_res.stain_vp_result.type = 2;
+									info_c.vehicle_plate_det_recg_res.stain_vp_result.score = info_c.vehicle_plate_det_recg_res.detect_score;
+								}
+							}
+
 							for(int p=0;p<PLATENUM;p++)
 							{
 								info_c.vehicle_fea_res.feature[FEATURESIZE*2+p] = (float)vp_result[rear_idx].vehicle_plate_infos[max_index].recg[p].index;						
@@ -2019,9 +1901,11 @@ int va_batch(void * handle, sy_img * img_data_array, int batch_size, va_result *
 		LOG_DEBUG("end 7.head win vf+vid ----- ");
 	}
-    //process_vidresult(handle, batch_size, result);
+	
+    LOG_DEBUG("process_vidresult_atlas");
 	process_vidresult_atlas(handle, batch_size, result);
+	LOG_DEBUG("motor_num:{}", motor_num);
 	if(motor_num>0)
 	{
 		//double t22 = msecond();	
@@ -2083,19 +1967,20 @@ int va_batch(void * handle, sy_img * img_data_array, int batch_size, va_result *
 			{	
 				for(int c=0;c<result[b].count;c++)
 				{
-					if(result[b].info[c].type == 2)///Ħ��
-					{
+					auto& info_c = result[b].info[c];
+					if(info_c.type == 2)///Ħ��
+					{ //摩托车
 						int res_index = hcp_result[motor_idx].res_objs[0].res_index;//��ȡĦ�г���ʻ�˵�head������
 						float res_socre = hcp_result[motor_idx].res_objs[0].res_prob;
 						if(res_index == 4)//head������ͷ��
 						{
-							result[b].info[c].mta_res.motor_driver_helmeted.status=MOTOR_DRIVER_HELMETED;//��ͷ��
-							result[b].info[c].mta_res.motor_driver_helmeted.confidence=res_socre;
+							info_c.mta_res.motor_driver_helmeted.status=MOTOR_DRIVER_HELMETED;//��ͷ��
+							info_c.mta_res.motor_driver_helmeted.confidence=res_socre;
 						}
 						else
 						{
-							result[b].info[c].mta_res.motor_driver_helmeted.status=MOTOR_DRIVER_NOT_HELMETED;//δ��ͷ��
-							result[b].info[c].mta_res.motor_driver_helmeted.confidence=res_socre;	
+							info_c.mta_res.motor_driver_helmeted.status=MOTOR_DRIVER_NOT_HELMETED;//δ��ͷ��
+							info_c.mta_res.motor_driver_helmeted.confidence=res_socre;	
 						}
 						motor_idx++;
@@ -2113,6 +1998,7 @@ int va_batch(void * handle, sy_img * img_data_array, int batch_size, va_result *
 	}
 	int tricycle_batch_size = tricycle_num + (car_body_num - head_num -rear_num);//type ==4��type = 3��Ŀ��
+	LOG_DEBUG("tricycle_batch_size:{}", tricycle_batch_size);
 	if(tricycle_batch_size>0)
 	{			
 		LOG_DEBUG("start :tricycle_img_data.");	
@@ -2186,7 +2072,8 @@ int va_batch(void * handle, sy_img * img_data_array, int batch_size, va_result *
 			{
 				for(int c=0;c<result[b].count;c++)
 				{
-					if(result[b].info[c].type == 3 || result[b].info[c].type == 4)//��tricycle �� ����
+					auto& info_c = result[b].info[c];
+					if(info_c.type == 3 || info_c.type == 4)//��tricycle �� ����
 					{											
 						//ͳ�Ʒ�����ߵĳ���
 						int max_index = 0;
@@ -2203,47 +2090,54 @@ int va_batch(void * handle, sy_img * img_data_array, int batch_size, va_result *
 						if (vp_result[tricycle_idx].count==0 || max_index == -1 )//û��⵽����
 						{
-							result[b].info[c].vehicle_plate_det_recg_res.special_type = 0;//���⳵������20200225
-
-							result[b].info[c].vehicle_plate_det_recg_res.type = 0;
-							result[b].info[c].vehicle_plate_det_recg_res.num_score = 0;
-							result[b].info[c].vehicle_plate_det_recg_res.detect_score = 0;
-							
-							result[b].info[c].vehicle_plate_det_recg_res.rect.left_ = result[b].info[c].vehicle_body_detect_res.rect.left_;
-							result[b].info[c].vehicle_plate_det_recg_res.rect.top_ =  result[b].info[c].vehicle_body_detect_res.rect.top_;
-							result[b].info[c].vehicle_plate_det_recg_res.rect.width_ = 0;
-							result[b].info[c].vehicle_plate_det_recg_res.rect.height_ = 0;
+							info_c.vehicle_plate_det_recg_res.rect.left_ = info_c.vehicle_body_detect_res.rect.left_;
+							info_c.vehicle_plate_det_recg_res.rect.top_ =  info_c.vehicle_body_detect_res.rect.top_;
 							for(int p=0;p<PLATENUM;p++)
 							{
-								result[b].info[c].vehicle_plate_det_recg_res.recg[p].index = 0;
-								result[b].info[c].vehicle_plate_det_recg_res.recg[p].maxprob = 0;
-								//result[b].info[c].vehicle_plate_det_recg_res.recg[p].character = NULL;
-								memset(result[b].info[c].vehicle_plate_det_recg_res.recg[p].character, '\0', sizeof(result[b].info[c].vehicle_plate_det_recg_res.recg[p].character));
+								memset(info_c.vehicle_plate_det_recg_res.recg[p].character, '\0', sizeof(info_c.vehicle_plate_det_recg_res.recg[p].character));
 							}
-						}
-						else{
-							result[b].info[c].vehicle_plate_det_recg_res.type = vp_result[tricycle_idx].vehicle_plate_infos[max_index].type;
-							result[b].info[c].vehicle_plate_det_recg_res.num_score = vp_result[tricycle_idx].vehicle_plate_infos[max_index].num_score;
-							result[b].info[c].vehicle_plate_det_recg_res.detect_score = vp_result[tricycle_idx].vehicle_plate_infos[max_index].detect_score;
+						} else{
+							info_c.vehicle_plate_det_recg_res.type = vp_result[tricycle_idx].vehicle_plate_infos[max_index].type;
+							info_c.vehicle_plate_det_recg_res.num_score = vp_result[tricycle_idx].vehicle_plate_infos[max_index].num_score;
+							info_c.vehicle_plate_det_recg_res.detect_score = vp_result[tricycle_idx].vehicle_plate_infos[max_index].detect_score;
-							result[b].info[c].vehicle_plate_det_recg_res.rect.left_ = vp_result[tricycle_idx].vehicle_plate_infos[max_index].rect.left_  * scale_w[tricycle_idx] + result[b].info[c].vehicle_body_detect_res.rect.left_;//ӳ�䳵��
-							result[b].info[c].vehicle_plate_det_recg_res.rect.top_ = vp_result[tricycle_idx].vehicle_plate_infos[max_index].rect.top_  * scale_h[tricycle_idx] + result[b].info[c].vehicle_body_detect_res.rect.top_;//ӳ�䳵��
-							result[b].info[c].vehicle_plate_det_recg_res.rect.width_ = vp_result[tricycle_idx].vehicle_plate_infos[max_index].rect.width_  * scale_w[tricycle_idx];
-							result[b].info[c].vehicle_plate_det_recg_res.rect.height_ = vp_result[tricycle_idx].vehicle_plate_infos[max_index].rect.height_  * scale_h[tricycle_idx];
+							info_c.vehicle_plate_det_recg_res.rect.left_ = vp_result[tricycle_idx].vehicle_plate_infos[max_index].rect.left_  * scale_w[tricycle_idx] + info_c.vehicle_body_detect_res.rect.left_;//ӳ�䳵��
+							info_c.vehicle_plate_det_recg_res.rect.top_ = vp_result[tricycle_idx].vehicle_plate_infos[max_index].rect.top_  * scale_h[tricycle_idx] + info_c.vehicle_body_detect_res.rect.top_;//ӳ�䳵��
+							info_c.vehicle_plate_det_recg_res.rect.width_ = vp_result[tricycle_idx].vehicle_plate_infos[max_index].rect.width_  * scale_w[tricycle_idx];
+							info_c.vehicle_plate_det_recg_res.rect.height_ = vp_result[tricycle_idx].vehicle_plate_infos[max_index].rect.height_  * scale_h[tricycle_idx];
+							int space_char_num = 0;
 							for(int p=0;p<PLATENUM;p++)
 							{
-								result[b].info[c].vehicle_plate_det_recg_res.recg[p].index = vp_result[tricycle_idx].vehicle_plate_infos[max_index].recg[p].index;
-
-								result[b].info[c].vehicle_plate_det_recg_res.recg[p].maxprob = vp_result[tricycle_idx].vehicle_plate_infos[max_index].recg[p].maxprob;
-								//result[b].info[c].vehicle_plate_det_recg_res.recg[p].character = vp_result[idx][j].recg[p].character;
-								result[b].info[c].vehicle_plate_det_recg_res.recg[p].character[0] = vp_result[tricycle_idx].vehicle_plate_infos[max_index].recg[p].character[0];
-								result[b].info[c].vehicle_plate_det_recg_res.recg[p].character[1] = vp_result[tricycle_idx].vehicle_plate_infos[max_index].recg[p].character[1];
-								result[b].info[c].vehicle_plate_det_recg_res.recg[p].character[2] = vp_result[tricycle_idx].vehicle_plate_infos[max_index].recg[p].character[2];
-								result[b].info[c].vehicle_plate_det_recg_res.recg[p].character[3] = vp_result[tricycle_idx].vehicle_plate_infos[max_index].recg[p].character[3];
-							}			
+								info_c.vehicle_plate_det_recg_res.recg[p].index = vp_result[tricycle_idx].vehicle_plate_infos[max_index].recg[p].index;
+
+								info_c.vehicle_plate_det_recg_res.recg[p].maxprob = vp_result[tricycle_idx].vehicle_plate_infos[max_index].recg[p].maxprob;
+								//info_c.vehicle_plate_det_recg_res.recg[p].character = vp_result[idx][j].recg[p].character;
+								info_c.vehicle_plate_det_recg_res.recg[p].character[0] = vp_result[tricycle_idx].vehicle_plate_infos[max_index].recg[p].character[0];
+								info_c.vehicle_plate_det_recg_res.recg[p].character[1] = vp_result[tricycle_idx].vehicle_plate_infos[max_index].recg[p].character[1];
+								info_c.vehicle_plate_det_recg_res.recg[p].character[2] = vp_result[tricycle_idx].vehicle_plate_infos[max_index].recg[p].character[2];
+								info_c.vehicle_plate_det_recg_res.recg[p].character[3] = vp_result[tricycle_idx].vehicle_plate_infos[max_index].recg[p].character[3];
+
+								if (fabs(info_c.vehicle_plate_det_recg_res.recg[p].maxprob) < 0.0001) {
+									space_char_num++ ;
+								}
+							}
+
+							auto plate_info = info_c.vehicle_plate_det_recg_res;
+							LOG_DEBUG("      号牌号码:{}{}{}{}{}{}{}{}", plate_info.recg[0].character, plate_info.recg[1].character, plate_info.recg[2].character, plate_info.recg[3].character, plate_info.recg[4].character, plate_info.recg[5].character, plate_info.recg[6].character, plate_info.recg[7].character);
+
+							if (info_c.vehicle_plate_det_recg_res.stain_vp_result.type == 0)
+							{
+								if (space_char_num == 0) {
+									info_c.vehicle_plate_det_recg_res.stain_vp_result.type = 1;
+									info_c.vehicle_plate_det_recg_res.stain_vp_result.score = info_c.vehicle_plate_det_recg_res.detect_score;
+								} else if (space_char_num > 0 && space_char_num < PLATENUM) {
+									info_c.vehicle_plate_det_recg_res.stain_vp_result.type = 2;
+									info_c.vehicle_plate_det_recg_res.stain_vp_result.score = info_c.vehicle_plate_det_recg_res.detect_score;
+								}
+							}
 						}
 						tricycle_idx++;
@@ -2261,10 +2155,49 @@ int va_batch(void * handle, sy_img * img_data_array, int batch_size, va_result *
 			LOG_DEBUG("end tricycle 5.vp process----- ");	   
 		}
 		//end for 5.VP���Ƽ��ʶ��-----------------------		
-		
+		// if(tools->param.vehicle_plate_det_recg_config==SY_CONFIG_OPEN)
+		// {
+		// 	LOG_DEBUG("start tricycle hcp.");
+		// 	hcp_analysis_result * hcp_result = new hcp_analysis_result[tricycle_batch_size];
+		// 	int ret = hcp_batch(tools->hcp_handle, tricycle_img_data, tricycle_batch_size, hcp_result);
+			
+		// 	//output Ħ�г���ʻ�˴�ͷ��
+		// 	int tricycle_idx=0;
+		// 	for (int b = 0; b < batch_size; b++)
+		// 	{	
+		// 		for(int c=0;c<result[b].count;c++)
+		// 		{
+		// 			auto& info_c = result[b].info[c];
+		// 			if(info_c.type == 3 || info_c.type == 4)
+		// 			{ //三轮车
+		// 				int res_index = hcp_result[tricycle_idx].res_objs[0].res_index;//��ȡĦ�г���ʻ�˵�head������
+		// 				float res_socre = hcp_result[tricycle_idx].res_objs[0].res_prob;
+		// 				if(res_index == 4)//head������ͷ��
+		// 				{
+		// 					info_c.mta_res.motor_driver_helmeted.status=MOTOR_DRIVER_HELMETED;//��ͷ��
+		// 					info_c.mta_res.motor_driver_helmeted.confidence=res_socre;
+		// 				}
+		// 				else
+		// 				{
+		// 					info_c.mta_res.motor_driver_helmeted.status=MOTOR_DRIVER_NOT_HELMETED;//δ��ͷ��
+		// 					info_c.mta_res.motor_driver_helmeted.confidence=res_socre;	
+		// 				}
+
+		// 				tricycle_idx++;
+		// 			}
+		// 		}
+		// 	}				
+
+		// 	if(hcp_result!= NULL)
+		// 	{
+		// 		delete[] hcp_result;
+		// 		hcp_result=NULL;
+		// 	}
+
+		// 	LOG_DEBUG("end tricycle hcp.");
+		// }	
 	}
 	//end tricycle ����
-	
 	//delete
@@ -2479,13 +2412,6 @@ void va_release(void ** handle)
 }
-void va_acl_release()
-{
-	aclFinalize();
-}
-
-
-
 //1.��绰
 //�ж�������
 //-��Ӧ�����ˣ�
@@ -4059,34 +3985,4 @@ int vr_supplement(void *handle, sy_img * body_img_data, int batch_size,int car_b
 	return SUCCESS;
-}
-
-//end for ����ʶ�����복logo�����ϲ���---------------------------
-
-
-
-
-
-
-
-//===================== �������� =====================//
-
-int checkTime()
-{
-	struct tm* info;
-	int nYear, nMonth, nDay;
-	time_t raw;
-	time(&raw);
-	info = localtime(&raw);
-	nYear = info->tm_year + 1900;
-	nMonth = info->tm_mon + 1;
-	nDay = info->tm_mday;
-	if (nYear == 2019 && nMonth < 7)
-		return 1;
-	LOG_ERROR("Software license is out of time! Please contact software developers.");
-	//exit(0);
-	return -1;
-}
-
-
-
+}
 \ No newline at end of file
+#ifndef __AI_ENGINE_MODULE_VEHICLE_ANALYSIS_DEVICE_H__
+#define __AI_ENGINE_MODULE_VEHICLE_ANALYSIS_DEVICE_H__
+
+#include "vehicle_analysis.h"
+
+/*************************************************************************
+* function: va_init
+* purpose: init resources
+* param:
+[in] handle 		- handle
+[in] param 			- init param
+* return: success(0) or error code(<0)
+* notes: null
+*************************************************************************/
+int va_init(void ** handle, va_param param);
+
+/*************************************************************************
+* function: va_release
+* purpose: release sources
+* param:
+[in] handle				- handle
+* return: null
+* notes: null
+*************************************************************************/
+void va_release(void ** handle);
+
+/*************************************************************************
+* function: va_get_version
+* purpose: get sdk version
+* param: null
+* return: null
+* notes: null
+*************************************************************************/
+const char * va_get_version();
+
+/*************************************************************************
+* function: va_batch
+* purpose: vehicle analysis batch
+* param:
+[in] handle				- handle
+[in] img_data_array		- data array
+[in] format				- data format
+[in] batch_size			- batch size
+[in] result				- vehicle analysis result
+* return: success(0) or error code(<0)
+* notes: null
+*************************************************************************/
+int va_batch(void * handle, sy_img * img_data_array, int batch_size, va_result *result);	
+//img_data_array是device数据，batch_size==16时调用固定16模型，小于16时调用固定1模型。
+int va_batch16_device(void * handle, sy_img * img_data_array, int batch_size, va_result *result);		
+
+
+
+/*************************************************************************
+* FUNCTION: VA_ComputeSimilarity
+* PURPOSE: 比对相似度（通用）
+* PARAM:
+[in] Afea					- 第一张图片特征
+[in] Bfea					- 第二张图片特征
+[in] featuresize			- 特征长度
+* RETURN:	相似度
+* NOTES:	
+*************************************************************************/
+float va_compute_similarity(float *Afea, float *Bfea, int featuresize);
+
+/*************************************************************************
+* FUNCTION: va_compute_similarity_byvafeature
+* PURPOSE: 比对相似度（针对va特征）
+* PARAM:
+[in] Afea					- 第一张图片va特征
+[in] Bfea					- 第二张图片va特征
+[in] featuresize			- 特征长度VA_FEATURESIZE
+* RETURN:	相似度
+* NOTES:	
+*************************************************************************/
+float va_compute_similarity_byvafeature(void * handle , float *Afea, float *Bfea, int featuresize);
+
+
+#endif  // __AI_ENGINE_MODULE_VEHICLE_ANALYSIS_DEVICE_H__
 \ No newline at end of file
-#ifndef __AI_ENGINE_MODULE_VEHICLE_ANALYSIS_DEVICE_H__
-#define __AI_ENGINE_MODULE_VEHICLE_ANALYSIS_DEVICE_H__
-
-#include "vehicle_analysis.h"
-
-int va_init(void ** handle, va_param param);
-
-int va_batch(void * handle, sy_img * img_data_array, int batch_size, va_result *result);
-
-void va_release(void ** handle);
-
-
-#endif  // __AI_ENGINE_MODULE_VEHICLE_ANALYSIS_DEVICE_H__
 \ No newline at end of file