From 291dbcd9331cd0df41addef74defa4654ee034fb Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 22 四月 2019 15:59:20 +0800
Subject: [PATCH] 增加人员异常的参数处理
---
QiaoJiaSystem/StructureApp/AppPipeController.h | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.h b/QiaoJiaSystem/StructureApp/AppPipeController.h
index e46de35..77862e0 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.h
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.h
@@ -9,17 +9,19 @@
#include "FaceRpcElement.h"
#include "FaceExtractElement.h"
#include "YoloRpcElement.h"
-#include "RecordVideoElement.h"
+//#include "RecordVideoElement.h"
#include <TriggerElement.h>
#include <QtCore/QDateTime>
#include "PerimeterElement.h"
#include "JudgmentRetrogradeTool.h"
-#include "NewRecordVideoElement.h"
+//#include "NewRecordVideoElement.h"
#include "PersonElement.h"
#include "PerStaticElement.h"
#include <jsoncpp/json/json.h>
#include "DBStruct.h"
#include "SaveVideoRpc.h"
+#include "VptRpcElement.h"
+#include "HiredisTool.h"
class VideoCaptureElementNotDecoder : public ffmpeg::VideoCaptureElement {
using ffmpeg::VideoCaptureElement::VideoCaptureElement;
@@ -105,21 +107,27 @@
SaveVideoRpcClient_t m_rpcClient;
VideoCaptureElementNotDecoder videoCaptureElement;
// ffmpeg::VideoCaptureElement videoCaptureElement;
+
+#ifdef YOLOSERVER
YoloRpcElement yoloRpcElement;
+#else
+ VptRpcElement vptRpcElement;
+#endif
+
FaceRpcElement faceRpcElement;
FaceExtractElement faceExtractElement;
ImageDrawElement imageDrawElement;
- RecordVideoElement recordVideoElement;
- NewRecordVideoElement newRecordVideoElement;
+// RecordVideoElement recordVideoElement;
+// NewRecordVideoElement newRecordVideoElement;
PersonElement personElement;
int m_index;
std::string m_camId;
std::string m_folderPath;
- Json::Value m_json;
- Json::Value m_json_Record;
+// Json::Value m_json;
+// Json::Value m_json_Record;
+// Json::FastWriter m_fastWriter;
- Json::FastWriter m_fastWriter;
FastFdsWithLock *fdfsClient;
bool bRecordVideoEnable;
--
Gitblit v1.8.0