From 5bf0020b189b2bc8c64737c2af4ea77c3e8f5612 Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 08 三月 2019 22:24:27 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h
index a4fa33b..77751c3 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h
+++ b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h
@@ -8,16 +8,19 @@
#include "FFmpegDecoderJPG.h"
#include "28181SDK.h"
#include <basic/pipe/PipeElement.h>
-#include "GlobalSignalWaitLock.hpp"
+//#include <RtspAnalysManager.h>
+//#include <VideoToImageMulth/RtspAnalysManager.h>
+
+class RtspAnalysManager;
namespace BASICGB28181 {
class VideoCaptureElementWithRtp : public basic::PipeElement {
public:
- explicit VideoCaptureElementWithRtp(std::string &chanPubID, int fps, int streamTransType, int gpuIdx = -1);
+ explicit VideoCaptureElementWithRtp(std::string &chanPubID, int fps, int streamTransType, int gpuIdx = -1,
+ RtspAnalysManager *manager = nullptr);
virtual ~VideoCaptureElementWithRtp();
-
/***
* 鑾峰彇褰撳墠瀹炴椂娴佹帴鏀舵暟鎹嚎绋嬭繍琛岀姸鎬�
@@ -47,6 +50,7 @@
FFmpegDecoderJPG m_fFmpegDecoderJPG;
cv::Mat m_image;
long m_userdata;
+ RtspAnalysManager *m_pManager;
std::atomic<bool> m_running;
std::atomic<bool> m_waitSignal;
--
Gitblit v1.8.0