From 497868ee45e6a27b7a3b2902e0349fa72782049b Mon Sep 17 00:00:00 2001
From: cmhu <2657262686@qq.com>
Date: Tue, 7 Nov 2023 14:49:45 +0800
Subject: [PATCH] 修正调结果问题： tracker应该要用引用

---
 vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.cpp           |  5 -----
 vehicle_structure_platform.git0708-3080-trt-face/src/VPT/VPTProcess.cpp                        | 56 +++++++++++++++++++++-----------------------------------
 vehicle_structure_platform.git0708-3080-trt-face/src/VPT/snapshot_analysis/snapshot_helper.cpp | 14 +++++++-------
 3 files changed, 28 insertions(+), 47 deletions(-)

diff --git a/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.cpp b/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.cpp
index 9a03dc0..46177e6 100644
--- a/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.cpp
+++ b/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.cpp
@@ -998,11 +998,6 @@ void CMutliSourceVideoProcess::algorthim_process()
 			cudaFree(tasks[task_id].task_algorithm_data.frame);
 			tasks[task_id].task_algorithm_data.frame = nullptr;
 		}
-		
-
-		for (int i = 0; i < deleteObjectID.size(); i++)
-			vector<int>().swap(deleteObjectID[i]);
-		vector<vector<int>>().swap(deleteObjectID);
 
 		m_snaphot_helper.object_attri_analysis();
 		cudaError_t cudaStatus = cudaGetLastError();
