Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-26 03:42:21 +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/RtspSession.cpp
View File

@@ -481,11 +481,8 @@ inline void RtspSession::send_SessionNotFound() {
}
bool RtspSession::handleReq_Setup() {
//处理setup命令，该函数可能进入多次
//track id
int trackid = atoi( FindField( m_parser.Url().data(),
m_aTrackInfo[0].trackStyle.data(),
NULL).data());
int trackIdx = getTrackIndexByTrackId(trackid);
auto controlSuffix = m_parser.Url().substr(1 + m_parser.Url().find_last_of('/'));
int trackIdx = getTrackIndexByControlSuffix(controlSuffix);
if (trackIdx == -1) {
//未找到相应track
return false;
@@ -541,8 +538,8 @@ bool RtspSession::handleReq_Setup() {
"x-Dynamic-Rate: 1\r\n\r\n",
m_iCseq, SERVER_NAME,
RTSP_VERSION, RTSP_BUILDTIME,
dateHeader().data(), trackid * 2,
trackid * 2 + 1,
dateHeader().data(), trackRef.trackId * 2,
trackRef.trackId * 2 + 1,
printSSRC(trackRef.ssrc).data(),
m_strSession.data());
send(m_pcBuf, iLen);
@@ -609,7 +606,7 @@ bool RtspSession::handleReq_Setup() {
strongSelf->safeShutdown();
});
}
int iSrvPort = m_pBrdcaster->getPort(trackid);
int iSrvPort = m_pBrdcaster->getPort(trackRef.trackId);
//我们用trackIdx区分rtp和rtcp包
auto pSockRtcp = UDPServer::Instance().getSock(get_local_ip().data(),2*trackIdx + 1,iSrvPort + 1);
if (!pSockRtcp) {
@@ -734,9 +731,8 @@ bool RtspSession::handleReq_Play() {
shutdown();
return;
}
iLen += sprintf(m_pcBuf + iLen, "url=%s/%s%s;seq=%d;rtptime=%u,",
m_strUrl.data(), track.trackStyle.data(),
track.trackIdStr.data(), track.seq,track.timeStamp);
iLen += sprintf(m_pcBuf + iLen, "url=%s/%s;seq=%d;rtptime=%u,",
m_strUrl.data(), track.controlSuffix.data(), track.seq,track.timeStamp);
}
iLen -= 1;
(m_pcBuf)[iLen] = '\0';