每个区域目标最大数

Zou XiKun
1 parent dd731eff
Showing 8 changed files with 31 additions and 24 deletions
src/left_over/MSRegionSurveilance.h
src/left_over/MSRegionSurveilanceCpu.cpp
src/left_over/RegionSurveillanceProcess.h
src/left_over/left_over_det.h
src/left_over/ms_region_surveilance.cpp
src/left_over/svibe.cpp
src/left_over/svibe.h
src/test/demo.cpp
@@ -195,7 +195,7 @@ public:
 	// Ä£ÐÍ³õÊ¼»¯
-	virtual int RSinit(int nWidth, int nHeight, int widthstep, unsigned char* frameImgData, int nChannel, int nChannel_deal, bool nfiltFlag, int minArea = 0, int maxArea = 1000000) = 0;
+	virtual int RSinit(int nWidth, int nHeight, int widthstep, unsigned char* frameImgData, int nChannel, int nChannel_deal, bool nfiltFlag, int maxObjNum, int minArea = 0, int maxArea = 1000000) = 0;
 	// ROIÇøÓò³õÊ¼»¯
 	virtual int RSRegion(int numROI, int alarm_info/*, bool iflog*/) = 0;
@@ -32,7 +32,7 @@ int IRegionSurveillanceCpu::rs_init(const rs_params &amp;param)
 		Screenshot(gray, img, rect[i]);
 		//cv::Mat roi_img = cv::src_img(Range(0, 100), Range(50, 200));
 		r = IReginCpu[i]->RSinit(img->width, img->height, img->width,
-			(unsigned char*)(img->imageData), 1/*param.image.c_*/, 1/*param.channel_deal*/, param.filt_flag, param.min_area, param.max_area);
+			(unsigned char*)(img->imageData), 1/*param.image.c_*/, 1/*param.channel_deal*/, param.filt_flag, param.max_obj_num, param.min_area, param.max_area);
 		cvReleaseImage(&img);
 	}
 	cvReleaseImage(&gray);
