From f946a62d3921e86b44ff8e2973138304b9cd53cd Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 16 四月 2019 16:36:32 +0800
Subject: [PATCH] 解决修改参数和推流画面跳跃问题

---
 QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h
index f2915cc..b77d67f 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>
 
@@ -36,7 +37,6 @@
          */
         bool getRunning();
 
-
         /***
          * 鑾峰彇鍥剧墖
          * @return
@@ -51,6 +51,10 @@
 
         //鏍规嵁timeStamp鍒涘缓璺緞
         std::string MakeDir(const std::string &timeStamp);
+
+        void startPublishVideo();
+
+        void stopPublishVideo();
 
     private:
         int reopenTime{10};
@@ -68,10 +72,12 @@
 
         std::atomic<bool> m_running;
         std::atomic<bool> m_waitSignal;
-        std::atomic<bool> m_waitSignalrunning;
+        std::atomic<bool> m_waitSignalrunning{false};
 
         //鐢ㄦ潵淇濆瓨褰曞儚瑙嗛鐨勮矾寰�
         std::string m_cutPath;
+        std::atomic<bool> m_publishVideoRet{false};
+        ffmpeg::PipeVideoPublishElement * videoPublishElement{nullptr};
     private:
         /***
          * 鍚姩瀹炴椂娴佹帴鏀舵暟鎹嚎绋�

--
Gitblit v1.8.0