From 9e5babf9db52e64bdae60137be7696e56241fca6 Mon Sep 17 00:00:00 2001
From: xingzilong <xingzilong@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 18 八月 2017 18:12:17 +0800
Subject: [PATCH] H264 NALU解析 并在RTSPServer判断
---
RtspFace/PL_SensetimeFaceDetect.cpp | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/RtspFace/PL_SensetimeFaceDetect.cpp b/RtspFace/PL_SensetimeFaceDetect.cpp
index ceae262..b6d633f 100644
--- a/RtspFace/PL_SensetimeFaceDetect.cpp
+++ b/RtspFace/PL_SensetimeFaceDetect.cpp
@@ -2,8 +2,8 @@
#include "MaterialBuffer.h"
#include "logger.h"
-#include "SensetimeFaceAPIWrapper/src/FaceDBPool.h"
-#include "SensetimeFaceAPIWrapper/src/faceAPI.h"
+//#include "SensetimeFaceAPIWrapper/src/FaceDBPool.h"
+//#include "SensetimeFaceAPIWrapper/src/faceAPI.h"
#include <opencv2/opencv.hpp>
#include <cv_face.h>
@@ -81,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;
}
@@ -91,27 +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;
}
- FaceDB* _faceDB = (FaceDB*)frame->_faceDB;
- if (_faceDB == nullptr)
- {
- LOG_ERROR << "FaceDB is null";
- return false;
- }
+ //FaceDB* _faceDB = (FaceDB*)frame->_faceDB;
+ //if (_faceDB == nullptr)
+ //{
+ // 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 = _faceDB->extract_feature(yuvMat);
- in->lastResult.st_id = _faceDB->search_db(feature);
+ //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
@@ -134,7 +135,7 @@
if (! in->config.resultStructOnly)
{
- LOG_ERROR << "Only support resultStructOnly";
+ LOG_ERROR << "Only support resultStructOnly" << std::endl;
return false;
}
--
Gitblit v1.8.0