From 04c1775a64a1d358e3506a0e2735f868d73caafd Mon Sep 17 00:00:00 2001 From: pansen <pansen626@sina.com> Date: 星期四, 04 四月 2019 11:31:43 +0800 Subject: [PATCH] 修改关闭视频流时的内存可能泄露的bug --- QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h index 5f98e6a..0ca39eb 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,6 +53,10 @@ //鏍规嵁timeStamp鍒涘缓璺緞 std::string MakeDir(const std::string &timeStamp); + void startPublishVideo(); + + void stopPublishVideo(); + private: int reopenTime{10}; int m_gpuIdx; @@ -68,9 +73,12 @@ std::atomic<bool> m_running; std::atomic<bool> m_waitSignal; + std::atomic<bool> m_waitSignalrunning; //鐢ㄦ潵淇濆瓨褰曞儚瑙嗛鐨勮矾寰� std::string m_cutPath; + std::atomic<bool> m_publishVideoRet{false}; + ffmpeg::VideoPublishElement * videoPublishElement; private: /*** * 鍚姩瀹炴椂娴佹帴鏀舵暟鎹嚎绋� -- Gitblit v1.8.0