From 734e1a94bc026ba8e7e71de0a9ddabe12e07b13b Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 11 一月 2017 19:28:58 +0800
Subject: [PATCH]
---
RtspFace/main.cpp | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/RtspFace/main.cpp b/RtspFace/main.cpp
index 412c1ac..f900b8e 100644
--- a/RtspFace/main.cpp
+++ b/RtspFace/main.cpp
@@ -7,8 +7,11 @@
#include "PL_AVFrameBGRA.h"
#include "PL_Queue.h"
#include "PL_Scale.h"
+#include "PL_Fork.h"
#include "PL_SensetimeFaceTrack.h"
+
+#include "PL_DlibFaceTrack.h"
#include "logger.h"
@@ -18,15 +21,18 @@
PipeLine pipeLine;
- pipeLine.register_elem_creator("PL_RTSPClient", create_PL_RTSPClient);
- pipeLine.register_elem_creator("PL_RTSPServer", create_PL_RTSPServer);
- pipeLine.register_elem_creator("PL_H264Decoder", create_PL_H264Decoder);
- pipeLine.register_elem_creator("PL_AVFrameYUV420", create_PL_AVFrameYUV420);
- pipeLine.register_elem_creator("PL_H264Encoder", create_PL_H264Encoder);
- pipeLine.register_elem_creator("PL_Queue", create_PL_Queue);
- pipeLine.register_elem_creator("PL_Scale", create_PL_Scale);
+ PipeLine::register_global_elem_creator("PL_RTSPClient", create_PL_RTSPClient);
+ PipeLine::register_global_elem_creator("PL_RTSPServer", create_PL_RTSPServer);
+ PipeLine::register_global_elem_creator("PL_H264Decoder", create_PL_H264Decoder);
+ PipeLine::register_global_elem_creator("PL_AVFrameYUV420", create_PL_AVFrameYUV420);
+ PipeLine::register_global_elem_creator("PL_H264Encoder", create_PL_H264Encoder);
+ PipeLine::register_global_elem_creator("PL_Queue", create_PL_Queue);
+ PipeLine::register_global_elem_creator("PL_Scale", create_PL_Scale);
+ PipeLine::register_global_elem_creator("PL_Fork", create_PL_Scale);
pipeLine.register_elem_creator("PL_SensetimeFaceTrack", create_PL_SensetimeFaceTrack);
+
+ pipeLine.register_elem_creator("PL_DlibFaceTrack", create_PL_DlibFaceTrack);
{
PL_RTSPClient* rtspClient = (PL_RTSPClient*)pipeLine.push_elem("PL_RTSPClient");
@@ -69,8 +75,8 @@
PL_Scale_Config config;
config.toWidth = 800;
config.toHeight = 600;
- PL_Scale* pl = (PL_Scale*)pipeLine.push_elem("PL_Scale");
- bool ret = pl->init(&config);
+ PL_Scale* ple = (PL_Scale*)pipeLine.push_elem("PL_Scale");
+ bool ret = ple->init(&config);
if (!ret)
{
LOG_ERROR << "PL_Scale.init error";
@@ -80,9 +86,32 @@
{
SensetimeFaceTrackConfig config;
- PL_SensetimeFaceTrack* pl = (PL_SensetimeFaceTrack*)pipeLine.push_elem("PL_SensetimeFaceTrack");
- pl->init(&config);
+ //config.generate_face_feature = true;
+ PL_SensetimeFaceTrack* ple = (PL_SensetimeFaceTrack*)pipeLine.push_elem("PL_SensetimeFaceTrack");
+ ple->init(&config);
}
+
+ //PipeLine pipeLine2;
+ //{
+ // PL_Fork_Config config;
+ // config.forkBy = PL_Fork::FB_MB_TYPE;
+ // config.forkSync = PL_Fork::FS_PARALLEL;
+ // PL_Fork* ple = (PL_Fork*)pipeLine.push_elem("PL_Fork");
+ // ple->init(&config);
+ // ple->attach_pipe_line(&pipeLine2);
+ //
+ // {
+ // //pipeLine2.push_elem();
+ // }
+ //}
+
+ //{
+ // PL_DlibFaceTrack_Config config;
+ // config.pyramid_down_layers = 2;
+ // config.pyramid_down_n = 1;
+ // PL_DlibFaceTrack* ple = (PL_DlibFaceTrack*)pipeLine.push_elem("PL_DlibFaceTrack");
+ // ple->init(&config);
+ //}
//{//#todo queue should support deep copy
// PL_Queue_Config config;
@@ -96,15 +125,16 @@
//}
{
+ PL_H264Encoder_Config config;
PL_H264Encoder* h264Encoder = (PL_H264Encoder*)pipeLine.push_elem("PL_H264Encoder");
- bool ret = h264Encoder->init(nullptr);
+ 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);
--
Gitblit v1.8.0