From 084a4da9c460a73b2e95a84578e3302dda5efd25 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 09 二月 2017 11:44:50 +0800
Subject: [PATCH] run 20170208

---
 RtspFace/make.sh  |    1 
 RtspFace/main.cpp |   76 +++++++++++++++++++-------------------
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/RtspFace/main.cpp b/RtspFace/main.cpp
index 8d2d693..e1d0cd3 100644
--- a/RtspFace/main.cpp
+++ b/RtspFace/main.cpp
@@ -71,25 +71,25 @@
 		}
 	}
 	
-	//{
-	//	PL_Scale_Config config;
-	//	config.toWidth = 800;
-	//	config.toHeight = 600;
-	//	PL_Scale* ple = (PL_Scale*)pipeLine.push_elem("PL_Scale");
-	//	bool ret = ple->init(&config);
-	//	if (!ret)
-	//	{
-	//		LOG_ERROR << "PL_Scale.init error";
-	//		exit(EXIT_FAILURE);
-	//	}
-	//}
+	{
+		PL_Scale_Config config;
+		config.toWidth = 800;
+		config.toHeight = 600;
+		PL_Scale* ple = (PL_Scale*)pipeLine.push_elem("PL_Scale");
+		bool ret = ple->init(&config);
+		if (!ret)
+		{
+			LOG_ERROR << "PL_Scale.init error";
+			exit(EXIT_FAILURE);
+		}
+	}
 
-	//{
-	//	SensetimeFaceTrackConfig config;
-	//	//config.generate_face_feature = true;
-	//	PL_SensetimeFaceTrack* ple = (PL_SensetimeFaceTrack*)pipeLine.push_elem("PL_SensetimeFaceTrack");
-	//	ple->init(&config);
-	//}
+	{
+		SensetimeFaceTrackConfig config;
+		//config.generate_face_feature = true;
+		PL_SensetimeFaceTrack* ple = (PL_SensetimeFaceTrack*)pipeLine.push_elem("PL_SensetimeFaceTrack");
+		ple->init(&config);
+	}
 	
 	//PipeLine pipeLine2;
 	//{
@@ -124,26 +124,26 @@
 	//	}
 	//}
 
-	//{
-	//	PL_H264Encoder_Config config;
-	//	PL_H264Encoder* h264Encoder = (PL_H264Encoder*)pipeLine.push_elem("PL_H264Encoder");
-	//	bool ret = h264Encoder->init(&config);
-	//	if (!ret)
-	//	{
-	//		LOG_ERROR << "PL_H264Encoder.init error";
-	//		exit(EXIT_FAILURE);
-	//	}
-	//}
-    //
-	//{
-	//	PL_RTSPServer* rtspServer = (PL_RTSPServer*)pipeLine.push_elem("PL_RTSPServer");
-	//	bool ret = rtspServer->init(nullptr);
-	//	if (!ret)
-	//	{
-	//		LOG_ERROR << "rtspServer.init error";
-	//		exit(EXIT_FAILURE);
-	//	}
-	//}
+	{
+		PL_H264Encoder_Config config;
+		PL_H264Encoder* h264Encoder = (PL_H264Encoder*)pipeLine.push_elem("PL_H264Encoder");
+		bool ret = h264Encoder->init(&config);
+		if (!ret)
+		{
+			LOG_ERROR << "PL_H264Encoder.init error";
+			exit(EXIT_FAILURE);
+		}
+	}
+    
+	{
+		PL_RTSPServer* rtspServer = (PL_RTSPServer*)pipeLine.push_elem("PL_RTSPServer");
+		bool ret = rtspServer->init(nullptr);
+		if (!ret)
+		{
+			LOG_ERROR << "rtspServer.init error";
+			exit(EXIT_FAILURE);
+		}
+	}
 	
 	while(true)
 	{
diff --git a/RtspFace/make.sh b/RtspFace/make.sh
index ac8fc5d..f534195 100644
--- a/RtspFace/make.sh
+++ b/RtspFace/make.sh
@@ -93,3 +93,4 @@
 
 #export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBX264_BASE/lib:$FFMPEG_BASE/lib:$SENSETIMEFACESDK_BASE/libs/linux-x86_64:$LIBLOG4CPP_BASE/lib:$DLIB_BASE/build/dlib
 #./rtsp_face rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/main/av_stream
+#rtsp://admin:a1234567@192.168.1.68:554/h264/ch1/main/av_stream

--
Gitblit v1.8.0