From cbc6612a4224d8a4d6ff69af0f48ed3716b09314 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 15 三月 2019 10:00:19 +0800
Subject: [PATCH] 修改当对比服务不存在时，特征值传输错误的bug
---
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h
index 890e317..da7757a 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h
+++ b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h
@@ -21,7 +21,7 @@
virtual ~RtspAnalysElement();
- int addCamera(const std::string &, const std::string &);
+ int addCamera(const std::string &, const std::map<int, SdkRule> &sdkRuleMap);
int removeCamera(const std::string &);
@@ -40,16 +40,17 @@
static std::vector<int> chnString2Vec(std::string str_list);
- void setDataByType(int type,Json::Value& json,int camId);
+// void setDataByType(Json::Value& json,const SdkRule& rule);
private:
LDBTool *m_lDBTool;
-
+ int m_GB28181_Enable;
std::map<std::string, AppPipeController *> controllers;
std::atomic<int> currentCount;
int maxCount;
FastFdsWithLock fdfsClient;
+ std::map<int, SdkRule> sdkRuleMap;
};
--
Gitblit v1.8.0