From 9186da86847cf954341d1bf58b0c4079a3ab5ac5 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 22 二月 2019 16:46:43 +0800
Subject: [PATCH] 回滚改bug。
---
QiaoJiaSystem/StructureApp/AppPipeController.h | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.h b/QiaoJiaSystem/StructureApp/AppPipeController.h
index ab0e738..e46de35 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.h
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.h
@@ -20,6 +20,22 @@
#include <jsoncpp/json/json.h>
#include "DBStruct.h"
#include "SaveVideoRpc.h"
+
+class VideoCaptureElementNotDecoder : public ffmpeg::VideoCaptureElement {
+ using ffmpeg::VideoCaptureElement::VideoCaptureElement;
+private:
+ virtual void timerFunc() override {
+ fireConnectors();
+ }
+
+ virtual void threadInitial() override {}
+
+ virtual void threadClosing() override {}
+
+private:
+ bool m_decoderRet = {false};
+};
+
class AppPipeController : public PipeController {
public:
/***
@@ -27,14 +43,14 @@
* @param folderPath 浠诲姟鏍圭洰褰曪紝鐢ㄤ簬鍋氬叡浜唴瀛榠d
* @param json 鍙傛暟涓簉tsp娴佸湴鍧� sdk鏄惁鍚敤鐨勬爣璇�
*/
- // AppPipeController(std::string folderPath, const Json::Value &json);
- AppPipeController(std::string folderPath, const SdkRuleMap& ruleMap);
+ // AppPipeController(std::string folderPath, const Json::Value &json);
+ AppPipeController(std::string folderPath, const SdkRuleMap &ruleMap);
- // AppPipeController(int index, const Json::Value &json, bool RecordVideoEnable = false);
+ // AppPipeController(int index, const Json::Value &json, bool RecordVideoEnable = false);
- // AppPipeController(std::string camId, const Json::Value &json, bool RecordVideoEnable);
+ // AppPipeController(std::string camId, const Json::Value &json, bool RecordVideoEnable);
- AppPipeController(std::string camId, const SdkRuleMap& ruleMap, bool RecordVideoEnable);
+ AppPipeController(std::string camId, const SdkRuleMap &ruleMap, bool RecordVideoEnable);
virtual ~AppPipeController();
@@ -46,12 +62,14 @@
void setfdfsClient(FastFdsWithLock *p_fdfsClient);
- void setWeekRule(const std::map<int, std::vector<LActRuleWeekRecord>>& weekRuleMap);
+ void setWeekRule(const std::map<int, std::vector<LActRuleWeekRecord>> &weekRuleMap);
+
private:
void init();
+
private://Perimete
PerimeterElement perimeterElement;
- // TriggerElement peTriggerElement;
+ // TriggerElement peTriggerElement;
void initPerimeter();
@@ -60,7 +78,9 @@
//TriggerElement crowdTriggerElement;
void initCrowd();
+
void RecordVideo();
+
private://KeepRight
JudgmentRetrogradeTool leftJudgment;
JudgmentRetrogradeTool rightJudgment;
@@ -72,15 +92,19 @@
private:
PerStaticElement perStaticElement;
+
void initPerStatic();
+
private://Perimete
PerimeterElement perHubElement;
- // TriggerElement peTriggerElement;
+ // TriggerElement peTriggerElement;
void initPerHub();
+
private:
SaveVideoRpcClient_t m_rpcClient;
- ffmpeg::VideoCaptureElement videoCaptureElement;
+ VideoCaptureElementNotDecoder videoCaptureElement;
+// ffmpeg::VideoCaptureElement videoCaptureElement;
YoloRpcElement yoloRpcElement;
FaceRpcElement faceRpcElement;
FaceExtractElement faceExtractElement;
@@ -109,7 +133,9 @@
std::map<int, std::vector<LActRuleWeekRecord>> m_weekRuleMap;
SdkRuleMap m_sdkRuleMap;
std::string m_localIp;
+
std::string getFullFileName();
+
std::mutex mutex;
bool m_bSetWH;
HiredisTool m_hiredisTool;
--
Gitblit v1.8.0