From 272b65bb4e9fd1afe82e61ff857da9601a135d15 Mon Sep 17 00:00:00 2001 From: renlu Date: Fri, 9 Dec 2022 11:24:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E4=BA=BA=E8=A7=82=E7=9C=8B=E6=96=AD?= =?UTF-8?q?=E6=B5=81=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E7=BB=A7=E7=BB=AD?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=9C=A8=E5=BD=95=E5=83=8F?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=9C=A8=E5=BD=95=E5=83=8F=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E6=96=AD=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Common/MediaSource.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Common/MediaSource.cpp b/src/Common/MediaSource.cpp index 70192d2f..3bfe6eac 100644 --- a/src/Common/MediaSource.cpp +++ b/src/Common/MediaSource.cpp @@ -666,7 +666,7 @@ void MediaSourceEvent::onReaderChanged(MediaSource &sender, int size){ //如果mp4点播, 无人观看时我们强制关闭点播 bool is_mp4_vod = sender.getApp() == record_app; weak_ptr weak_sender = sender.shared_from_this(); - + if(sender.isRecording(Recorder::type_hls)) {//如果正在录像 WarnL << "************The stream is Recording.*************"; WarnL << sender.getUrl(); @@ -702,6 +702,10 @@ void MediaSourceEvent::onReaderChanged(MediaSource &sender, int size){ no_record_stream_none_reader_delay / 1000.0f, [weak_sender, is_mp4_vod]() { auto strong_sender = weak_sender.lock(); + + if (strong_sender->isRecording(Recorder::type_hls)) { + return false; + } if (!strong_sender) { //对象已经销毁 return false;