From adb08adc83dfe9dc5d6170c2322952d77a93c510 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:54:33 +0800
Subject: [PATCH] Merge branch 'yw.1.2' into yangwu1.3
---
QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h
index 77751c3..f2915cc 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h
+++ b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h
@@ -17,6 +17,14 @@
class VideoCaptureElementWithRtp : public basic::PipeElement {
public:
+ /***
+ * VideoCaptureElementWithRtp 瑙嗛瑙ｇ爜
+ * @param chanPubID 閫氶亾鍦�(鎽勫儚鏈篿d)
+ * @param fps
+ * @param streamTransType 璇锋眰鐨勮棰戞祦绫诲瀷
+ * @param gpuIdx gpuindex
+ * @param manager 涓婂眰绫荤殑鎸囬拡
+ */
explicit VideoCaptureElementWithRtp(std::string &chanPubID, int fps, int streamTransType, int gpuIdx = -1,
RtspAnalysManager *manager = nullptr);
@@ -28,6 +36,11 @@
*/
bool getRunning();
+
+ /***
+ * 鑾峰彇鍥剧墖
+ * @return
+ */
cv::Mat getImage();
//淇濆瓨瑙嗛鎺ュ彛,浠嶳tspAnalysManager鍙戣捣璋冪敤
@@ -40,6 +53,7 @@
std::string MakeDir(const std::string &timeStamp);
private:
+ int reopenTime{10};
int m_gpuIdx;
int m_fps;
int m_streamTransType;
@@ -54,6 +68,7 @@
std::atomic<bool> m_running;
std::atomic<bool> m_waitSignal;
+ std::atomic<bool> m_waitSignalrunning;
//鐢ㄦ潵淇濆瓨褰曞儚瑙嗛鐨勮矾寰�
std::string m_cutPath;
@@ -73,7 +88,7 @@
/***
- * rtp缁勫寘鍥炶皟鍑芥暟
+ * GB28181 SDK rtp缁勫寘鍥炶皟鍑芥暟
* @param handle
* @param datatype
* @param frametype
--
Gitblit v1.8.0