From 5f5e870de69efe56d571a2c93362942af5bb49a5 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 20 七月 2017 14:30:55 +0800
Subject: [PATCH] restart

---
 RtspFace/PL_SensetimeFaceTrack.cpp |  278 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 140 insertions(+), 138 deletions(-)

diff --git a/RtspFace/PL_SensetimeFaceTrack.cpp b/RtspFace/PL_SensetimeFaceTrack.cpp
index b0c6ccd..8bb4c37 100644
--- a/RtspFace/PL_SensetimeFaceTrack.cpp
+++ b/RtspFace/PL_SensetimeFaceTrack.cpp
@@ -81,46 +81,46 @@
 #ifdef __ANDROID__
 	{
 		bool retLic = false;
-        if (in->config.license_str.empty())
-        {
-            if (in->config.license_file_path.empty())
-                in->config.license_file_path = "/data/license.lic";
+		if (in->config.license_str.empty())
+		{
+			if (in->config.license_file_path.empty())
+				in->config.license_file_path = "/data/license.lic";
 
-            FILE * licFile = fopen (in->config.license_file_path.c_str(),"rb");
-            if (licFile != nullptr)
-            {
-                char licBuffer[1025 * 5] = {'\0'};
-                size_t licSize = fread(licBuffer, sizeof(uint8_t), sizeof(licBuffer), licFile);
-                fclose (licFile);
+			FILE * licFile = fopen (in->config.license_file_path.c_str(),"rb");
+			if (licFile != nullptr)
+			{
+				char licBuffer[1025 * 5] = {'\0'};
+				size_t licSize = fread(licBuffer, sizeof(uint8_t), sizeof(licBuffer), licFile);
+				fclose (licFile);
 
-                if (licSize > 0)
-                {
-                    int ret = cv_face_init_license_config(licBuffer);
-                    LOG_INFO << "cv_face_init_license_config 1 ret=" << ret << LOG_ENDL;
-                    retLic = true;
-                }
-            }
-            else
-            {
-                LOG_WARN << "cv_face_init_license_config 2 errno=" << errno << LOG_ENDL;
-            }
-        }
-        else
-        {
-            int ret = cv_face_init_license_config(in->config.license_str.c_str());
-            LOG_INFO << "cv_face_init_license_config 3 ret=" << ret << LOG_ENDL;
-            retLic = true;
-        }
+				if (licSize > 0)
+				{
+					int ret = cv_face_init_license_config(licBuffer);
+					LOG_INFO << "cv_face_init_license_config 1 ret=" << ret << LOG_ENDL;
+					retLic = true;
+				}
+			}
+			else
+			{
+				LOG_WARN << "cv_face_init_license_config 2 errno=" << errno << LOG_ENDL;
+			}
+		}
+		else
+		{
+			int ret = cv_face_init_license_config(in->config.license_str.c_str());
+			LOG_INFO << "cv_face_init_license_config 3 ret=" << ret << LOG_ENDL;
+			retLic = true;
+		}
 
-        //int ret = cv_face_init_license_config(_lic);
-        //LOG_INFO << "cv_face_init_license_config 3 ret=" << ret << LOG_ENDL;
-        //retLic = true;
+		//int ret = cv_face_init_license_config(_lic);
+		//LOG_INFO << "cv_face_init_license_config 3 ret=" << ret << LOG_ENDL;
+		//retLic = true;
 
 		if (!retLic)
-        {
-            LOG_WARN << "stface for android no license" << LOG_ENDL;
-            return false;
-        }
+		{
+			LOG_WARN << "stface for android no license" << LOG_ENDL;
+			return false;
+		}
 	}
 #endif
 	
@@ -141,8 +141,8 @@
 	//in->config.generate_face_point = true;
 	//in->config.draw_face_feature_point = true;
 
