From c6a0e3ad66e3134ecbb1a9e476248f45912113f3 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Sat, 20 Aug 2022 13:16:25 +0800 Subject: [PATCH] =?UTF-8?q?rtp=E5=8F=91=E9=80=81=E5=90=AF=E5=81=9C?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=A7=A6=E5=8F=91=E8=A7=82=E7=9C=8B=E4=BA=BA?= =?UTF-8?q?=E6=95=B0=E7=BB=9F=E8=AE=A1=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/source/mk_media.cpp | 4 ++-- src/Common/MediaSource.cpp | 10 ++++++---- src/Common/MediaSource.h | 2 +- src/Common/MultiMediaSourceMuxer.cpp | 18 +++++++++--------- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/api/source/mk_media.cpp b/api/source/mk_media.cpp index 9d4f8f59..b029fb3e 100755 --- a/api/source/mk_media.cpp +++ b/api/source/mk_media.cpp @@ -266,7 +266,7 @@ API_EXPORT void API_CALL mk_media_start_send_rtp(mk_media ctx, const char *dst_u args.is_udp = is_udp; //sender参数无用 - (*obj)->getChannel()->startSendRtp(*MediaSource::NullMediaSource, args, [cb, user_data](uint16_t local_port, const SockException &ex){ + (*obj)->getChannel()->startSendRtp(MediaSource::NullMediaSource, args, [cb, user_data](uint16_t local_port, const SockException &ex){ if (cb) { cb(user_data, local_port, ex.getErrCode(), ex.what()); } @@ -277,5 +277,5 @@ API_EXPORT int API_CALL mk_media_stop_send_rtp(mk_media ctx, const char *ssrc){ assert(ctx); MediaHelper::Ptr *obj = (MediaHelper::Ptr *) ctx; //sender参数无用 - return (*obj)->getChannel()->stopSendRtp(*MediaSource::NullMediaSource, ssrc ? ssrc : ""); + return (*obj)->getChannel()->stopSendRtp(MediaSource::NullMediaSource, ssrc ? ssrc : ""); } \ No newline at end of file diff --git a/src/Common/MediaSource.cpp b/src/Common/MediaSource.cpp index 3437de93..8a27ba10 100644 --- a/src/Common/MediaSource.cpp +++ b/src/Common/MediaSource.cpp @@ -44,15 +44,17 @@ string getOriginTypeString(MediaOriginType type){ } static string getOriginUrl_l(const MediaSource *thiz) { - if (thiz == MediaSource::NullMediaSource) { - return ""; - } return thiz->getSchema() + "://" + thiz->getVhost() + "/" + thiz->getApp() + "/" + thiz->getId(); } ////////////////////////////////////////////////////////////////////////////////////////////////////////////// +struct MediaSourceNull : public MediaSource { + MediaSourceNull() : MediaSource("schema", "vhost", "app", "stream") {}; + int readerCount() override { return 0; } +}; -MediaSource * const MediaSource::NullMediaSource = nullptr; +static std::shared_ptr s_null = std::make_shared(); +MediaSource &MediaSource::NullMediaSource = *s_null; MediaSource::MediaSource(const string &schema, const string &vhost, const string &app, const string &stream_id){ GET_CONFIG(bool, enableVhost, General::kEnableVhost); diff --git a/src/Common/MediaSource.h b/src/Common/MediaSource.h index 1f249194..1ca816b8 100644 --- a/src/Common/MediaSource.h +++ b/src/Common/MediaSource.h @@ -235,7 +235,7 @@ private: */ class MediaSource: public TrackSource, public std::enable_shared_from_this { public: - static MediaSource * const NullMediaSource; + static MediaSource& NullMediaSource; using Ptr = std::shared_ptr; using StreamMap = std::unordered_map >; using AppStreamMap = std::unordered_map; diff --git a/src/Common/MultiMediaSourceMuxer.cpp b/src/Common/MultiMediaSourceMuxer.cpp index 939fc841..b76538df 100644 --- a/src/Common/MultiMediaSourceMuxer.cpp +++ b/src/Common/MultiMediaSourceMuxer.cpp @@ -78,7 +78,7 @@ static string getTrackInfoStr(const TrackSource *track_src){ MultiMediaSourceMuxer::MultiMediaSourceMuxer(const string &vhost, const string &app, const string &stream, float dur_sec, const ProtocolOption &option) { _option = option; _get_origin_url = [this, vhost, app, stream]() { - auto ret = getOriginUrl(*MediaSource::NullMediaSource); + auto ret = getOriginUrl(MediaSource::NullMediaSource); if (!ret.empty()) { return ret; } @@ -237,11 +237,14 @@ void MultiMediaSourceMuxer::startSendRtp(MediaSource &, const MediaSourceEvent:: auto ssrc = args.ssrc; rtp_sender->setOnClose([weak_self, ssrc]() { if (auto strong_self = weak_self.lock()) { - strong_self->_rtp_sender.erase(ssrc); WarnL << "stream:" << strong_self->_get_origin_url() << " stop send rtp:" << ssrc; + strong_self->_rtp_sender.erase(ssrc); + //触发观看人数统计 + strong_self->onReaderChanged(MediaSource::NullMediaSource, strong_self->totalReaderCount()); } }); strong_self->_rtp_sender[args.ssrc] = std::move(rtp_sender); + strong_self->onReaderChanged(MediaSource::NullMediaSource, strong_self->totalReaderCount()); }); #else cb(0, SockException(Err_other, "该功能未启用，编译时请打开ENABLE_RTPPROXY宏")); @@ -250,13 +253,10 @@ void MultiMediaSourceMuxer::startSendRtp(MediaSource &, const MediaSourceEvent:: bool MultiMediaSourceMuxer::stopSendRtp(MediaSource &sender, const string &ssrc) { #if defined(ENABLE_RTPPROXY) - std::unique_ptr token; - if (&sender != MediaSource::NullMediaSource) { - token.reset(new onceToken(nullptr, [&]() { - //关闭rtp推流，可能触发无人观看事件 - MediaSourceEventInterceptor::onReaderChanged(sender, totalReaderCount()); - })); - } + onceToken token(nullptr, [&]() { + //关闭rtp推流，可能触发无人观看事件 + onReaderChanged(sender, totalReaderCount()); + }); if (ssrc.empty()) { //关闭全部 auto size = _rtp_sender.size();