From 109ffe9a777658936a38d0c146579a67c60a0d17 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 17:48:48 +0800
Subject: [PATCH]
---
RtspFace/PL_SensetimeFaceDetect.cpp | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/RtspFace/PL_SensetimeFaceDetect.cpp b/RtspFace/PL_SensetimeFaceDetect.cpp
index 3707b9f..db9c257 100644
--- a/RtspFace/PL_SensetimeFaceDetect.cpp
+++ b/RtspFace/PL_SensetimeFaceDetect.cpp
@@ -3,6 +3,7 @@
#include "logger.h"
#include "SensetimeFaceAPIWrapper/src/FaceDBPool.h"
+#include "SensetimeFaceAPIWrapper/src/faceAPI.h"
#include <opencv2/opencv.hpp>
#include <cv_face.h>
@@ -80,7 +81,7 @@
if (pm.type != PipeMaterial::PMT_FRAME || !(in->config.payWithDbFrame))
{
- LOG_ERROR << "Only support PMT_FRAME (SensetimeFaceDetectDbFrame)";
+ LOG_ERROR << "Only support PMT_FRAME (SensetimeFaceDetectDbFrame)" << std::endl;
return false;
}
@@ -90,28 +91,28 @@
SensetimeFaceDetectDbFrame* frame = (SensetimeFaceDetectDbFrame*)pm.buffer;
if (frame->type != MB_Frame::MBFT_YUV420)
{
- LOG_ERROR << "Only support MBFT_YUV420";
+ LOG_ERROR << "Only support MBFT_YUV420" << std::endl;
return false;
}
- faceAPI* _faceAPI = (faceAPI*)frame->_faceAPI;
- if (_faceAPI == nullptr)
+ FaceDB* _faceDB = (FaceDB*)frame->_faceDB;
+ if (_faceDB == nullptr)
{
- LOG_ERROR << "faceAPI is null";
+ LOG_ERROR << "FaceDB is null" << std::endl;
return false;
}
const size_t expectedYUVSize = frame->width * frame->height * 1.5;
if (frame->buffSize < expectedYUVSize)
{
- LOG_WARN << "image size not ok";
+ LOG_WARN << "image size not ok" << std::endl;
return false;
}
cv::Mat yuvMat(cv::Size(frame->width,frame->height), CV_8UC3, frame->buffer);
- //cv_feature_t* feature = _faceAPI->extract_feature(yuvMat);
- //in->lastResult.st_id = _faceAPI->search_db(feature);
- in->lastResult.st_id = _faceAPI->do_reasch(yuvMat);
+ cv_feature_t* feature = _faceDB->extract_feature(yuvMat);
+ in->lastResult.st_id = _faceDB->search_db(feature);
+ //in->lastResult.st_id = _faceDB->do_reasch(yuvMat);
//#todo release feature
in->lastResult.school_id = frame->school_id;
@@ -133,7 +134,7 @@
if (! in->config.resultStructOnly)
{
- LOG_ERROR << "Only support resultStructOnly";
+ LOG_ERROR << "Only support resultStructOnly" << std::endl;
return false;
}
--
Gitblit v1.8.0