From 24db0454a81300f1fe0dd6f256bedcd0677d5b10 Mon Sep 17 00:00:00 2001 From: ziyue <1213642868@qq.com> Date: Fri, 29 Jul 2022 17:31:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=E7=9A=84=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E7=9B=B4=E6=8E=A5=E6=8A=9B=E5=BC=82=E5=B8=B8,=20?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E9=9D=9E=E6=B3=95=E6=8E=A8=E6=8B=89=E6=B5=81?= =?UTF-8?q?=EF=BC=9A#1725?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Player/PlayerBase.cpp | 3 +-- src/Pusher/PusherBase.cpp | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Player/PlayerBase.cpp b/src/Player/PlayerBase.cpp index aa2a8720..9fb6843d 100644 --- a/src/Player/PlayerBase.cpp +++ b/src/Player/PlayerBase.cpp @@ -56,10 +56,9 @@ PlayerBase::Ptr PlayerBase::createPlayer(const EventPoller::Ptr &poller, const s } else if (end_with(url, ".ts") || end_with(url_in, ".ts")) { return PlayerBase::Ptr(new TsPlayerImp(poller), releasePlayer); } - return PlayerBase::Ptr(new TsPlayerImp(poller), releasePlayer); } - return PlayerBase::Ptr(new RtspPlayerImp(poller), releasePlayer); + throw std::invalid_argument("not supported play schema:" + url_in); } PlayerBase::PlayerBase() { diff --git a/src/Pusher/PusherBase.cpp b/src/Pusher/PusherBase.cpp index 6d195117..fa0d68e8 100644 --- a/src/Pusher/PusherBase.cpp +++ b/src/Pusher/PusherBase.cpp @@ -19,14 +19,14 @@ namespace mediakit { PusherBase::Ptr PusherBase::createPusher(const EventPoller::Ptr &poller, const MediaSource::Ptr &src, - const std::string & strUrl) { + const std::string & url) { static auto releasePusher = [](PusherBase *ptr){ onceToken token(nullptr,[&](){ delete ptr; }); ptr->teardown(); }; - std::string prefix = FindField(strUrl.data(), NULL, "://"); + std::string prefix = FindField(url.data(), NULL, "://"); if (strcasecmp("rtsps",prefix.data()) == 0) { return PusherBase::Ptr(new TcpClientWithSSL(poller, std::dynamic_pointer_cast(src)), releasePusher); @@ -44,7 +44,7 @@ PusherBase::Ptr PusherBase::createPusher(const EventPoller::Ptr &poller, return PusherBase::Ptr(new RtmpPusherImp(poller, std::dynamic_pointer_cast(src)), releasePusher); } - return PusherBase::Ptr(new RtspPusherImp(poller, std::dynamic_pointer_cast(src)), releasePusher); + throw std::invalid_argument("not supported push schema:" + url); } PusherBase::PusherBase() {