From 52ffba4b81a86d86cda9cdce6e33d2dc6392243c Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 08 三月 2019 11:50:47 +0800
Subject: [PATCH] 修改同步库更新的bug
---
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h
index 2612548..fbd73ba 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h
@@ -9,7 +9,9 @@
#include <map>
#include "RtspCaptureElement.h"
#include "RtspImageRedis.h"
-#include <VideoCaptureElementWithRtp.h>
+//#include "../GB28181DecoderModel/VideoCaptureElementWithRtp.h"
+#include "pushStream/PushStreamAppPipeController.h"
+//#include <VideoCaptureElementWithRtp.h>
#include <QiaoJia/DB/LDBTool.h>
#include <basic/util/app/AppPreference.hpp>
#include "RtspAnalysServer.h"
@@ -52,13 +54,18 @@
private:
+ RWLock m_imgRedisCRwLock;
+
LDBTool *m_lDBTool;
+
+ int m_GB28181_Enable;
//淇濆瓨CamID鍜孯tspCaptureElement鐨勬槧灏勫叧绯�
std::map<std::string, RtspCaptureElement *> m_controllers;
//淇濆瓨CamID鍜孷ideoCaptureElementWithRtp鐨勬槧灏勫叧绯�
- std::map<std::string, BASICGB28181::VideoCaptureElementWithRtp *> m_controllers_videoCapElem;
+// std::map<std::string, BASICGB28181::VideoCaptureElementWithRtp *> m_controllers_videoCapElem;
+ std::map<std::string, PushStreamAppPipeController *> m_controllers_videoCapElem;
//淇濆瓨CamID鍜孯tspImageRedisElement鐨勬槧灏勫叧绯�
std::map<std::string, RtspImageRedisElement *> m_imgRedisControllers;
--
Gitblit v1.8.0