From a391d1e2898f452a479f406a09befcffc55f5bd9 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Sat, 22 May 2021 09:25:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Drtsp=E6=8E=A8=E6=B5=81?=
 =?UTF-8?q?=E5=B8=A6=E5=8F=82=E7=9B=B8=E5=85=B3=E7=9A=84bug:#840?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Rtsp/RtspSession.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Rtsp/RtspSession.cpp b/src/Rtsp/RtspSession.cpp
index 4c413a6b..1c2a3e37 100644
--- a/src/Rtsp/RtspSession.cpp
+++ b/src/Rtsp/RtspSession.cpp
@@ -213,6 +213,7 @@ void RtspSession::handleReq_ANNOUNCE(const Parser &parser) {
     }
 
     auto full_url = parser.FullUrl();
+    _content_base = full_url;
     if(end_with(full_url,".sdp")){
         //去除.sdp后缀，防止EasyDarwin推流器强制添加.sdp后缀
         full_url = full_url.substr(0,full_url.length() - 4);
@@ -242,7 +243,7 @@ void RtspSession::handleReq_ANNOUNCE(const Parser &parser) {
     _push_src = std::make_shared<RtspMediaSourceImp>(_media_info._vhost, _media_info._app, _media_info._streamid);
     _push_src->setListener(dynamic_pointer_cast<MediaSourceEvent>(shared_from_this()));
     _push_src->setSdp(sdpParser.toString());
-    sendRtspResponse("200 OK",{"Content-Base", _content_base + "/"});
+    sendRtspResponse("200 OK");
 }
 
 void RtspSession::handleReq_RECORD(const Parser &parser){
@@ -614,7 +615,7 @@ void RtspSession::send_SessionNotFound() {
 
 void RtspSession::handleReq_Setup(const Parser &parser) {
     //处理setup命令，该函数可能进入多次
-    int trackIdx = getTrackIndexByControlUrl(parser.Url());
+    int trackIdx = getTrackIndexByControlUrl(parser.FullUrl());
     SdpTrack::Ptr &trackRef = _sdp_track[trackIdx];
     if (trackRef->_inited) {
         //已经初始化过该Track