From 3c8f96f2a1fdfc696511280411a3ef73998c8cfc Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Sat, 20 Jul 2019 20:53:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0rtsps=20rtmps=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/CMakeLists.txt     |  2 +-
 src/Player/PlayerBase.cpp | 11 +++++++++++
 src/Pusher/PusherBase.cpp | 11 +++++++++++
 src/Rtsp/RtspPlayer.h     |  9 +++++----
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index c591a376..5bc42a8d 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
 	file(GLOB MediaServer_src_list ./*.cpp ./*.h)
 endif()
 
-message(STATUS ${MediaServer_src_list})
+#message(STATUS ${MediaServer_src_list})
 
 add_executable(MediaServer ${MediaServer_src_list})
 
diff --git a/src/Player/PlayerBase.cpp b/src/Player/PlayerBase.cpp
index 9c517595..4de82c30 100644
--- a/src/Player/PlayerBase.cpp
+++ b/src/Player/PlayerBase.cpp
@@ -40,12 +40,23 @@ PlayerBase::Ptr PlayerBase::createPlayer(const EventPoller::Ptr &poller,const st
 		ptr->teardown();
 	};
 	string prefix = FindField(strUrl.data(), NULL, "://");
+
+	if (strcasecmp("rtsps",prefix.data()) == 0) {
+		return PlayerBase::Ptr(new TcpClientWithSSL<RtspPlayerImp>(poller),releasePlayer);
+	}
+
 	if (strcasecmp("rtsp",prefix.data()) == 0) {
 		return PlayerBase::Ptr(new RtspPlayerImp(poller),releasePlayer);
 	}
+
+	if (strcasecmp("rtmps",prefix.data()) == 0) {
+		return PlayerBase::Ptr(new TcpClientWithSSL<RtmpPlayerImp>(poller),releasePlayer);
+	}
+
 	if (strcasecmp("rtmp",prefix.data()) == 0) {
 		return PlayerBase::Ptr(new RtmpPlayerImp(poller),releasePlayer);
 	}
+
 	return PlayerBase::Ptr(new RtspPlayerImp(poller),releasePlayer);
 }
 
diff --git a/src/Pusher/PusherBase.cpp b/src/Pusher/PusherBase.cpp
index 47d7226e..a8f47d92 100644
--- a/src/Pusher/PusherBase.cpp
+++ b/src/Pusher/PusherBase.cpp
@@ -44,12 +44,23 @@ PusherBase::Ptr PusherBase::createPusher(const EventPoller::Ptr &poller,
         ptr->teardown();
     };
     string prefix = FindField(strUrl.data(), NULL, "://");
+
+    if (strcasecmp("rtsps",prefix.data()) == 0) {
+        return PusherBase::Ptr(new TcpClientWithSSL<RtspPusher>(poller,dynamic_pointer_cast<RtspMediaSource>(src)),releasePusher);
+    }
+
     if (strcasecmp("rtsp",prefix.data()) == 0) {
         return PusherBase::Ptr(new RtspPusher(poller,dynamic_pointer_cast<RtspMediaSource>(src)),releasePusher);
     }
+
+    if (strcasecmp("rtmps",prefix.data()) == 0) {
+        return PusherBase::Ptr(new TcpClientWithSSL<RtmpPusher>(poller,dynamic_pointer_cast<RtmpMediaSource>(src)),releasePusher);
+    }
+
     if (strcasecmp("rtmp",prefix.data()) == 0) {
         return PusherBase::Ptr(new RtmpPusher(poller,dynamic_pointer_cast<RtmpMediaSource>(src)),releasePusher);
     }
+
     return PusherBase::Ptr(new RtspPusher(poller,dynamic_pointer_cast<RtspMediaSource>(src)),releasePusher);
 }
 
diff --git a/src/Rtsp/RtspPlayer.h b/src/Rtsp/RtspPlayer.h
index 53b377a3..4023548b 100644
--- a/src/Rtsp/RtspPlayer.h
+++ b/src/Rtsp/RtspPlayer.h
@@ -93,6 +93,11 @@ protected:
      * @param uiLen
      */
     virtual void onRtcpPacket(int iTrackidx, SdpTrack::Ptr &track, unsigned char *pucData, unsigned int uiLen);
+
+	/////////////TcpClient override/////////////
+	void onConnect(const SockException &err) override;
+	void onRecv(const Buffer::Ptr &pBuf) override;
+	void onErr(const SockException &ex) override;
 private:
 	void onRecvRTP_l(const RtpPacket::Ptr &pRtppt, const SdpTrack::Ptr &track);
 	void onPlayResult_l(const SockException &ex);
@@ -102,10 +107,6 @@ private:
 	int getTrackIndexByTrackType(TrackType trackType) const;
 
 	void play(const string &strUrl, const string &strUser, const string &strPwd,  Rtsp::eRtpType eType);
-	void onConnect(const SockException &err) override;
-	void onRecv(const Buffer::Ptr &pBuf) override;
-	void onErr(const SockException &ex) override;
-
 	void handleResSETUP(const Parser &parser, unsigned int uiTrackIndex);
 	void handleResDESCRIBE(const Parser &parser);
 	bool handleAuthenticationFailure(const string &wwwAuthenticateParamsStr);