-    // if not use CV_FACE_TRACKING_TWO_THREAD, stfacesdk detect face per 20 frame and light flow tracking interval
-    // per detect in RK3288: 800ms@1920w,200ms@640w; with CV_FACE_TRACKING_TWO_THREAD 10ms@1920w
+	// if not use CV_FACE_TRACKING_TWO_THREAD, stfacesdk detect face per 20 frame and light flow tracking interval
+	// per detect in RK3288: 800ms@1920w,200ms@640w; with CV_FACE_TRACKING_TWO_THREAD 10ms@1920w
 
 	// init handle
 	cv_result_t cv_result = cv_face_create_tracker(&(in->handle_track), nullptr, 
@@ -173,45 +173,47 @@
 	// destroy track handle
 	cv_face_destroy_tracker(in->handle_track);
 	in->handle_track = nullptr;
+
+	in->reset();
 }
 
 static void test_dump_feature(cv_face_t* p_face, int face_count)
 {
-    static std::fstream dumpfile("/data/temp/dump-106-photo2.txt", std::ios_base::out | std::ios_base::trunc);
+	static std::fstream dumpfile("/data/temp/dump-106-photo2.txt", std::ios_base::out | std::ios_base::trunc);
 
-    for (int i = 0; i < face_count; i++)
-    {
-        dumpfile << p_face[i].rect.left << "\t"
-                 << p_face[i].rect.top << "\t"
-                 << p_face[i].rect.right << "\t"
-                 << p_face[i].rect.bottom << "\t";
+	for (int i = 0; i < face_count; i++)
+	{
+		dumpfile << p_face[i].rect.left << "\t"
+				 << p_face[i].rect.top << "\t"
+				 << p_face[i].rect.right << "\t"
+				 << p_face[i].rect.bottom << "\t";
 
-        dumpfile << p_face[i].score << "\t"
-                << p_face[i].points_count << "\t"
-                << p_face[i].yaw << "\t"
-                << p_face[i].pitch << "\t"
-                << p_face[i].roll << "\t"
-                << p_face[i].eye_dist << "\t"
-                << p_face[i].ID << "\t";
+		dumpfile << p_face[i].score << "\t"
+				<< p_face[i].points_count << "\t"
+				<< p_face[i].yaw << "\t"
+				<< p_face[i].pitch << "\t"
+				<< p_face[i].roll << "\t"
+				<< p_face[i].eye_dist << "\t"
+				<< p_face[i].ID << "\t";
 
-        cv_pointf_t points_array[256];
+		cv_pointf_t points_array[256];
 
-        for (int j = 0; j < p_face[i].points_count; j++)
-        {
-            dumpfile << p_face[i].points_array[j].x << "\t"
-                    << p_face[i].points_array[j].y << "\t";
-        }
+		for (int j = 0; j < p_face[i].points_count; j++)
+		{
+			dumpfile << p_face[i].points_array[j].x << "\t"
+					<< p_face[i].points_array[j].y << "\t";
+		}
 
-        dumpfile << std::endl;
-    }
+		dumpfile << std::endl;
+	}
 }
 
 int doFaceTrack(PL_SensetimeFaceTrack_Internal* in, 
 				uint8_t* buffer, size_t width, size_t height, size_t stride, cv_pixel_format cvPixFmt)
 {
-    PipeLineElemTimingDebugger td(nullptr);
+	//PipeLineElemTimingDebugger td(nullptr);
 
-    if (in->config.doTrackPerFrame == 0)
+	if (in->config.doTrackPerFrame == 0)
 		return 0;
 	if (in->frameCount % in->config.doTrackPerFrame != 0)
 		return 0;
@@ -233,8 +235,8 @@
 		return -1;
 	}
 
-    //#test
-    //test_dump_feature(p_face, face_count);
+	//#test
+	//test_dump_feature(p_face, face_count);
 
 #ifdef USE_OPENCV
 	// draw the video
@@ -285,41 +287,41 @@
 		}
 #endif
 