@@ -80,7 +80,7 @@ int IRegionSurveillanceCpu::rs_detect(const sy_img &amp;img_data, region_info* regio
 			result->obj_infos[totalObjCount].curPos.y_ = ObjInfo[i].curPos.y+rect[k].top_;				    // 当前坐标
 			result->obj_infos[totalObjCount].trace.trace_num = ObjInfo[i].trace.nTraceNum;						// 轨迹及报警状态
-			printf("nTraceNum = %d\n", ObjInfo[i].trace.nTraceNum);
+			//printf("nTraceNum = %d\n", ObjInfo[i].trace.nTraceNum);
 			for (int j = 0; j < MAXTRACENUM; ++j)
 			{
 				result->obj_infos[totalObjCount].trace.obj_trace[j].x_ = ObjInfo[i].trace.pObjTrace[j].x+rect[k].left_;
@@ -98,7 +98,7 @@ int IRegionSurveillanceCpu::rs_detect(const sy_img &amp;img_data, region_info* regio
 				result->obj_infos[totalObjCount].pb_alarm_type[j] = ObjInfo[i].pbAlarmType[j];
 			}
 			++totalObjCount;
-			if (totalObjCount >= MACDETECTOBJNUM)
+			if (totalObjCount >= macDetectObjNum * rect_num)
 			{
 				toObjCountBreak = true;
 				break;
@@ -117,7 +117,7 @@ int IRegionSurveillanceCpu::rs_detect(const sy_img &amp;img_data, region_info* regio
 			result->del_infos[totalDelCount].curPos.y_ = DelInfo[i].curPos.y + rect[k].top_;				    // 当前坐标
 			result->del_infos[totalDelCount].trace.trace_num = DelInfo[i].trace.nTraceNum;						// 轨迹及报警状态
-			printf("del_infos nTraceNum = %d\n", DelInfo[i].trace.nTraceNum);
+			//printf("del_infos nTraceNum = %d\n", DelInfo[i].trace.nTraceNum);
 			for (int j = 0; j < MAXTRACENUM; ++j)
 			{
 				result->del_infos[totalDelCount].trace.obj_trace[j].x_ = DelInfo[i].trace.pObjTrace[j].x + rect[k].left_;
@@ -135,7 +135,7 @@ int IRegionSurveillanceCpu::rs_detect(const sy_img &amp;img_data, region_info* regio
 				result->del_infos[totalDelCount].pb_alarm_type[j] = DelInfo[i].pbAlarmType[j];
 			}
 			++totalDelCount;
-			if (totalDelCount >= MACDETECTOBJNUM)
+			if (totalDelCount >= macDetectObjNum * rect_num)
 			{
 				toDelCountBreak = true;
 				break;
@@ -15,8 +15,8 @@ typedef struct rs_params
 	bool filt_flag;
 	int min_area;
 	int max_area;
-
-	rs_params() :mode(DEVICE_GPU), gpuid(0), min_area(0), max_area(1000000) {};
+	int max_obj_num;
+	rs_params() :mode(DEVICE_GPU), gpuid(0), min_area(0), max_area(1000000), max_obj_num(0){};
 }rs_params;
 class RegionSurveillanceProcess
@@ -54,6 +54,7 @@ public:
 	double scale;
 	//int long_side;
 	//int short_side;
+	int macDetectObjNum;
 	rs_auth_type type;
 	std::atomic<bool> thrd_run;
 	int licence_status = -1;
@@ -24,7 +24,6 @@
 #define m_BOUNDING_BOX_RATEMIN 0.001
 #define m_BOUNDING_BOX_RATEMAX 100
 #define MAXROINUM 10                      // 最大ROI数
-#define MACDETECTOBJNUM 10
 #ifdef __cplusplus
 extern "C"
@@ -89,6 +88,7 @@ typedef enum rs_auth_type {
 typedef struct rs_param
 {
 	long     frame_num;                  //逗留时间 单位帧数
+	long     max_obj_num;                //每个区域目标最大数 
 	double   scale;						 //缩小比例
 	sy_rect rect[MAXVERTEXNUM];          //有效区域
 	unsigned char rect_num;              //有效区域数量
@@ -125,9 +125,9 @@ typedef struct ms_trace {
 	typedef struct rs_result
 	{
 		int obj_count;  
-		ms_object_info obj_infos[MACDETECTOBJNUM];
+		ms_object_info * obj_infos; //每个区域目标最大数 * 有效区域数量
 		int del_count;
-		ms_object_info del_infos[MACDETECTOBJNUM];
+		ms_object_info * del_infos; //每个区域目标最大数 * 有效区域数量
 	}rs_result;
 #endif
 	/*************************************************************************
@@ -152,7 +152,7 @@ int rs_init(void **handle, rs_param param)
 	if (auth_type)
 	{
 		regin->frame_num = param.frame_num;
-
+		regin->macDetectObjNum = param.max_obj_num;
 		regin->scale = param.scale;
 		regin->rect_num = param.rect_num;              //有效区域数量
@@ -304,7 +304,7 @@ int rs_process(void *handle, sy_img img_data, rs_result *result)
 		rs_params param;
 		param.mode = 0;	              //运行模式(DEVICE_GPU / DEVICE_CPU)
 		param.gpuid = 0;				//指定显卡id
-										//其余算法参数 如长短边等
+		param.max_obj_num = regin->macDetectObjNum;				//其余算法参数 如长短边等
 		param.image = image;
 		param.channel_deal = 1;
@@ -127,9 +127,9 @@ int RegionSurveillance::get_ArrowDir(CMPoint pROI0, CMPoint pROI1, CMPoint dir)
 *******************************************************************************/
 int RegionSurveillance::RSinit(int nWidth, int nHeight, int widthstep, unsigned char* frameImgData, 
-	int nChannel, int nChannel_deal, bool nfiltFlag, int minArea, int maxArea)
+	int nChannel, int nChannel_deal, bool nfiltFlag, int maxObjNum, int minArea, int maxArea)
 {
-
+	macDetectObjNum = maxObjNum;
 	if(nWidth < 600 || nHeight < 300)		//Èç¹û³ß´ç¹ýÐ¡ ÐÞ¸Ävibe²ÎÊý
 		VBPARAM = new VIBEPARAM(35, 18);
 	else
@@ -987,7 +987,7 @@ void RegionSurveillance::VibeModelErosion2(unsigned char* inputdata, unsigned ch
 		output[j] = 0;
 		output[(height - 1)*width + j] = 0;
 	}
-	for (int i = 1; i<height; i++)
+	for (int i = 1; i<height-1; i++)
 	{
 		src = inputdata + i*width;
 		dst = output + i*width;
@@ -1232,11 +1232,11 @@ void RegionSurveillance::VibeModelGetTrace(unsigned char* pSourceImg, unsigned c
 	// Calculate distance matrix and determine every target's best match
 	int dwForegroundCount = ForegroundArray.size(); 
-	dwForegroundCount = dwForegroundCount > MACDETECTOBJNUM ? MACDETECTOBJNUM : dwForegroundCount;
-	if (ForegroundArray.size() > MACDETECTOBJNUM)
+	dwForegroundCount = dwForegroundCount > macDetectObjNum ? macDetectObjNum : dwForegroundCount;
+	if (ForegroundArray.size() > macDetectObjNum)
 	{
 		size_t n = ForegroundArray.size();
-		for (int i = 0; i <  n - MACDETECTOBJNUM; ++i)
+		for (int i = 0; i <  n - macDetectObjNum; ++i)
 		{
 			ForegroundArray.pop_back();
 		}
@@ -75,7 +75,7 @@ public:
 	void VibeModelUpdateC3(VibeModel_t *model, uint8_t *image, uint8_t *output);
 	int RSinit(int nWidth, int nHeight, int widthstep, unsigned char* frameImgData, 
-		int nChannel, int nChannel_deal, bool nfiltFlag, int minArea, int maxArea);	//1
+		int nChannel, int nChannel_deal, bool nfiltFlag, int maxObjNum, int minArea, int maxArea);	//1
 	int VPTinit(int mode, int gpuid, float threshold);
 	int RSRegion(int numROI, int alarm_info/*, bool iflog*/);
 	//void vibeMask(int num, CMPoint *pPointList, bool *pRegion);
@@ -134,6 +134,7 @@ private:
 	int GlobelHeight;
 	int GlobelWidthstep;
 	std::list<CTarget> indexInWander;
+	int macDetectObjNum;
 	//std::set<int> indexInWander;
 	CMPoint pStart, pEnd; //by zl 用于存储可通行方向箭头的两个端点
@@ -59,12 +59,13 @@ void algorthim_thread1() {
 void imag_ana_3channels()
 {
 	//AlarmInfo 1进入禁区 2离开禁区 3单向越界 4双向越界 5徘徊 6丢包
-
+	
 	void *tools = nullptr;
 	rs_param param;
 	param.frame_num = 10;
-	param.scale = 1;
-	param.rect_num = 2;
+	param.scale = 2;
+	param.rect_num = 1;
+	param.max_obj_num = 2;
 	{
 		param.rect[1].left_ = 30;
@@ -92,7 +93,7 @@ void imag_ana_3channels()
 	char imgpath[260];
-	CvCapture* video1 = cvCaptureFromFile("./test.mp4");
+	CvCapture* video1 = cvCaptureFromFile("./convert.mp4");
 	// 用opencv函数读取视频的一帧
 	//IplImage * src = cvQueryFrame(video1);
 	IplImage *src = cvQueryFrame(video1);
@@ -114,6 +115,8 @@ void imag_ana_3channels()
 		syimg.set_data(srcscale->width, srcscale->height, srcscale->nChannels, (unsigned char *)srcscale->imageData);
 		rs_result result{};
+		result.del_infos = new ms_object_info[param.max_obj_num * param.rect_num]{};
+		result.obj_infos = new ms_object_info[param.max_obj_num * param.rect_num]{};
 		rs_process(tools, syimg, &result);
 		if (result.del_count != 0)
 		{
@@ -176,6 +179,8 @@ void imag_ana_3channels()
 		}
+		delete[] result.del_infos;
+		delete[] result.obj_infos;
 		//cvWriteFrame(writer, srcscale);
 		// 图像显示