amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

兼容sdp不规范的rtsp流

Browse Source
This commit is contained in:
xia-chu 2021-02-28 21:02:23 +08:00
parent 6548f7959f
commit 9b7c9b9109
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Rtsp/Rtsp.cpp
View File

@ -188,7 +188,7 @@ void SdpParser::load(const string &sdp) {
char rtp[16] = {0}, type[16]; char rtp[16] = {0}, type[16];
if (4 == sscanf(opt_val.data(), " %15[^ ] %d %15[^ ] %d", type, &port, rtp, &pt)) { if (4 == sscanf(opt_val.data(), " %15[^ ] %d %15[^ ] %d", type, &port, rtp, &pt)) {
track->_pt = pt; track->_pt = pt;
track->_samplerate = RtpPayload::getClockRate(pt) ; track->_samplerate = RtpPayload::getClockRate(pt);
track->_channel = RtpPayload::getAudioChannel(pt); track->_channel = RtpPayload::getAudioChannel(pt);
track->_type = toTrackType(type); track->_type = toTrackType(type);
track->_m = opt_val; track->_m = opt_val;
@ -223,14 +223,14 @@ void SdpParser::load(const string &sdp) {
if (strcmp(start, "now") == 0) { if (strcmp(start, "now") == 0) {
strcpy(start, "0"); strcpy(start, "0");
} }
track._start = (float)atof(start); track._start = (float) atof(start);
track._end = (float)atof(end); track._end = (float) atof(end);
track._duration = track._end - track._start; track._duration = track._end - track._start;
} }
} }
it = track._attr.find("rtpmap"); it = track._attr.find("rtpmap");
if(it != track._attr.end()){ if (it != track._attr.end()) {
auto rtpmap = it->second; auto rtpmap = it->second;
int pt, samplerate, channel; int pt, samplerate, channel;
char codec[16] = {0}; char codec[16] = {0};
@ -239,20 +239,24 @@ void SdpParser::load(const string &sdp) {
track._codec = codec; track._codec = codec;
track._samplerate = samplerate; track._samplerate = samplerate;
track._channel = channel; track._channel = channel;
}else if (3 == sscanf(rtpmap.data(), "%d %15[^/]/%d", &pt, codec, &samplerate)) { } else if (3 == sscanf(rtpmap.data(), "%d %15[^/]/%d", &pt, codec, &samplerate)) {
track._pt = pt; track._pt = pt;
track._codec = codec; track._codec = codec;
track._samplerate = samplerate; track._samplerate = samplerate;
} }
if (!track._samplerate && track._type == TrackVideo) {
//未设置视频采样率时，赋值为90000
track._samplerate = 90000;
}
} }
it = track._attr.find("fmtp"); it = track._attr.find("fmtp");
if(it != track._attr.end()) { if (it != track._attr.end()) {
track._fmtp = it->second; track._fmtp = it->second;
} }
it = track._attr.find("control"); it = track._attr.find("control");
if(it != track._attr.end()) { if (it != track._attr.end()) {
track._control = it->second; track._control = it->second;
} }
} }