From 77513d0db1242f30821f94ae97e272055e5ae0bc Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 23 二月 2017 17:02:25 +0800
Subject: [PATCH] 更新产品原型
---
RtspFace/main.cpp | 78 +++++++++++++++++++++++++++-----------
1 files changed, 55 insertions(+), 23 deletions(-)
diff --git a/RtspFace/main.cpp b/RtspFace/main.cpp
index 412c1ac..bbedf4d 100644
--- a/RtspFace/main.cpp
+++ b/RtspFace/main.cpp
@@ -7,26 +7,34 @@
#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"
+
+Logger g_logger(stdout);
int main(int argc, char** argv)
{
- initLogger(LV_DEBUG);
+ g_logger.set_level(VERBOSE);
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");
@@ -40,7 +48,7 @@
bool ret = rtspClient->init(&rtspConfig);
if (!ret)
{
- LOG_ERROR << "rtspClient.init error";
+ LOG_ERROR << "rtspClient.init error" << std::endl;
exit(EXIT_FAILURE);
}
}
@@ -50,7 +58,7 @@
bool ret = h264Decoder->init(nullptr);
if (!ret)
{
- LOG_ERROR << "PL_H264Decoder.init error";
+ LOG_ERROR << "PL_H264Decoder.init error" << std::endl;
exit(EXIT_FAILURE);
}
}
@@ -60,7 +68,7 @@
bool ret = avFrameYUV420->init(nullptr);
if (!ret)
{
- LOG_ERROR << "PL_AVFrameYUV420.init error";
+ LOG_ERROR << "PL_AVFrameYUV420.init error" << std::endl;
exit(EXIT_FAILURE);
}
}
@@ -69,20 +77,43 @@
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";
+ LOG_ERROR << "PL_Scale.init error" << std::endl;
exit(EXIT_FAILURE);
}
}
{
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;
@@ -90,35 +121,36 @@
// bool ret = queue1->init(&config);
// if (!ret)
// {
- // LOG_ERROR << "queue1.init error";
+ // LOG_ERROR << "queue1.init error" << std::endl;
// exit(EXIT_FAILURE);
// }
//}
{
+ 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";
+ LOG_ERROR << "PL_H264Encoder.init error" << std::endl;
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";
+ LOG_ERROR << "rtspServer.init error" << std::endl;
exit(EXIT_FAILURE);
}
}
while(true)
{
- //LOG_ERROR << "begin pipe";
+ //LOG_ERROR << "begin pipe" << std::endl;
pipeLine.pipe();
- //LOG_ERROR << "end pipe";
+ //LOG_ERROR << "end pipe" << std::endl;
}
}
--
Gitblit v1.8.0