From adb08adc83dfe9dc5d6170c2322952d77a93c510 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:54:33 +0800
Subject: [PATCH] Merge branch 'yw.1.2' into yangwu1.3
---
QiaoJiaSystem/StructureApp/FaceExtractElement.h | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/FaceExtractElement.h b/QiaoJiaSystem/StructureApp/FaceExtractElement.h
index 5519735..bbf7266 100644
--- a/QiaoJiaSystem/StructureApp/FaceExtractElement.h
+++ b/QiaoJiaSystem/StructureApp/FaceExtractElement.h
@@ -1,6 +1,7 @@
锘�#ifndef FACEEXTRACTELEMENT_H
#define FACEEXTRACTELEMENT_H
+#include "SaveVideoRpc.h"
#include <FaceServer.h>
#include <FaceSearchServer.h>
#include <basic/pipe/TimerElement.h>
@@ -13,6 +14,7 @@
#include <mutex>
#include <jsoncpp/json/json.h>
#include "DBStruct.h"
+
#define VECTOR_MAX 50
class QSharedMemory;
@@ -28,7 +30,9 @@
class FaceExtractElement : public TimerElement {
public:
- FaceExtractElement(std::string shareMemoryName,const SdkRule& rule);
+
+ FaceExtractElement(std::string shareMemoryName, const SdkRule &rule);
+ //FaceExtractElement(std::string shareMemoryName,const SdkRule& rule,SaveVideoRpcClient_t& rpcClient);
~FaceExtractElement();
@@ -42,6 +46,7 @@
std::vector<::FaceDetect::Data> getFeatures() const;
private:
+
virtual void timerFunc() override;
IceRpcClient<FaceDetect::FaceExtractServerPrx> faceExtractRpcClient;
@@ -53,9 +58,13 @@
// AlarmServerInterface::TableNames tableNames;
std::vector<::FaceDetect::Data> features;
-
+ cv::Mat m_image;
Base64 base64;
SdkRule m_sdkRule;
+ SaveVideoRpcClient_t m_rpcClient;
+
+ void InsertToESDB(const vector<FaceToExtract> &faceExtractQueueTmp, float t_com_sc, int i, int j,
+ FaceDetect::Data &feature, string &strImgUrl, string &strBigImgUrl);
};
--
Gitblit v1.8.0