From f946a62d3921e86b44ff8e2973138304b9cd53cd Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 16 四月 2019 16:36:32 +0800
Subject: [PATCH] 解决修改参数和推流画面跳跃问题

---
 QiaoJiaSystem/StructureApp/FaceExtractElement.h |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/FaceExtractElement.h b/QiaoJiaSystem/StructureApp/FaceExtractElement.h
index 8a1a0fb..bbf7266 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,6 +13,7 @@
 #include <queue>
 #include <mutex>
 #include <jsoncpp/json/json.h>
+#include "DBStruct.h"
 
 #define VECTOR_MAX 50
 
@@ -28,7 +30,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 +46,7 @@
     std::vector<::FaceDetect::Data> getFeatures() const;
 
 private:
+
     virtual void timerFunc() override;
 
     IceRpcClient<FaceDetect::FaceExtractServerPrx> faceExtractRpcClient;
@@ -53,8 +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