From 57a11f19dda5f835f270526444bb91b688b9130e Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Sat, 7 Nov 2020 17:45:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E9=AB=98rtsp=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=80=A7:=20#551?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Rtsp/RtspPlayer.cpp | 3 +++ src/Rtsp/RtspPusher.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/Rtsp/RtspPlayer.cpp b/src/Rtsp/RtspPlayer.cpp index 747de9e5..de3aa0d8 100644 --- a/src/Rtsp/RtspPlayer.cpp +++ b/src/Rtsp/RtspPlayer.cpp @@ -223,6 +223,9 @@ void RtspPlayer::sendSetup(unsigned int track_idx) { _on_response = std::bind(&RtspPlayer::handleResSETUP, this, placeholders::_1, track_idx); auto &track = _sdp_track[track_idx]; auto baseUrl = _content_base + "/" + track->_control_surffix; + if (track->_control.find("://") != string::npos) { + baseUrl = track->_control; + } switch (_rtp_type) { case Rtsp::RTP_TCP: { sendRtspRequest("SETUP",baseUrl,{"Transport",StrPrinter << "RTP/AVP/TCP;unicast;interleaved=" << track->_type * 2 << "-" << track->_type * 2 + 1}); diff --git a/src/Rtsp/RtspPusher.cpp b/src/Rtsp/RtspPusher.cpp index 0172ca5b..dd7ef315 100644 --- a/src/Rtsp/RtspPusher.cpp +++ b/src/Rtsp/RtspPusher.cpp @@ -239,6 +239,9 @@ void RtspPusher::sendSetup(unsigned int track_idx) { _on_res_func = std::bind(&RtspPusher::handleResSetup, this, placeholders::_1, track_idx); auto &track = _track_vec[track_idx]; auto base_url = _content_base + "/" + track->_control_surffix; + if (track->_control.find("://") != string::npos) { + base_url = track->_control; + } switch (_rtp_type) { case Rtsp::RTP_TCP: { sendRtspRequest("SETUP", base_url, {"Transport",