From d3b7bbe7102cd089680a828f5d8f6402c8cf6342 Mon Sep 17 00:00:00 2001 From: pansen <pansen626@sina.com> Date: 星期四, 07 三月 2019 14:43:28 +0800 Subject: [PATCH] GB28181集成完成,集成推流模块 --- QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h index d608547..fbd73ba 100644 --- a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h +++ b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h @@ -9,7 +9,8 @@ #include <map> #include "RtspCaptureElement.h" #include "RtspImageRedis.h" -#include "../GB28181DecoderModel/VideoCaptureElementWithRtp.h" +//#include "../GB28181DecoderModel/VideoCaptureElementWithRtp.h" +#include "pushStream/PushStreamAppPipeController.h" //#include <VideoCaptureElementWithRtp.h> #include <QiaoJia/DB/LDBTool.h> #include <basic/util/app/AppPreference.hpp> @@ -63,7 +64,8 @@ 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