From 6f27f088e5d9e828bdce65ab85984d2084bab222 Mon Sep 17 00:00:00 2001 From: pansen <pansen626@sina.com> Date: 星期三, 06 三月 2019 11:52:47 +0800 Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2 --- QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h index 2612548..d608547 100644 --- a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h +++ b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h @@ -9,7 +9,8 @@ #include <map> #include "RtspCaptureElement.h" #include "RtspImageRedis.h" -#include <VideoCaptureElementWithRtp.h> +#include "../GB28181DecoderModel/VideoCaptureElementWithRtp.h" +//#include <VideoCaptureElementWithRtp.h> #include <QiaoJia/DB/LDBTool.h> #include <basic/util/app/AppPreference.hpp> #include "RtspAnalysServer.h" @@ -52,8 +53,12 @@ private: + RWLock m_imgRedisCRwLock; + LDBTool *m_lDBTool; + int m_GB28181_Enable; + //淇濆瓨CamID鍜孯tspCaptureElement鐨勬槧灏勫叧绯� std::map<std::string, RtspCaptureElement *> m_controllers; -- Gitblit v1.8.0