From 5bf0020b189b2bc8c64737c2af4ea77c3e8f5612 Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 08 三月 2019 22:24:27 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/StructureApp/FaceExtractElement.h | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/FaceExtractElement.h b/QiaoJiaSystem/StructureApp/FaceExtractElement.h
index 8a1a0fb..94f21b0 100644
--- a/QiaoJiaSystem/StructureApp/FaceExtractElement.h
+++ b/QiaoJiaSystem/StructureApp/FaceExtractElement.h
@@ -1,6 +1,7 @@
-#ifndef FACEEXTRACTELEMENT_H
+锘�#ifndef FACEEXTRACTELEMENT_H
#define FACEEXTRACTELEMENT_H
+#include "SaveVideoRpc.h"
#include <FaceServer.h>
#include <FaceSearchServer.h>
#include <basic/pipe/TimerElement.h>
@@ -12,7 +13,7 @@
#include <queue>
#include <mutex>
#include <jsoncpp/json/json.h>
-
+#include "DBStruct.h"
#define VECTOR_MAX 50
class QSharedMemory;
@@ -28,7 +29,9 @@
class FaceExtractElement : public TimerElement {
public:
- FaceExtractElement(std::string shareMemoryName);
+
+ FaceExtractElement(std::string shareMemoryName,const SdkRule& rule);
+ //FaceExtractElement(std::string shareMemoryName,const SdkRule& rule,SaveVideoRpcClient_t& rpcClient);
~FaceExtractElement();
@@ -42,6 +45,7 @@
std::vector<::FaceDetect::Data> getFeatures() const;
private:
+
virtual void timerFunc() override;
IceRpcClient<FaceDetect::FaceExtractServerPrx> faceExtractRpcClient;
@@ -55,6 +59,8 @@
std::vector<::FaceDetect::Data> features;
Base64 base64;
+ SdkRule m_sdkRule;
+ SaveVideoRpcClient_t m_rpcClient;
};
--
Gitblit v1.8.0