From 3cf9e095f178e85191fa56ed22a7d41c51d9df7d Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 03 四月 2019 11:22:52 +0800
Subject: [PATCH] 修改人脸检测的打印
---
QiaoJiaSystem/StructureApp/AppPipeController.cpp | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.cpp b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
index 880a7c9..dfc92ab 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.cpp
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
@@ -9,7 +9,7 @@
#include <basic/pipe_element/ffmpeg/basic_struct_for_video_image.h>
//AppPipeController::AppPipeController(std::string folderPath, const Json::Value &json) :
-// videoCaptureElement("filePath", 25, -1, appPref.getLongData("gpu.index")), m_index(0),
+// videoCaptureElement("filePath", 25, -1, appPref.getIntData("gpu.index")), m_index(0),
// m_folderPath(folderPath),
// m_json(json), fdfsClient(nullptr), yoloRpcElement(folderPath + "yoloRpc"), faceRpcElement(folderPath + "faceRpc"),
// faceExtractElement(folderPath + "faceExtract"), triggerElement(25, 10),
@@ -19,8 +19,8 @@
//}
AppPipeController::AppPipeController(std::string folderPath, const SdkRuleMap &ruleMap) :
- m_rpcClient("RtspAnalysServer", "127.0.0.1",10009,"tcp"),
- videoCaptureElement("filePath", 25, -1, appPref.getLongData("gpu.index")),
+ m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcVTIMPort"),"tcp"),
+ videoCaptureElement("filePath", 25, -1, appPref.getIntData("gpu.index")),
// videoCaptureElement(40),
m_index(0),
m_folderPath(folderPath),
@@ -28,9 +28,9 @@
fdfsClient(nullptr),
yoloRpcElement(folderPath + "yoloRpc"),
faceRpcElement(folderPath + "faceRpc", ruleMap[FaceSdk]),
- faceExtractElement(folderPath + "faceExtract", ruleMap[FaceSdk],m_rpcClient),
+ faceExtractElement(folderPath + "faceExtract", ruleMap[FaceSdk]),
triggerElement(25, 10),
- recordVideoElement(-1, ""),
+// recordVideoElement(-1, ""),
bRecordVideoEnable(false),
m_bSetWH(false)
@@ -40,7 +40,7 @@
}
//AppPipeController::AppPipeController(int index, const Json::Value &json, bool RecordVideoEnable) :
-// videoCaptureElement(json["rtsp"].asString(), 25, 3000, appPref.getLongData("gpu.index"), RecordVideoEnable),
+// videoCaptureElement(json["rtsp"].asString(), 25, 3000, appPref.getIntData("gpu.index"), RecordVideoEnable),
// m_index(index), fdfsClient(nullptr), yoloRpcElement(to_string(index) + "yoloRpc"),
// faceRpcElement(to_string(index) + "faceRpc"), m_json(json), faceExtractElement(to_string(index) + "faceExtract"),
// triggerElement(25, 4), recordVideoElement(index, json["rtsp"].asString()), bRecordVideoEnable(RecordVideoEnable) {
@@ -49,7 +49,7 @@
//AppPipeController::AppPipeController(std::string camId, const Json::Value &json, bool RecordVideoEnable) :
-// videoCaptureElement(json["rtsp"].asString(), 25, 3000, appPref.getLongData("gpu.index")),
+// videoCaptureElement(json["rtsp"].asString(), 25, 3000, appPref.getIntData("gpu.index")),
// m_index(0),
// m_camId(camId),
// fdfsClient(nullptr),
@@ -70,24 +70,24 @@
// intKeepRight();
//}
AppPipeController::AppPipeController(std::string camId, const SdkRuleMap &ruleMap, bool RecordVideoEnable) :
- m_rpcClient("RtspAnalysServer", "127.0.0.1",10009,"tcp"),
- videoCaptureElement(appPref.getStringData(camId + "rtsp"), 25, 3000, appPref.getLongData("gpu.index")),
+ m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcVTIMPort"),"tcp"),
+ videoCaptureElement(appPref.getStringData(camId + "rtsp"), 25, 3000, appPref.getIntData("gpu.index")),
// videoCaptureElement(40),
m_index(0),
m_camId(camId),
fdfsClient(nullptr),
yoloRpcElement(camId + "yoloRpc"),
faceRpcElement(camId + "faceRpc", ruleMap[FaceSdk]),
- faceExtractElement(camId + "faceExtract", ruleMap[FaceSdk],m_rpcClient),
+ faceExtractElement(camId + "faceExtract", ruleMap[FaceSdk]),
triggerElement(25, 4),
- recordVideoElement(camId, appPref.getStringData(camId + "rtsp")),
- newRecordVideoElement(camId),
- perimeterElement(ruleMap[PerimeterSdk],m_rpcClient),
- crowdElement(ruleMap[CrowdSdk],m_rpcClient),
+// recordVideoElement(camId, appPref.getStringData(camId + "rtsp")),
+// newRecordVideoElement(camId),
+ perimeterElement(ruleMap[PerimeterSdk]),
+ crowdElement(ruleMap[CrowdSdk]),
perStaticElement(ruleMap[PerStaticSdk]),
- perHubElement(ruleMap[PerHubSdk],m_rpcClient),
- leftJudgment(ruleMap[KeepRightSdk],m_rpcClient),
- rightJudgment(ruleMap[KeepRightSdk],m_rpcClient),
+ perHubElement(ruleMap[PerHubSdk]),
+ leftJudgment(ruleMap[KeepRightSdk]),
+ rightJudgment(ruleMap[KeepRightSdk]),
bRecordVideoEnable(RecordVideoEnable),
m_sdkRuleMap(ruleMap),
m_bSetWH(false)
@@ -261,7 +261,7 @@
m_hiredisTool.listRpop(m_camId,imgKey);
if(imgKey.empty())
{
- ERR("CamId "<<m_camId<<" No ImgKey");
+// ERR("CamId "<<m_camId<<" No ImgKey");
return;
}
--
Gitblit v1.8.0