代码优化，没有修改逻辑

Hu Chunming
1 parent 080131b6
Showing 3 changed files with 30 additions and 24 deletions
vehicle_structure_platform.git0708-3080-trt-face/src/VPT/MutliSourceVideoProcess.cpp
vehicle_structure_platform.git0708-3080-trt-face/src/VPT/snapshot_analysis/snapshot_helper.cpp
vehicle_structure_platform.git0708-3080-trt-face/src/VPT/snapshot_analysis/snapshot_helper.h
@@ -791,27 +791,9 @@ void CMutliSourceVideoProcess::algorthim_process()
 					delete tasks[i].taskTcuvid;
 					tasks[i].taskTcuvid = NULL;
-					int taskid = tasks[i].taskID;
-					std::unique_lock<std::mutex> lock(m_snaphot_helper.analysisThreadMutex);
-					while (std::find_if(m_snaphot_helper.finished_analysis_ss_info.begin(), m_snaphot_helper.finished_analysis_ss_info.end(), [&taskid](const std::pair<OBJ_KEY, video_object_snapshot> & item) ->bool {
-						if (item.first.videoID == taskid)
-						{
-							return true;
-						}
-						else
-						{
-							return false;
-						}
-
-					}) != m_snaphot_helper.finished_analysis_ss_info.end())
-					{
-						lock.unlock();
-						std::this_thread::yield();
-						std::this_thread::sleep_for(std::chrono::milliseconds(100));
-						lock.lock();
-					}
+					m_snaphot_helper.waitSaveAnalysisInfo(tasks[i].taskID);
-					//�ص�֪ͨ�û� ��·�����������
+					//回调通知上层任务结束
 					if (taskFinishCallbackFunc != nullptr)
 					{
 						std::lock_guard<std::mutex> l(m_snaphot_helper.callback_tx);
@@ -1884,6 +1884,27 @@ void snapshot_helper::snapshot_thread_process()
 	return ;
 }
+void snapshot_helper::waitSaveAnalysisInfo(int taskid) {
+	std::unique_lock<std::mutex> lock(analysisThreadMutex);
+	while (std::find_if(finished_analysis_ss_info.begin(), finished_analysis_ss_info.end(), [&taskid](const std::pair<OBJ_KEY, video_object_snapshot> & item) ->bool {
+		if (item.first.videoID == taskid)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+
+	}) != finished_analysis_ss_info.end())
+	{
+		lock.unlock();
+		std::this_thread::yield();
+		std::this_thread::sleep_for(std::chrono::milliseconds(100));
+		lock.lock();
+	}
+}
+
 int snapshot_helper::save_snapshot(bool is_image, bool on_image_display, OBJ_KEY obj_key, char* filename, char* mode, float* imgData, int width, int height, int taskID, int objID, int recFlag, int left = 0, int top = 0, int right = 0, int bottom = 0)
 {
 	if (recFlag)
@@ -155,7 +155,7 @@ public:
 public:
 	std::mutex callback_tx;
 	queue<SNAPSHOT_IMAGE_UNIT> snapshotImageQueue;
-	map<OBJ_KEY, video_object_snapshot> finished_analysis_ss_info;
+
 	queue<OBJ_KEY> finished_save_ss_info_que;
 	set<OBJ_KEY> finished_save_ss_info;
 	unordered_map<int, TASK_INFO> m_task_info;
@@ -163,10 +163,8 @@ public:
 	std::deque<SNAPSHOT_IMAGE_UNIT> cur_image_queue;
 	std::mutex threadMutex;
 	std::mutex writeThreadMutex;
-	std::mutex analysisThreadMutex;
 	std::mutex finishedThreadMutex;
-	//std::condition_variable writeThreadCondVar;
-	//VC_ANALYSIS_TYPE vc_analysis;
+
 	V_ANALYSIS_TYPE v_analysis;
 	void snapshot_helper_init(int gpuid, double gpu_total_memory, char* dbpath, char* auth_license, int wait_framecount, sy_command hp_analysis_config, \
 		sy_command hcp_analysis_config, sy_command vehicle_analysis_config, sy_command vehicle_recg_config, sy_command vehicle_plate_det_recg_config, sy_command hf_recg_config, sy_command hcf_recg_config, sy_command vcf_recg_config, sy_command face_detect_config);
@@ -202,6 +200,8 @@ public:
 	void clearSnapshotInfo();
+	void waitSaveAnalysisInfo(int taskid);
+
 private:
 	int save_snapshot(bool is_image, bool on_image_display, OBJ_KEY obj_key, char* filename, char* mode, float* imgData, int width, int height, int taskID, int objID, int recFlag, int left, int top, int right, int bottom);
 	int save_snapshot(bool is_image, bool on_image_display, OBJ_KEY obj_key, char* filename, char* mode, unsigned char* imgData, int width, int height, int taskID, int objID, int recFlag, int left, int top, int right, int bottom);
@@ -260,4 +260,7 @@ private:
 	std::thread* ProcessSnapshotThread;
 	std::vector<std::thread*> m_vec_writeThread;
 	bool m_bExit {false};
+
+	map<OBJ_KEY, video_object_snapshot> finished_analysis_ss_info;
+	std::mutex analysisThreadMutex;
 };
 \ No newline at end of file