From 051c6863dd418c9cfbca787e449fbdeadde977c7 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期二, 16 四月 2019 17:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq
---
QiaoJiaSystem/StructureApp/AppPipeController.h | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.h b/QiaoJiaSystem/StructureApp/AppPipeController.h
index e46de35..0bb873a 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.h
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.h
@@ -20,6 +20,7 @@
#include <jsoncpp/json/json.h>
#include "DBStruct.h"
#include "SaveVideoRpc.h"
+#include "VptRpcElement.h"
class VideoCaptureElementNotDecoder : public ffmpeg::VideoCaptureElement {
using ffmpeg::VideoCaptureElement::VideoCaptureElement;
@@ -105,21 +106,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