From db043cb402515837303880cb0948d060e9d76490 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 15 四月 2019 17:13:16 +0800
Subject: [PATCH] 整合代码
---
QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h
index 4722443..8e0a92c 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h
+++ b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h
@@ -8,6 +8,7 @@
#include "FFmpegDecoderJPG.h"
#include "28181SDK.h"
#include <basic/pipe/PipeElement.h>
+#include <basic/pipe_element/ffmpeg/FfmpegElement.h>
//#include <RtspAnalysManager.h>
//#include <VideoToImageMulth/RtspAnalysManager.h>
@@ -52,8 +53,12 @@
//鏍规嵁timeStamp鍒涘缓璺緞
std::string MakeDir(const std::string &timeStamp);
+ void startPublishVideo();
+
+ void stopPublishVideo();
+
private:
- int reopenTime{1000};
+ int reopenTime{10};
int m_gpuIdx;
int m_fps;
int m_streamTransType;
@@ -68,9 +73,12 @@
std::atomic<bool> m_running;
std::atomic<bool> m_waitSignal;
+ std::atomic<bool> m_waitSignalrunning{false};
//鐢ㄦ潵淇濆瓨褰曞儚瑙嗛鐨勮矾寰�
std::string m_cutPath;
+ std::atomic<bool> m_publishVideoRet{false};
+ ffmpeg::VideoPublishElement * videoPublishElement{nullptr};
private:
/***
* 鍚姩瀹炴椂娴佹帴鏀舵暟鎹嚎绋�
--
Gitblit v1.8.0