From 979bc003bce710bf300bc2bd87a8278585678763 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 07 三月 2019 14:47:14 +0800
Subject: [PATCH] GB28181集成完成。录像bug暂未解决，已注释
---
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h
index 21db01e..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::map<int, SdkRule>& sdkRuleMap);
+ int addCamera(const std::string &, const std::map<int, SdkRule> &sdkRuleMap);
int removeCamera(const std::string &);
@@ -40,11 +40,11 @@
static std::vector<int> chnString2Vec(std::string str_list);
- void setDataByType(Json::Value& json,const SdkRule& rule);
+// 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;
--
Gitblit v1.8.0