-        if (in->config.generate_face_point)
-        {
-            for (int j = 0; j < p_face[i].points_count; j++)
-            {
-                PLGH_Point featurePoint;
-                featurePoint.X = p_face[i].points_array[j].x;
-                featurePoint.Y = p_face[i].points_array[j].y;
-                faceFeature.featurePoints.points.push_back(featurePoint);
+		if (in->config.generate_face_point)
+		{
+			for (int j = 0; j < p_face[i].points_count; j++)
+			{
+				PLGH_Point featurePoint;
+				featurePoint.X = p_face[i].points_array[j].x;
+				featurePoint.Y = p_face[i].points_array[j].y;
+				faceFeature.featurePoints.points.push_back(featurePoint);
 
 #ifdef USE_OPENCV
-                if (in->config.draw_face_feature_point)
-                {
-                    cv::circle(yMat, cv::Point2f(p_face[i].points_array[j].x, p_face[i].points_array[j].y), 1, cv::Scalar(255, 255, 255));
-                }
+				if (in->config.draw_face_feature_point)
+				{
+					cv::circle(yMat, cv::Point2f(p_face[i].points_array[j].x, p_face[i].points_array[j].y), 1, cv::Scalar(255, 255, 255));
+				}
 #endif
-            }
+			}
 
-            //int p46x = p_face[i].points_array[46].x;
-            //int p46y = p_face[i].points_array[46].y;
-            //int p6x = p_face[i].points_array[6].x;
-            //int p6y = p_face[i].points_array[6].y;
-            //double dist1 = std::sqrt((p46x-p6x)*(p46x-p6x)+(p46y-p6y)*(p46y-p6y));
+			//int p46x = p_face[i].points_array[46].x;
+			//int p46y = p_face[i].points_array[46].y;
+			//int p6x = p_face[i].points_array[6].x;
+			//int p6y = p_face[i].points_array[6].y;
+			//double dist1 = std::sqrt((p46x-p6x)*(p46x-p6x)+(p46y-p6y)*(p46y-p6y));
 
-            //int p43x = p_face[i].points_array[43].x;
-            //int p43y = p_face[i].points_array[43].y;
-            //int p2x = p_face[i].points_array[2].x;
-            //int p2y = p_face[i].points_array[2].y;
-            //double dist2 = std::sqrt((p43x-p2x)*(p43x-p2x)+(p43y-p2y)*(p43y-p2y));
+			//int p43x = p_face[i].points_array[43].x;
+			//int p43y = p_face[i].points_array[43].y;
+			//int p2x = p_face[i].points_array[2].x;
+			//int p2y = p_face[i].points_array[2].y;
+			//double dist2 = std::sqrt((p43x-p2x)*(p43x-p2x)+(p43y-p2y)*(p43y-p2y));
 
-            //LOGP(ERROR, "dist46_6/dist43_2=%f", dist1 / dist2);
-        }
+			//LOGP(ERROR, "dist46_6/dist43_2=%f", dist1 / dist2);
+		}
 
-        if (faceFeature.rect.leftTop.X < 0 || faceFeature.rect.rightBottom.X > width ||
-                faceFeature.rect.leftTop.Y < 0 || faceFeature.rect.rightBottom.Y > height)
-            faceFeature.outOfFrame = true;
+		if (faceFeature.rect.leftTop.X < 0 || faceFeature.rect.rightBottom.X > width ||
+				faceFeature.rect.leftTop.Y < 0 || faceFeature.rect.rightBottom.Y > height)
+			faceFeature.outOfFrame = true;
 
 		if (in->config.generate_face_feature)
 		{
@@ -334,7 +336,7 @@
 			// explode the range
 			if (in->config.explode_feature_rect_x != 0)
 			{
-				faceFeature.rect.leftTop.X =     clamp(faceFeature.rect.leftTop.X - in->config.explode_feature_rect_x, 0,  faceFeature.rect.leftTop.X);
+				faceFeature.rect.leftTop.X =	 clamp(faceFeature.rect.leftTop.X - in->config.explode_feature_rect_x, 0,  faceFeature.rect.leftTop.X);
 				faceFeature.rect.rightBottom.X = clamp(faceFeature.rect.rightBottom.X + in->config.explode_feature_rect_x, faceFeature.rect.rightBottom.X, int(width - 1));
 			}
 
@@ -344,29 +346,29 @@
 				faceFeature.rect.rightBottom.Y = clamp(faceFeature.rect.rightBottom.Y + in->config.explode_feature_rect_y, faceFeature.rect.rightBottom.Y, int(height - 1));
 			}
 
-            //f (in->config.clamp_feature_rect)
-            //
-            //   int dW = width - faceFeature.rect.width();
-            //   if (dW < 0)
-            //   {
-            //       dW = std::abs(dW) / 2 + 1;
-            //       faceFeature.rect.leftTop.x += dW;
-            //       faceFeature.rect.rightBottom.x -= dW;
-            //       faceFeature.rectClamp = true;
-            //   }
+			//f (in->config.clamp_feature_rect)
+			//
+			//   int dW = width - faceFeature.rect.width();
+			//   if (dW < 0)
+			//   {
+			//	   dW = std::abs(dW) / 2 + 1;
+			//	   faceFeature.rect.leftTop.x += dW;
+			//	   faceFeature.rect.rightBottom.x -= dW;
+			//	   faceFeature.rectClamp = true;
+			//   }
 
-            //   int dH = height - faceFeature.rect.height();
-            //   if (dH < 0)
-            //   {
-            //       dH = std::abs(dH) / 2 + 1;
-            //       faceFeature.rect.leftTop.y += dH;
-            //       faceFeature.rect.rightBottom.y -= dH;
-            //       faceFeature.rectClamp = true;
-            //   }
-            //
+			//   int dH = height - faceFeature.rect.height();
+			//   if (dH < 0)
+			//   {
+			//	   dH = std::abs(dH) / 2 + 1;
+			//	   faceFeature.rect.leftTop.y += dH;
+			//	   faceFeature.rect.rightBottom.y -= dH;
+			//	   faceFeature.rectClamp = true;
+			//   }
+			//
 
