From 1b95ed1c97019d262cdb0ec300a3bd0397a6e4ed Mon Sep 17 00:00:00 2001
From: xia-chu <771730766@qq.com>
Date: Fri, 27 Oct 2023 17:52:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96rtmp=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E5=99=A8url=E8=A7=A3=E6=9E=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Rtmp/RtmpPlayer.cpp | 21 +++++++++++----------
 src/Rtmp/RtmpPusher.cpp |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/Rtmp/RtmpPlayer.cpp b/src/Rtmp/RtmpPlayer.cpp
index 42914cda..13c0131b 100644
--- a/src/Rtmp/RtmpPlayer.cpp
+++ b/src/Rtmp/RtmpPlayer.cpp
@@ -52,17 +52,18 @@ void RtmpPlayer::teardown() {
 
 void RtmpPlayer::play(const string &url)  {
     teardown();
-    string host_url = findSubString(url.data(), "://", "/");
-    {
-        auto pos = url.find_last_of('/');
-        if (pos != string::npos) {
-            _stream_id = url.substr(pos + 1);
-        }
+    auto schema = findSubString(url.data(), nullptr, "://");
+    auto host_url = findSubString(url.data(), "://", "/");
+    _app = findSubString(url.data(), (host_url + "/").data(), "/");
+    _stream_id = findSubString(url.data(), (host_url + "/" + _app + "/").data(), NULL);
+    auto app_second = findSubString(_stream_id.data(), nullptr, "/");
+    if (!app_second.empty() && app_second.find('?') == std::string::npos) {
+        // _stream_id存在多级；不包含'?', 说明分割符'/'不是url参数的一部分
+        _app += "/" + app_second;
+        _stream_id.erase(0, app_second.size() + 1);
     }
-    _app = findSubString(url.data(), (host_url + "/").data(), ("/" + _stream_id).data());
-    _tc_url = string("rtmp://") + host_url + "/" + _app;
-
-    if (!_app.size() || !_stream_id.size()) {
+    _tc_url = schema + "://" + host_url + "/" + _app;
+    if (_app.empty() || _stream_id.empty()) {
         onPlayResult_l(SockException(Err_other, "rtmp url非法"), false);
         return;
     }
diff --git a/src/Rtmp/RtmpPusher.cpp b/src/Rtmp/RtmpPusher.cpp
index 1569d30b..c48f3820 100644
--- a/src/Rtmp/RtmpPusher.cpp
+++ b/src/Rtmp/RtmpPusher.cpp
@@ -73,7 +73,7 @@ void RtmpPusher::publish(const string &url) {
     if (!app_second.empty() && app_second.find('?') == std::string::npos) {
         // _stream_id存在多级；不包含'?', 说明分割符'/'不是url参数的一部分
         _app += "/" + app_second;
-        _stream_id.erase(0, app_second.size());
+        _stream_id.erase(0, app_second.size() + 1);
     }
     _tc_url = schema + "://" + host_url + "/" + _app;
     if (_app.empty() || _stream_id.empty()) {