1、复用rtsp url解析代码

2、修复rtsp/rtmp推流异常回调紊乱的问题

src/Rtmp/RtmpPusher.cpp

@@ -60,8 +60,8 @@ void RtmpPusher::teardown() {
 	}
 }
 
-void RtmpPusher::onPublishResult(const SockException &ex) {
+void RtmpPusher::onPublishResult(const SockException &ex,bool handshakeCompleted) {
-	if(_pPublishTimer){
+	if(!handshakeCompleted){
 		//播放结果回调
 		_pPublishTimer.reset();
 		if(_onPublished){
@@ -87,7 +87,7 @@ void RtmpPusher::publish(const string &strUrl)  {
     _strTcUrl = string("rtmp://") + strHost + "/" + _strApp;
 
     if (!_strApp.size() || !_strStream.size()) {
-        onPublishResult(SockException(Err_other,"rtmp url非法"));
+        onPublishResult(SockException(Err_other,"rtmp url非法"),false);
         return;
     }
 	DebugL << strHost << " " << _strApp << " " << _strStream;
@@ -102,13 +102,13 @@ void RtmpPusher::publish(const string &strUrl)  {
 	}
 
     weak_ptr<RtmpPusher> weakSelf = dynamic_pointer_cast<RtmpPusher>(shared_from_this());
-    float playTimeOutSec = (*this)[kTimeoutMS].as<int>() / 1000.0;
+    float publishTimeOutSec = (*this)[kTimeoutMS].as<int>() / 1000.0;
-    _pPublishTimer.reset( new Timer(playTimeOutSec,  [weakSelf]() {
+    _pPublishTimer.reset( new Timer(publishTimeOutSec,  [weakSelf]() {
         auto strongSelf=weakSelf.lock();
         if(!strongSelf) {
             return false;
         }
-        strongSelf->onPublishResult(SockException(Err_timeout,"publish rtmp timeout"));
+        strongSelf->onPublishResult(SockException(Err_timeout,"publish rtmp timeout"), false);
         return false;
     },getPoller()));
 
@@ -120,11 +120,12 @@ void RtmpPusher::publish(const string &strUrl)  {
 }
 
 void RtmpPusher::onErr(const SockException &ex){
-	onPublishResult(ex);
+	//定时器_pPublishTimer为空后表明握手结束了
+	onPublishResult(ex,!_pPublishTimer);
 }
 void RtmpPusher::onConnect(const SockException &err){
 	if(err) {
-		onPublishResult(err);
+		onPublishResult(err,false);
 		return;
 	}
 	//推流器不需要多大的接收缓存，节省内存占用
@@ -146,7 +147,8 @@ void RtmpPusher::onRecv(const Buffer::Ptr &pBuf){
 		onParseRtmp(pBuf->data(), pBuf->size());
 	} catch (exception &e) {
 		SockException ex(Err_other, e.what());
-		onPublishResult(ex);
+		//定时器_pPublishTimer为空后表明握手结束了
+		onPublishResult(ex,!_pPublishTimer);
 	}
 }
 
@@ -223,10 +225,10 @@ inline void RtmpPusher::send_metaData(){
     _pRtmpReader->setDetachCB([weakSelf](){
         auto strongSelf = weakSelf.lock();
         if(strongSelf){
-            strongSelf->onPublishResult(SockException(Err_other,"媒体源被释放"));
+            strongSelf->onPublishResult(SockException(Err_other,"媒体源被释放"), !strongSelf->_pPublishTimer);
         }
     });
-    onPublishResult(SockException(Err_success,"success"));
+    onPublishResult(SockException(Err_success,"success"), false);
 	//提升发送性能
 	setSocketFlags();
 }

src/Rtmp/RtmpPusher.h

@@ -63,7 +63,7 @@ protected:
 		send(buffer);
 	}
 private:
-	void onPublishResult(const SockException &ex);
+	void onPublishResult(const SockException &ex,bool handshakeCompleted);
 
 	template<typename FUN>
 	inline void addOnResultCB(const FUN &fun) {

src/Rtsp/Rtsp.cpp

@@ -242,5 +242,58 @@ string SdpParser::toString() const {
 	return title + video + audio;
 }
 
+bool RtspUrl::parse(const string &strUrl) {
+	auto schema = FindField(strUrl.data(), nullptr, "://");
+	bool isSSL = strcasecmp(schema.data(), "rtsps") == 0;
+	//查找"://"与"/"之间的字符串，用于提取用户名密码
+	auto middle_url = FindField(strUrl.data(), "://", "/");
+	if (middle_url.empty()) {
+		middle_url = FindField(strUrl.data(), "://", nullptr);
+	}
+	auto pos = middle_url.rfind('@');
+	if (pos == string::npos) {
+		//并没有用户名密码
+		return setup(isSSL, strUrl, "", "");
+	}
+
+	//包含用户名密码
+	auto user_pwd = middle_url.substr(0, pos);
+	auto suffix = strUrl.substr(schema.size() + 3 + pos + 1);
+	auto url = StrPrinter << "rtsp://" << suffix << endl;
+	if (user_pwd.find(":") == string::npos) {
+		return setup(isSSL, url, user_pwd, "");
+	}
+	auto user = FindField(user_pwd.data(), nullptr, ":");
+	auto pwd = FindField(user_pwd.data(), ":", nullptr);
+	return setup(isSSL, url, user, pwd);
+}
+
+bool RtspUrl::setup(bool isSSL, const string &strUrl, const string &strUser, const string &strPwd) {
+	auto ip = FindField(strUrl.data(), "://", "/");
+	if (ip.empty()) {
+		ip = split(FindField(strUrl.data(), "://", NULL), "?")[0];
+	}
+	auto port = atoi(FindField(ip.data(), ":", NULL).data());
+	if (port <= 0 || port > UINT16_MAX) {
+		//rtsp 默认端口554
+		port = isSSL ? 322 : 554;
+	} else {
+		//服务器域名
+		ip = FindField(ip.data(), NULL, ":");
+	}
+
+	if (ip.empty()) {
+		return false;
+	}
+
+	_url = std::move(strUrl);
+	_user = std::move(strUser);
+	_passwd = std::move(strPwd);
+	_host = std::move(ip);
+	_port = port;
+	_is_ssl = isSSL;
+	return true;
+}
+
 }//namespace mediakit
 

src/Rtsp/Rtsp.h

@@ -125,6 +125,24 @@ private:
 	map<string, SdpTrack::Ptr> _track_map;
 };
 
+/**
+ * 解析rtsp url的工具类
+ */
+class RtspUrl{
+public:
+	string _url;
+	string _user;
+	string _passwd;
+	string _host;
+	uint16_t _port;
+	bool _is_ssl;
+public:
+	RtspUrl() = default;
+	~RtspUrl() = default;
+	bool parse(const string &url);
+private:
+	bool setup(bool,const string &, const string &, const string &);
+};
 
 /**
 * rtsp sdp基类

src/Rtsp/RtspPlayer.cpp

@@ -81,70 +81,25 @@ void RtspPlayer::teardown(){
 }
 
 void RtspPlayer::play(const string &strUrl){
-	Rtsp::eRtpType eType = (Rtsp::eRtpType)(int)(*this)[kRtpType];
+	RtspUrl url;
-	auto schema = FindField(strUrl.data(), nullptr,"://");
+	if(!url.parse(strUrl)){
-	bool isSSL = strcasecmp(schema.data(),"rtsps") == 0;
-	//查找"://"与"/"之间的字符串，用于提取用户名密码
-	auto middle_url = FindField(strUrl.data(),"://","/");
-	if(middle_url.empty()){
-		middle_url = FindField(strUrl.data(),"://", nullptr);
-	}
-    auto pos = middle_url.rfind('@');
-	if(pos == string::npos){
-        //并没有用户名密码
-        play(isSSL,strUrl,"","",eType);
-        return;
-	}
-
-    //包含用户名密码
-    auto user_pwd = middle_url.substr(0,pos);
-	auto suffix = strUrl.substr(schema.size() + 3 + pos + 1);
-	auto url = StrPrinter << "rtsp://" << suffix << endl;
-	if(user_pwd.find(":") == string::npos){
-		play(isSSL,url,user_pwd,"",eType);
-		return;
-	}
-	auto user = FindField(user_pwd.data(),nullptr,":");
-	auto pwd = FindField(user_pwd.data(),":",nullptr);
-	play(isSSL,url,user,pwd,eType);
-}
-
-void RtspPlayer::play(bool isSSL,const string &strUrl, const string &strUser, const string &strPwd,  Rtsp::eRtpType eType ) {
-	DebugL  << strUrl << " "
-			<< (strUser.size() ? strUser : "null") << " "
-			<< (strPwd.size() ? strPwd:"null") << " "
-			<< eType;
-	teardown();
-
-	if(strUser.size()){
-        (*this)[kRtspUser] = strUser;
-    }
-    if(strPwd.size()){
-        (*this)[kRtspPwd] = strPwd;
-		(*this)[kRtspPwdIsMD5] = false;
-    }
-
-	_eType = eType;
-
-	auto ip = FindField(strUrl.data(), "://", "/");
-	if (ip.empty()) {
-		ip = split(FindField(strUrl.data(), "://", NULL),"?")[0];
-	}
-	auto port = atoi(FindField(ip.data(), ":", NULL).data());
-	if (port <= 0) {
-		//rtsp 默认端口554
-		port = isSSL ? 322 : 554;
-	} else {
-		//服务器域名
-		ip = FindField(ip.data(), NULL, ":");
-	}
-
-	if(ip.empty()){
 		onPlayResult_l(SockException(Err_other,StrPrinter << "illegal rtsp url:" << strUrl),false);
 		return;
 	}
 
-	_strUrl = strUrl;
+	teardown();
+
+	if (url._user.size()) {
+		(*this)[kRtspUser] = url._user;
+	}
+	if (url._passwd.size()) {
+		(*this)[kRtspPwd] = url._passwd;
+		(*this)[kRtspPwdIsMD5] = false;
+	}
+
+	_strUrl = url._url;
+	_eType = (Rtsp::eRtpType)(int)(*this)[kRtpType];
+	DebugL << url._url << " " << (url._user.size() ? url._user : "null") << " " << (url._passwd.size() ? url._passwd : "null") << " " << _eType;
 
 	weak_ptr<RtspPlayer> weakSelf = dynamic_pointer_cast<RtspPlayer>(shared_from_this());
 	float playTimeOutSec = (*this)[kTimeoutMS].as<int>() / 1000.0;
@@ -160,8 +115,9 @@ void RtspPlayer::play(bool isSSL,const string &strUrl, const string &strUser, co
 	if(!(*this)[kNetAdapter].empty()){
 		setNetAdapter((*this)[kNetAdapter]);
 	}
-	startConnect(ip, port , playTimeOutSec);
+	startConnect(url._host, url._port, playTimeOutSec);
 }
+
 void RtspPlayer::onConnect(const SockException &err){
 	if(err.getErrCode() != Err_success) {
 		onPlayResult_l(err,false);

src/Rtsp/RtspPlayer.h

@@ -106,7 +106,6 @@ private:
     int getTrackIndexByInterleaved(int interleaved) const;
 	int getTrackIndexByTrackType(TrackType trackType) const;
 
-	void play(bool isSSL,const string &strUrl, const string &strUser, const string &strPwd,  Rtsp::eRtpType eType);
 	void handleResSETUP(const Parser &parser, unsigned int uiTrackIndex);
 	void handleResDESCRIBE(const Parser &parser);
 	bool handleAuthenticationFailure(const string &wwwAuthenticateParamsStr);

src/Rtsp/RtspPusher.cpp

@@ -43,25 +43,46 @@ void RtspPusher::teardown() {
 }
 
 void RtspPusher::publish(const string &strUrl) {
-    auto userAndPwd = FindField(strUrl.data(),"://","@");
+    RtspUrl url;
-    Rtsp::eRtpType eType = (Rtsp::eRtpType)(int)(*this)[ kRtpType];
+    if(!url.parse(strUrl)){
-    if(userAndPwd.empty()){
+        onPublishResult(SockException(Err_other,StrPrinter << "illegal rtsp url:" << strUrl),false);
-        publish(strUrl,"","",eType);
         return;
     }
-    auto suffix = FindField(strUrl.data(),"@",nullptr);
+
-    auto url = StrPrinter << "rtsp://" << suffix << endl;
+    teardown();
-    if(userAndPwd.find(":") == string::npos){
+
-        publish(url,userAndPwd,"",eType);
+    if (url._user.size()) {
-        return;
+        (*this)[kRtspUser] = url._user;
     }
-    auto user = FindField(userAndPwd.data(),nullptr,":");
+    if (url._passwd.size()) {
-    auto pwd = FindField(userAndPwd.data(),":",nullptr);
+        (*this)[kRtspPwd] = url._passwd;
-    publish(url,user,pwd,eType);
+        (*this)[kRtspPwdIsMD5] = false;
+    }
+
+    _strUrl = strUrl;
+    _eType = (Rtsp::eRtpType)(int)(*this)[kRtpType];
+    DebugL << url._url << " " << (url._user.size() ? url._user : "null") << " " << (url._passwd.size() ? url._passwd : "null") << " " << _eType;
+
+    weak_ptr<RtspPusher> weakSelf = dynamic_pointer_cast<RtspPusher>(shared_from_this());
+    float publishTimeOutSec = (*this)[kTimeoutMS].as<int>() / 1000.0;
+    _pPublishTimer.reset( new Timer(publishTimeOutSec,  [weakSelf]() {
+        auto strongSelf=weakSelf.lock();
+        if(!strongSelf) {
+            return false;
+        }
+        strongSelf->onPublishResult(SockException(Err_timeout,"publish rtsp timeout"),false);
+        return false;
+    },getPoller()));
+
+    if(!(*this)[kNetAdapter].empty()){
+        setNetAdapter((*this)[kNetAdapter]);
+    }
+
+    startConnect(url._host, url._port, publishTimeOutSec);
 }
 
-void RtspPusher::onPublishResult(const SockException &ex) {
+void RtspPusher::onPublishResult(const SockException &ex, bool handshakeCompleted) {
-    if(_pPublishTimer){
+    if(!handshakeCompleted){
         //播放结果回调
         _pPublishTimer.reset();
         if(_onPublished){
@@ -79,62 +100,14 @@ void RtspPusher::onPublishResult(const SockException &ex) {
     }
 }
 
-void RtspPusher::publish(const string & strUrl, const string &strUser, const string &strPwd,  Rtsp::eRtpType eType ) {
-    DebugL   << strUrl << " "
-             << (strUser.size() ? strUser : "null") << " "
-             << (strPwd.size() ? strPwd:"null") << " "
-             << eType;
-    teardown();
-
-    if(strUser.size()){
-        (*this)[kRtspUser] = strUser;
-    }
-    if(strPwd.size()){
-        (*this)[kRtspPwd] = strPwd;
-        (*this)[kRtspPwdIsMD5] = false;
-    }
-
-    _eType = eType;
-
-    auto ip = FindField(strUrl.data(), "://", "/");
-    if (!ip.size()) {
-        ip = FindField(strUrl.data(), "://", NULL);
-    }
-    auto port = atoi(FindField(ip.data(), ":", NULL).data());
-    if (port <= 0) {
-        //rtsp 默认端口554
-        port = 554;
-    } else {
-        //服务器域名
-        ip = FindField(ip.data(), NULL, ":");
-    }
-
-    _strUrl = strUrl;
-
-    weak_ptr<RtspPusher> weakSelf = dynamic_pointer_cast<RtspPusher>(shared_from_this());
-    float playTimeOutSec = (*this)[kTimeoutMS].as<int>() / 1000.0;
-    _pPublishTimer.reset( new Timer(playTimeOutSec,  [weakSelf]() {
-        auto strongSelf=weakSelf.lock();
-        if(!strongSelf) {
-            return false;
-        }
-        strongSelf->onPublishResult(SockException(Err_timeout,"publish rtsp timeout"));
-        return false;
-    },getPoller()));
-
-    if(!(*this)[kNetAdapter].empty()){
-        setNetAdapter((*this)[kNetAdapter]);
-    }
-    startConnect(ip, port , playTimeOutSec);
-}
-
 void RtspPusher::onErr(const SockException &ex) {
-    onPublishResult(ex);
+    //定时器_pPublishTimer为空后表明握手结束了
+    onPublishResult(ex,!_pPublishTimer);
 }
 
 void RtspPusher::onConnect(const SockException &err) {
     if(err) {
-        onPublishResult(err);
+        onPublishResult(err,false);
         return;
     }
     //推流器不需要多大的接收缓存，节省内存占用
@@ -147,7 +120,8 @@ void RtspPusher::onRecv(const Buffer::Ptr &pBuf){
         input(pBuf->data(), pBuf->size());
     } catch (exception &e) {
         SockException ex(Err_other, e.what());
-        onPublishResult(ex);
+        //定时器_pPublishTimer为空后表明握手结束了
+        onPublishResult(ex,!_pPublishTimer);
     }
 }
 
@@ -377,7 +351,7 @@ void RtspPusher::sendRecord() {
         _pRtspReader->setDetachCB([weakSelf](){
             auto strongSelf = weakSelf.lock();
             if(strongSelf){
-                strongSelf->onPublishResult(SockException(Err_other,"媒体源被释放"));
+                strongSelf->onPublishResult(SockException(Err_other,"媒体源被释放"), !strongSelf->_pPublishTimer);
             }
         });
         if(_eType != Rtsp::RTP_TCP){
@@ -392,7 +366,7 @@ void RtspPusher::sendRecord() {
                 return true;
             },getPoller()));
         }
-        onPublishResult(SockException(Err_success,"success"));
+        onPublishResult(SockException(Err_success,"success"), false);
         //提升发送性能
         setSocketFlags();
     };

src/Rtsp/RtspPusher.h

@@ -48,8 +48,7 @@ protected:
     void onWholeRtspPacket(Parser &parser) override ;
     void onRtpPacket(const char *data,uint64_t len) override {};
 private:
-    void publish(const string &strUrl, const string &strUser, const string &strPwd,  Rtsp::eRtpType eType );
+    void onPublishResult(const SockException &ex, bool handshakeCompleted);
-    void onPublishResult(const SockException &ex);
 
     void sendAnnounce();
     void sendSetup(unsigned int uiTrackIndex);