amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-10-31 16:47:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化参数以及参数命名

Browse Source
This commit is contained in:
xiongziliang 2018-07-02 16:00:55 +08:00
parent bca084d080
commit a078010f36
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Device/PlayerProxy.cpp
View File

@ -66,7 +66,7 @@ static uint8_t s_mute_adts[] = {0xff, 0xf1, 0x6c, 0x40, 0x2d, 0x3f, 0xfc, 0x00,
#define MUTE_ADTS_SAMPLE_RATE 8000 #define MUTE_ADTS_SAMPLE_RATE 8000
#define MUTE_ADTS_DATA s_mute_adts #define MUTE_ADTS_DATA s_mute_adts
#define MUTE_ADTS_DATA_LEN sizeof(s_mute_adts) #define MUTE_ADTS_DATA_LEN sizeof(s_mute_adts)
#define MUTE_ADTS_DATA_MS 120 #define MUTE_ADTS_DATA_MS 130
PlayerProxy::PlayerProxy(const char *strVhost, PlayerProxy::PlayerProxy(const char *strVhost,
const char *strApp, const char *strApp,

14
src/Rtsp/RtspPlayer.cpp
View File

@ -50,7 +50,7 @@ namespace Rtsp {
onRecvRTP_l(it->second, trackidx); \ onRecvRTP_l(it->second, trackidx); \
m_amapRtpSort[trackidx].erase(it); m_amapRtpSort[trackidx].erase(it);
const char kMd5Nonce[] = "md5_nonce"; const char kRtspMd5Nonce[] = "rtsp_md5_nonce";
const char kRtspRealm[] = "rtsp_realm"; const char kRtspRealm[] = "rtsp_realm";
RtspPlayer::RtspPlayer(void){ RtspPlayer::RtspPlayer(void){
@ -69,7 +69,7 @@ void RtspPlayer::teardown(){
shutdown(); shutdown();
} }
erase(kMd5Nonce); erase(kRtspMd5Nonce);
erase(kRtspRealm); erase(kRtspRealm);
m_uiTrackCnt = 0; m_uiTrackCnt = 0;
m_onHandshake = nullptr; m_onHandshake = nullptr;
@ -233,12 +233,12 @@ bool RtspPlayer::handleAuthenticationFailure(const string &paramsStr) {
if (sscanf(paramsStr.data(), "Digest realm=\"%[^\"]\", nonce=\"%[^\"]\", stale=%[a-zA-Z]", realm, nonce, stale) == 3) { if (sscanf(paramsStr.data(), "Digest realm=\"%[^\"]\", nonce=\"%[^\"]\", stale=%[a-zA-Z]", realm, nonce, stale) == 3) {
(*this)[kRtspRealm] = realm; (*this)[kRtspRealm] = realm;
(*this)[kMd5Nonce] = nonce; (*this)[kRtspMd5Nonce] = nonce;
return true; return true;
} }
if (sscanf(paramsStr.data(), "Digest realm=\"%[^\"]\", nonce=\"%[^\"]\"", realm, nonce) == 2) { if (sscanf(paramsStr.data(), "Digest realm=\"%[^\"]\", nonce=\"%[^\"]\"", realm, nonce) == 2) {
(*this)[kRtspRealm] = realm; (*this)[kRtspRealm] = realm;
(*this)[kMd5Nonce] = nonce; (*this)[kRtspMd5Nonce] = nonce;
return true; return true;
} }
if (sscanf(paramsStr.data(), "Basic realm=\"%[^\"]\"", realm) == 1) { if (sscanf(paramsStr.data(), "Basic realm=\"%[^\"]\"", realm) == 1) {
@ -711,7 +711,7 @@ bool RtspPlayer::sendRtspRequest(const string &cmd, const string &url,const StrC
} }
if(!(*this)[kRtspRealm].empty() && !(*this)[PlayerBase::kRtspUser].empty()){ if(!(*this)[kRtspRealm].empty() && !(*this)[PlayerBase::kRtspUser].empty()){
if(!(*this)[kMd5Nonce].empty()){ if(!(*this)[kRtspMd5Nonce].empty()){
//MD5认证 //MD5认证
/* /*
response计算方法如下： response计算方法如下：
@ -725,12 +725,12 @@ bool RtspPlayer::sendRtspRequest(const string &cmd, const string &url,const StrC
if(!(*this)[PlayerBase::kRtspPwdIsMD5].as<bool>()){ if(!(*this)[PlayerBase::kRtspPwdIsMD5].as<bool>()){
encrypted_pwd = MD5((*this)[PlayerBase::kRtspUser]+ ":" + (*this)[kRtspRealm] + ":" + encrypted_pwd).hexdigest(); encrypted_pwd = MD5((*this)[PlayerBase::kRtspUser]+ ":" + (*this)[kRtspRealm] + ":" + encrypted_pwd).hexdigest();
} }
auto response = MD5( encrypted_pwd + ":" + (*this)[kMd5Nonce] + ":" + MD5(cmd + ":" + url).hexdigest()).hexdigest(); auto response = MD5( encrypted_pwd + ":" + (*this)[kRtspMd5Nonce] + ":" + MD5(cmd + ":" + url).hexdigest()).hexdigest();
_StrPrinter printer; _StrPrinter printer;
printer << "Digest "; printer << "Digest ";
printer << "username=\"" << (*this)[PlayerBase::kRtspUser] << "\", "; printer << "username=\"" << (*this)[PlayerBase::kRtspUser] << "\", ";
printer << "realm=\"" << (*this)[kRtspRealm] << "\", "; printer << "realm=\"" << (*this)[kRtspRealm] << "\", ";
printer << "nonce=\"" << (*this)[kMd5Nonce] << "\", "; printer << "nonce=\"" << (*this)[kRtspMd5Nonce] << "\", ";
printer << "uri=\"" << url << "\", "; printer << "uri=\"" << url << "\", ";
printer << "response=\"" << response << "\""; printer << "response=\"" << response << "\"";
header.emplace("Authorization",printer); header.emplace("Authorization",printer);