From a955c3bf9ee78f9a839726edb030fecf74399d2d Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期四, 20 十二月 2018 19:31:25 +0800
Subject: [PATCH] Merge branch 'Develop'
---
QiaoJiaSystem/StructureApp/AppPipeController.cpp | 14 +-------------
QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp | 2 +-
QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp | 4 +++-
QiaoJiaSystem/build/FaceExtractServer | 0
QiaoJiaSystem/build/VideoAnalysFromHC | 0
QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.h | 3 +++
QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice | 2 +-
QiaoJiaSystem/build/config.json | 7 ++++---
QiaoJiaSystem/build/FaceDetectServer | 0
QiaoJiaSystem/build/StructureApp | 0
10 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp b/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp
index 7e2236d..a52e916 100644
--- a/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp
+++ b/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp
@@ -32,6 +32,8 @@
delete[] param;
}
THFP_Create(threadMax);
+ m_ampleSize =
+ appPref.getIntData("FaceDetectionSampleSize") > 0 ? appPref.getIntData("FaceDetectionSampleSize") : 640;
}
FaceDetectServerI::~FaceDetectServerI() {
@@ -48,7 +50,7 @@
auto data = shareMemory.constData();
THFI_FacePos facesPos[30];
int channel = detectResourcesManager.getAvilableChannel(shareMemoryName);
- int faceNum = THFI_DetectFace(channel, (BYTE *) data, 24, width, height, facesPos, 30);
+ int faceNum = THFI_DetectFace(channel, (BYTE *) data, 24, width, height, facesPos, 30, m_ampleSize);
if (faceNum > 0) {
for (int i = 0; i < faceNum; i++) {
FaceDetect::FacePos face;
diff --git a/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.h b/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.h
index dfb93d3..09dfe1a 100644
--- a/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.h
+++ b/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.h
@@ -20,6 +20,9 @@
// FaceDetectServer interface
public:
virtual FaceDetect::ThftResult faceProperty(Ice::Int, Ice::Int, const FaceDetect::FacePos &, const std::string &, const Ice::Current &) override;
+
+private:
+ int m_ampleSize;
};
diff --git a/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice b/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice
index 5d04641..04743fc 100644
--- a/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice
+++ b/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice
@@ -43,7 +43,7 @@
FaceAngle fAngle;
int nQuality;
Data pFacialData;
- long pfaceId;
+ long pfaceId;
}
sequence<FacePos> Faces;
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.cpp b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
index afb6584..c411932 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.cpp
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
@@ -249,18 +249,6 @@
ImageShowElement::showImage(to_string(this->m_index), *imageDrawElement.getImage());
}
});
- newRecordVideoElement.registerConnector([&] {
- if (faceRpcElement.getTriggerState() ||//TODO
- yoloRpcElement.getTrigger() ||
- leftJudgment.getTriggerState() ||
- rightJudgment.getTriggerState() ||
- perimeterElement.getTriggerState() ||
- crowdElement.getTriggerState()
- ) {
-
- }
-
- });
registerElement(videoCaptureElement);
if (m_json["yolo.enable"].asString() == "1") {
@@ -272,7 +260,7 @@
}
registerElement(imageDrawElement);
registerElement(newRecordVideoElement);
- videoCaptureElement.setOutPutInterval(5);
+ videoCaptureElement.setOutPutInterval(3);
faceExtractElement.setProperty("index", to_string(m_index));
//#todo setProperty
// faceExtractElement.setProperty("index", to_string(m_index));
diff --git a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp
index f6829c7..625b24a 100644
--- a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp
+++ b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp
@@ -3,7 +3,7 @@
//#todo index int -> string
NewRecordVideoElement::NewRecordVideoElement(std::string camid) :
- videoEncoderElement(cv::Size(1920, 1080), 5, 0), camID(camid) {
+ videoEncoderElement(cv::Size(1920, 1080), 8, 0), camID(camid) {
// basicPath();
m_cutPath = appPref.getStringData("user.loop.absolute.path");
diff --git a/QiaoJiaSystem/build/FaceDetectServer b/QiaoJiaSystem/build/FaceDetectServer
index 32eba35..7082ba1 100644
--- a/QiaoJiaSystem/build/FaceDetectServer
+++ b/QiaoJiaSystem/build/FaceDetectServer
Binary files differ
diff --git a/QiaoJiaSystem/build/FaceExtractServer b/QiaoJiaSystem/build/FaceExtractServer
index 28b2e8a..1f28be5 100644
--- a/QiaoJiaSystem/build/FaceExtractServer
+++ b/QiaoJiaSystem/build/FaceExtractServer
Binary files differ
diff --git a/QiaoJiaSystem/build/StructureApp b/QiaoJiaSystem/build/StructureApp
index 45095a3..dfbff17 100644
--- a/QiaoJiaSystem/build/StructureApp
+++ b/QiaoJiaSystem/build/StructureApp
Binary files differ
diff --git a/QiaoJiaSystem/build/VideoAnalysFromHC b/QiaoJiaSystem/build/VideoAnalysFromHC
index 81df8c6..5a480ae 100644
--- a/QiaoJiaSystem/build/VideoAnalysFromHC
+++ b/QiaoJiaSystem/build/VideoAnalysFromHC
Binary files differ
diff --git a/QiaoJiaSystem/build/config.json b/QiaoJiaSystem/build/config.json
index 4fbeb0f..4c5ba97 100644
--- a/QiaoJiaSystem/build/config.json
+++ b/QiaoJiaSystem/build/config.json
@@ -1,4 +1,5 @@
{
+ "FaceDetectionSampleSize": 720,
"mainServerIp": "192.168.1.203",
"mainServerPort": "3697",
"logPath": "/home/dell/work/log/",
@@ -17,7 +18,7 @@
"localPasswd": "123456",
"netIfName": "eno1",
"srsAddr": "rtmp://192.168.1.122:1934/live/",
- "webPort": 11111 ,
- "redis_ip": "127.0.0.1",
- "redis_buf_len" : 750
+ "webPort": 11111,
+ "redis_ip": "127.0.0.1",
+ "redis_buf_len": 750
}
--
Gitblit v1.8.0