Skip to content
Snippets Groups Projects
Commit f0594dad authored by Yun Liu's avatar Yun Liu
Browse files

Fix the codecs order problem

parent 39cdc076
No related branches found
No related tags found
No related merge requests found
...@@ -223,25 +223,25 @@ void SIPCall::sdpAddMediaDescription(pj_pool_t* pool) ...@@ -223,25 +223,25 @@ void SIPCall::sdpAddMediaDescription(pj_pool_t* pool)
med->desc.port = getLocalExternAudioPort(); med->desc.port = getLocalExternAudioPort();
med->desc.transport = pj_str((char*)"RTP/AVP"); med->desc.transport = pj_str((char*)"RTP/AVP");
CodecsMap::iterator itr; CodecOrder::iterator itr;
itr = _codecMap.getCodecsMap().begin();
int count = _codecMap.getCodecsNumber(); itr = _codecMap.getActiveCodecs().begin();
int count = _codecMap.getActiveCodecs().size();
med->desc.fmt_count = count; med->desc.fmt_count = count;
int i = 0; int i = 0;
while(itr != _codecMap.getCodecsMap().end()) { while(itr != _codecMap.getActiveCodecs().end()) {
std::ostringstream format; std::ostringstream format;
format << (*itr).first; format << *itr;
pj_strdup2(pool, &med->desc.fmt[i], format.str().data()); pj_strdup2(pool, &med->desc.fmt[i], format.str().data());
AudioCodec *codec = (*itr).second;
pjmedia_sdp_rtpmap rtpMap; pjmedia_sdp_rtpmap rtpMap;
rtpMap.pt = med->desc.fmt[i]; rtpMap.pt = med->desc.fmt[i];
rtpMap.enc_name = pj_str((char *)codec->getCodecName().data()); rtpMap.enc_name = pj_str((char *)_codecMap.getCodecName(*itr).data());
rtpMap.clock_rate = codec->getClockRate(); rtpMap.clock_rate = _codecMap.getSampleRate(*itr);
if(codec->getChannel() > 1) { if(_codecMap.getChannel(*itr) > 1) {
std::ostringstream channel; std::ostringstream channel;
channel << codec->getChannel(); channel << _codecMap.getChannel(*itr);
rtpMap.param = pj_str((char *)channel.str().data()); rtpMap.param = pj_str((char *)channel.str().data());
} else } else
rtpMap.param.slen = 0; rtpMap.param.slen = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment