sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug with applying the end result of the codec negotiation to the Asterisk channel. 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389567 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp 2013-05-23 18:19:27 +00:00
parent 9d742946db
commit 7f43acc49c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/res_sip_sdp_rtp.c
View File

@ -224,11 +224,11 @@ static int set_caps(struct ast_sip_session *session, struct ast_sip_session_medi
if (session->channel) {
ast_format_cap_copy(caps, ast_channel_nativeformats(session->channel));
ast_format_cap_remove_bytype(caps, media_type);
ast_format_cap_append(caps, joint);
ast_codec_choose(&session->endpoint->prefs, joint, 1, &fmt);
ast_format_cap_add(caps, &fmt);
/* Apply the new formats to the channel, potentially changing read/write formats while doing so */
ast_format_cap_append(ast_channel_nativeformats(session->channel), caps);
ast_codec_choose(&session->endpoint->prefs, caps, 0, &fmt);
ast_format_cap_copy(ast_channel_nativeformats(session->channel), caps);
ast_format_copy(ast_channel_rawwriteformat(session->channel), &fmt);
ast_format_copy(ast_channel_rawreadformat(session->channel), &fmt);
ast_set_read_format(session->channel, ast_channel_readformat(session->channel));