-            in->faceFeatures.push_back(faceFeature);
-        }
+			in->faceFeatures.push_back(faceFeature);
+		}
 	}
 
 	//if (face_count > 0)
@@ -378,31 +380,31 @@
 	//	fwrite (yMat.data , sizeof(char), 1920*1080*1.5, pFile);
 	//	printf("write face file %s\n", fname);
 	//	fclose(pFile);
-    //  if (f>20)exit(0);
+	//  if (f>20)exit(0);
 	//}
 
 	// release the memory of face
 	cv_face_release_tracker_result(p_face, face_count);
 
-    //#debug
-    //if (face_count == 0)
-    //{
-    //    face_count = 2;
-    //
-    //    SensetimeFaceFeature faceFeature;
-    //    faceFeature.rect.leftTop.x = 50;
-    //    faceFeature.rect.leftTop.y = 50;
-    //    faceFeature.rect.rightBottom.x = 50+128;
-    //    faceFeature.rect.rightBottom.y = 50+128;
-    //    in->faceFeatures.push_back(faceFeature);
+	//#debug
+	//if (face_count == 0)
+	//{
+	//	face_count = 2;
+	//
+	//	SensetimeFaceFeature faceFeature;
+	//	faceFeature.rect.leftTop.x = 50;
+	//	faceFeature.rect.leftTop.y = 50;
+	//	faceFeature.rect.rightBottom.x = 50+128;
+	//	faceFeature.rect.rightBottom.y = 50+128;
+	//	in->faceFeatures.push_back(faceFeature);
 	//	
 	//	faceFeature.rect.leftTop.x = 300;
-    //    faceFeature.rect.leftTop.y = 400;
-    //    faceFeature.rect.rightBottom.x = 300+50;
-    //    faceFeature.rect.rightBottom.y = 400+60;
-    //    in->faceFeatures.push_back(faceFeature);
+	//	faceFeature.rect.leftTop.y = 400;
+	//	faceFeature.rect.rightBottom.x = 300+50;
+	//	faceFeature.rect.rightBottom.y = 400+60;
+	//	in->faceFeatures.push_back(faceFeature);
 	//	LOG_WARN << "PL_SensetimeFaceTrack doFaceTrack add test data" << LOG_ENDL;
-    //}
+	//}
 
 	return face_count;
 }
@@ -460,14 +462,14 @@
 	//LOG_ERROR << "PL_SensetimeFaceTrack pay" << LOG_ENDL;
 	in->payError = true;
 
-    if (in->payError)
-	    pm.breake(PipeMaterial::PMT_FRAME_LIST, MB_Frame::MBFT_YUV420, PL_SensetimeFaceTrack::pay_breaker_MBFT_YUV, in);
-    if (in->payError)
-        pm.breake(PipeMaterial::PMT_FRAME_LIST, MB_Frame::MBFT_NV12, PL_SensetimeFaceTrack::pay_breaker_MBFT_YUV, in);
-    if (in->payError)
-        pm.breake(PipeMaterial::PMT_FRAME, MB_Frame::MBFT_YUV420, PL_SensetimeFaceTrack::pay_breaker_MBFT_YUV, in);
-    if (in->payError)
-        pm.breake(PipeMaterial::PMT_FRAME, MB_Frame::MBFT_NV12, PL_SensetimeFaceTrack::pay_breaker_MBFT_YUV, in);
+	if (in->payError)
+		pm.breake(PipeMaterial::PMT_FRAME_LIST, MB_Frame::MBFT_YUV420, PL_SensetimeFaceTrack::pay_breaker_MBFT_YUV, in);
+	if (in->payError)
+		pm.breake(PipeMaterial::PMT_FRAME_LIST, MB_Frame::MBFT_NV12, PL_SensetimeFaceTrack::pay_breaker_MBFT_YUV, in);
+	if (in->payError)
+		pm.breake(PipeMaterial::PMT_FRAME, MB_Frame::MBFT_YUV420, PL_SensetimeFaceTrack::pay_breaker_MBFT_YUV, in);
+	if (in->payError)
+		pm.breake(PipeMaterial::PMT_FRAME, MB_Frame::MBFT_NV12, PL_SensetimeFaceTrack::pay_breaker_MBFT_YUV, in);
 
 	in->frameCount++;
 	

--
Gitblit v1.8.0