diff --git a/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/VPTProcess.cpp b/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/VPTProcess.cpp
index 0b1e50d..3b071c1 100644
--- a/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/VPTProcess.cpp
+++ b/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/VPTProcess.cpp
@@ -93,12 +93,11 @@ void VPTProcess::config_fpn_param(ctools_init_params& param, int batch_size) {
 
 void VPTProcess::config_yolo_param(ctools_init_params& param, int batch_size) {
 
-	param.model_type_ = MODEL_YOLOV5; // debug by zsh
-
+	param.model_type_ = MODEL_YOLOV5; 
 	param.weight_file_ = NULL;
 	param.net_file_ = NULL;
 
-	param.data_process_str_ = 
+	param.data_process_str_ =
 		//"CopyData_CPU2GPU_U8;"
 		"TypeConvert_U8_F32;"
 		"ResizeMaxMidPad_F32_F32,test_size,640,test_max_size,640,max_height,640,max_width,640,"
@@ -107,7 +106,7 @@ void VPTProcess::config_yolo_param(ctools_init_params& param, int batch_size) {
 		"BGR2RGB_F32_F32;"
 		"NHWC2NCHW_F32"
 		;
-	param.need_im_info_ = 0; 
+	param.need_im_info_ = 0;
 
 	if (param.engine_type_ == ENGINE_MCAFFE2)
 	{
@@ -135,10 +134,9 @@ void VPTProcess::config_yolo_param(ctools_init_params& param, int batch_size) {
 			"output_names output",
 			batch_size, g_data_mode.c_str(), g_is_create_calibrator, g_is_onnx_model);
 
-		param.tensorrt_calibrator_array_len_ = ga_trt_yolo_vpt_calibrator_len;// 
-		param.tensorrt_calibrator_array_ = (unsigned char*)ga_trt_yolo_vpt_calibrator;// debug by zsh
+		param.tensorrt_calibrator_array_len_ = ga_trt_yolo_vpt_calibrator_len;
+		param.tensorrt_calibrator_array_ = (unsigned char*)ga_trt_yolo_vpt_calibrator;
 
-		// param.tensorrt_plugin_factory_ptr_ = &(tensorrt_plugin_factory);
 	}
 }
 
@@ -254,7 +252,7 @@ int VPTProcess::process(sy_img * batch_img, int batchsize, vector<unsigned long 
 	}
 	
 	for (int i = 0; i < batchsize; i++){
-		TaskTracker task_tracker = taskTrackers[i];
+		TaskTracker& task_tracker = taskTrackers[i];
 		if (!task_tracker.tracker.GetState()) {
 			continue;
 		}
@@ -263,35 +261,24 @@ int VPTProcess::process(sy_img * batch_img, int batchsize, vector<unsigned long 
 			// 第一帧，只做带检测框的跟踪
 			int objCount = task_tracker.tracker.update(task_tracker.ratioWidth, task_tracker.ratioHeight, true, detectResult[i], result[i].obj, deleteObjectID[i]);
 			result[i].objCount = objCount;
+		} else {
+			int update_times = vec_frameIndex[i] - task_tracker.lastFrameIndex - 1;
+			if (update_times < 0) {
+				cout << "FrameIndex error !! lastFrameIndex= " << task_tracker.lastFrameIndex << " cur_frameindex = " << vec_frameIndex[i] << endl;
+			}
+			// cout << "lastFrameIndex= " << task_tracker.lastFrameIndex << " cur_frameindex = " << vec_frameIndex[detectIndex] << endl;
+			// cout << "update_times = " << update_times << endl;
 
-			check_VPT_Result(result[i]);
-
-			task_tracker.lastFrameIndex = vec_frameIndex[i];
-			task_tracker.lastDetectResult = detectResult[i];
-			task_tracker.lastUnUsedResult.objCount = result[i].objCount;
-			memcpy(task_tracker.lastUnUsedResult.obj, result[i].obj, sizeof(VPT_ObjInfo) * MAX_OBJ_COUNT);
-			task_tracker.lastDeleteObjectID = deleteObjectID[i];
-			continue;
-		}
+			for (int j = 0; j < update_times; j++) { // 无检测框跟踪
+				//cout << "taskTrackers size: " << task_tracker.size() << "  batchsize:" << detectResult.size() << "  update_times: "<< update_times << endl;
+				task_tracker.lastUnUsedResult.objCount = task_tracker.tracker.update(task_tracker.ratioWidth, task_tracker.ratioHeight, false, task_tracker.lastDetectResult, task_tracker.lastUnUsedResult.obj, task_tracker.lastDeleteObjectID);
+			}
 
-		int update_times = vec_frameIndex[i] - task_tracker.lastFrameIndex - 1;
-		if (update_times < 0)
-		{
-			cout << "FrameIndex error !! lastFrameIndex= "<< task_tracker.lastFrameIndex <<" cur_frameindex = " << vec_frameIndex[i] << endl;
-		}
-		// cout << "lastFrameIndex= " << task_tracker.lastFrameIndex << " cur_frameindex = " << vec_frameIndex[detectIndex] << endl;
-		// cout << "update_times = " << update_times << endl;
-		
-		for (int j = 0; j < update_times; j++)
-		{ // 无检测框跟踪
-			//cout << "taskTrackers size: " << task_tracker.size() << "  batchsize:" << detectResult.size() << "  update_times: "<< update_times << endl;
-			task_tracker.lastUnUsedResult.objCount =task_tracker.tracker.update(task_tracker.ratioWidth, task_tracker.ratioHeight, false, task_tracker.lastDetectResult, task_tracker.lastUnUsedResult.obj, task_tracker.lastDeleteObjectID);
+			//有检测框输入的跟踪
+			int objCount = task_tracker.tracker.update(task_tracker.ratioWidth, task_tracker.ratioHeight, true, detectResult[i], result[i].obj, deleteObjectID[i]);
+			result[i].objCount = objCount;
 		}
 
-		//有检测框输入的跟踪
-		int objCount = task_tracker.tracker.update(task_tracker.ratioWidth, task_tracker.ratioHeight, true, detectResult[i], result[i].obj, deleteObjectID[i]);
-		result[i].objCount = objCount;
-
 		check_VPT_Result(result[i]);
 
 		task_tracker.lastDetectResult = detectResult[i];
@@ -299,10 +286,9 @@ int VPTProcess::process(sy_img * batch_img, int batchsize, vector<unsigned long 
 		memcpy(task_tracker.lastUnUsedResult.obj, result[i].obj, sizeof(VPT_ObjInfo) * MAX_OBJ_COUNT);
 		task_tracker.lastDeleteObjectID = deleteObjectID[i];
 
-			// 记录帧序号
+		// 记录帧序号
 		task_tracker.lastFrameIndex = vec_frameIndex[i];
 	}
-	
 }
 
 void VPTProcess::release() {
diff --git a/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/snapshot_analysis/snapshot_helper.cpp b/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/snapshot_analysis/snapshot_helper.cpp
index 7ca824d..4f81201 100644
--- a/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/snapshot_analysis/snapshot_helper.cpp
+++ b/vehicle_structure_platform.git0708-3080-trt-face/src/VPT/snapshot_analysis/snapshot_helper.cpp
@@ -2119,9 +2119,9 @@ CropInfo snapshot_helper::cacheSnapShotInfo(OBJ_KEY newObj, VPT_ObjInfo obj, Tas
 					cur_height = HCP_HEIGHT;
 
 					// if(5 == newObj.videoID) 
-					{
-						LOG_DEBUG("task_id:{} obj_id:{} index = {}", newObj.videoID, newObj.objID, snapShotInfo[newObj].index.index );
-					}
+					// {
+					// 	LOG_DEBUG("task_id:{} obj_id:{} index = {}", newObj.videoID, newObj.objID, snapShotInfo[newObj].index.index );
+					// }
 				}
 				else if (8 == snapShotInfo[newObj].index.index || (snapShotInfo[newObj].index.index >= 4 && snapShotInfo[newObj].index.index <= 6))
 				{
@@ -2240,10 +2240,10 @@ CropInfo snapshot_helper::cacheSnapShotInfo(OBJ_KEY newObj, VPT_ObjInfo obj, Tas
 				else if (1 == snapShotInfo[newObj].index.index || 2 == snapShotInfo[newObj].index.index)
 				{
 					// if(5 == newObj.videoID) 
-					{
-						LOG_DEBUG("else  , task_id:{} obj_id:{} index = {}", newObj.videoID, newObj.objID, snapShotInfo[newObj].index.index);
-					}
-					if (snapShotInfo[newObj].snapShotLittle.width != HCP_WIDTH || snapShotInfo[newObj].snapShotLittle.height != HCP_HEIGHT)
+					// {
+					// 	LOG_DEBUG("else  , task_id:{} obj_id:{} index = {}", newObj.videoID, newObj.objID, snapShotInfo[newObj].index.index);
+					// }
+					// if (snapShotInfo[newObj].snapShotLittle.width != HCP_WIDTH || snapShotInfo[newObj].snapShotLittle.height != HCP_HEIGHT)
 					{
 						cudaFree(snapShotInfo[newObj].snapShotLittle.frame);      //释放显存
 						cudaMalloc((void**)&snapShotInfo[newObj].snapShotLittle.frame, 3 * HCP_WIDTH * HCP_HEIGHT * sizeof(unsigned char));
--
libgit2 0.21.4