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/VideoAnalysFromHC/RtspAnalysElement.h | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h
index d943d1c..084f8c2 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h
+++ b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h
@@ -11,6 +11,7 @@
#include <VideoServer/QiaoJia/DB/LDBTool.h>
#include <basic/util/app/AppPreference.hpp>
+#include "NsqMsgTool.hpp"
class RtspAnalysElement {
@@ -21,7 +22,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 &);
@@ -36,21 +37,28 @@
private:
void init();
-// std::string resetFdfs(std::string ip = "", unsigned int port = 0, std::string content = "");
+ static void OnMsgFunc(void *msgPtr, void *pThisPtr);
+
+ std::string resetFdfs(std::string ip = "", unsigned int port = 0, std::string content = "");
static std::vector<int> chnString2Vec(std::string str_list);
// void setDataByType(Json::Value& json,const SdkRule& rule);
private:
- LDBTool *m_lDBTool;
+ //nsq
+ BasicMsg::Nsq::NsqMsgConsumer *nsqMsgConsumer;
+ 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;
+
+ void addCamWithSearchRuleMap(const Record_Cam_Dev &item, string rtsp_url);
};
--
Gitblit v1.8.0