From f79475f700e1524bb3a07aa1b833d78b49cd71c4 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Mon, 26 Mar 2018 22:15:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=80=E4=BA=9B=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=9A=84=E5=85=BC=E5=AE=B9=E6=80=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZLToolKit               |  2 +-
 src/Rtsp/RtspPlayer.cpp | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ZLToolKit b/ZLToolKit
index 378e0503..d01d8882 160000
--- a/ZLToolKit
+++ b/ZLToolKit
@@ -1 +1 @@
-Subproject commit 378e05030f5faef37612d9cb69adb70a222b0a9d
+Subproject commit d01d88829a033b49dc3cfdb4418cf1b8225af68a
diff --git a/src/Rtsp/RtspPlayer.cpp b/src/Rtsp/RtspPlayer.cpp
index 7d4be327..249c40d3 100644
--- a/src/Rtsp/RtspPlayer.cpp
+++ b/src/Rtsp/RtspPlayer.cpp
@@ -63,7 +63,10 @@ void RtspPlayer::teardown(){
 	if (alive()) {
 		write("TEARDOWN %s RTSP/1.0\r\n"
 				"CSeq: %d\r\n"
-				"Session: %s\r\n\r\n", m_strContentBase.c_str(), m_uiCseq++,
+                "Authorization: Basic %s\r\n"
+                "Session: %s\r\n\r\n",
+                m_strContentBase.c_str(), m_uiCseq++,
+                m_strAuthorization.c_str(),
 				m_strSession.c_str());
 
 		m_uiTrackCnt = 0;
@@ -399,8 +402,11 @@ bool RtspPlayer::sendOptions() {
 	};
 	return -1 != write(	"OPTIONS %s RTSP/1.0\r\n"
 						"CSeq: %d\r\n"
+                        "Authorization: Basic %s\r\n"
 						"Session: %s\r\n\r\n",
-						m_strContentBase.c_str(), m_uiCseq++, m_strSession.c_str());
+						m_strContentBase.c_str(), m_uiCseq++,
+                        m_strAuthorization.c_str(),
+                        m_strSession.c_str());
 }
 inline void RtspPlayer::sendPause(bool bPause,float fTime){
     //开启或暂停rtsp
@@ -408,9 +414,10 @@ inline void RtspPlayer::sendPause(bool bPause,float fTime){
     write("%s %s RTSP/1.0\r\n"
           "CSeq: %d\r\n"
           "Session: %s\r\n"
+          "Authorization: Basic %s\r\n"
           "Range: npt=%.2f-\r\n\r\n", bPause ? "PAUSE" : "PLAY",
           m_strContentBase.c_str(), m_uiCseq++,
-          m_strSession.c_str(),fTime);
+          m_strSession.c_str(),m_strAuthorization.c_str(),fTime);
     
     if(!bPause){
         //修改时间轴