Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-28 21:52:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

解决sdp解析失败的问题

Browse Source
This commit is contained in:
xiongziliang
2018-03-26 18:56:22 +08:00
parent 770651467e
commit 03507e5bfc
6 changed files with 72 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Rtsp/RtspPlayer.cpp
View File

@@ -261,21 +261,21 @@ inline void RtspPlayer::sendSetup(unsigned int trackIndex) {
auto &track = m_aTrackInfo[trackIndex];
switch (m_eType) {
case RTP_TCP: {
iLen = sprintf(acRtspbuf, "SETUP %s/%s%s RTSP/1.0\r\n"
iLen = sprintf(acRtspbuf, "SETUP %s/%s RTSP/1.0\r\n"
"CSeq: %d\r\n"
"Transport: RTP/AVP/TCP;unicast;interleaved=%d-%d\r\n"
"Authorization: Basic %s\r\n\r\n", m_strContentBase.c_str(),
track.trackStyle.c_str(), track.trackIdStr.data(), m_uiCseq++,
track.controlSuffix.c_str(), m_uiCseq++,
track.trackId * 2, track.trackId * 2 + 1,
m_strAuthorization.c_str());
}
break;
case RTP_MULTICAST: {
iLen = sprintf(acRtspbuf, "SETUP %s/%s%s RTSP/1.0\r\n"
iLen = sprintf(acRtspbuf, "SETUP %s/%s RTSP/1.0\r\n"
"CSeq: %d\r\n"
"Transport: RTP/AVP;multicast\r\n"
"Authorization: Basic %s\r\n\r\n", m_strContentBase.c_str(),
track.trackStyle.c_str(), track.trackIdStr.data(), m_uiCseq++,
track.controlSuffix.c_str(), m_uiCseq++,
m_strAuthorization.c_str());
}
break;
@@ -286,11 +286,11 @@ inline void RtspPlayer::sendSetup(unsigned int trackIndex) {
throw std::runtime_error("open udp sock err");
}
int port = m_apUdpSock[trackIndex]->get_local_port();
iLen = sprintf(acRtspbuf, "SETUP %s/%s%s RTSP/1.0\r\n"
iLen = sprintf(acRtspbuf, "SETUP %s/%s RTSP/1.0\r\n"
"CSeq: %d\r\n"
"Transport: RTP/AVP;unicast;client_port=%d-%d\r\n"
"Authorization: Basic %s\r\n\r\n", m_strContentBase.c_str(),
track.trackStyle.c_str(), track.trackIdStr.data(), m_uiCseq++, port,
track.controlSuffix.c_str(), m_uiCseq++, port,
port + 1, m_strAuthorization.c_str());
}
break;
@@ -456,12 +456,12 @@ void RtspPlayer::HandleResPAUSE(const Parser& parser, bool bPause) {
vector<string> vec = split(strRtpInfo, ",");
for(auto &strTrack : vec){
strTrack.append(";");
auto strTrackId = FindField(strTrack.data(), m_aTrackInfo[0].trackStyle.data(), ";");
auto strControlSuffix = strTrack.substr(1 + strTrack.find_last_of('/'),strTrack.find(';') - strTrack.find_last_of('/') - 1);
auto strRtpTime = FindField(strTrack.data(), "rtptime=", ";");
auto iIdx = getTrackIndex(atoi(strTrackId.data()));
auto iIdx = getTrackIndex(strControlSuffix);
m_adFistStamp[iIdx] = atoll(strRtpTime.data());
m_adNowStamp[iIdx] = m_adFistStamp[iIdx];
DebugL << "rtptime:" << strTrackId <<" " << strRtpTime;
DebugL << "rtptime:" << strControlSuffix <<" " << strRtpTime;
}
}
_onPlayResult(SockException(Err_success, "rtsp play success"));