From 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:57:19 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' into 1.3nsq
---
QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp b/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp
index a52e916..dca9d2f 100644
--- a/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp
+++ b/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp
@@ -7,8 +7,8 @@
#include <THFaceProperty_i.h>
FaceDetectServerI::FaceDetectServerI() {
- long threadMax = appPref.getLongData("thread.max");
- long gpuIndex = appPref.getLongData("gpu.index");
+ long threadMax = appPref.getIntData("thread.max");
+ long gpuIndex = appPref.getIntData("gpu.index");
for (int i = 0; i < threadMax; i++) {
detectResourcesManager.pushResource(i);
}
@@ -43,7 +43,8 @@
FaceDetect::Faces FaceDetectServerI::faceDetect(Ice::Int width, Ice::Int height, const std::string &shareMemoryName,
const Ice::Current &) {
- ClockTimer ct("FaceDetectServerI::faceDetect");
+// ClockTimer ct("FaceDetectServerI::faceDetect");
+// INFO("Face Detect");
FaceDetect::Faces faces;
QSharedMemory shareMemory(QString(shareMemoryName.c_str()));
if (shareMemory.attach()) {
@@ -52,6 +53,7 @@
int channel = detectResourcesManager.getAvilableChannel(shareMemoryName);
int faceNum = THFI_DetectFace(channel, (BYTE *) data, 24, width, height, facesPos, 30, m_ampleSize);
if (faceNum > 0) {
+ DBG("Face num is :" << faceNum);
for (int i = 0; i < faceNum; i++) {
FaceDetect::FacePos face;
auto &pos = facesPos[i];
@@ -62,7 +64,7 @@
faces.push_back(face);
}
} else {
- DBG("Face num is 0");
+// DBG("Face num is 0");
}
} else {
ERR("shareMemory error " << shareMemoryName);
@@ -72,6 +74,7 @@
FaceDetect::ThftResult FaceDetectServerI::faceProperty(Ice::Int width, Ice::Int height, const FaceDetect::FacePos &pos,
const std::string &shareMemoryName, const Ice::Current &) {
+ INFO("faceProperty");
QSharedMemory shareMemory(QString(shareMemoryName.c_str()));
if (shareMemory.attach()) {
FaceDetect::ThftResult thftResult;
@@ -88,6 +91,7 @@
}
return thftResult;
} else {
- throw std::runtime_error("shareMemory attach faild");
+ ERR("shareMemory error " << shareMemoryName);
+// throw std::runtime_error("shareMemory attach faild");
}
}
--
Gitblit v1.8.0