kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res/res_pjsip: Add preferred_codec_only config to pjsip endpoint."

Browse Source
This commit is contained in:
zuul
2016-09-09 13:56:16 -05:00
committed by Gerrit Code Review
parent 901e612739 2a50c29101
commit 9d54dd04bb
8 changed files with 63 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/res_pjsip_session.c
View File

@@ -1252,7 +1252,9 @@ int ast_sip_session_create_invite(struct ast_sip_session *session, pjsip_tx_data
pjsip_inv_set_local_sdp(session->inv_session, offer);
pjmedia_sdp_neg_set_prefer_remote_codec_order(session->inv_session->neg, PJ_FALSE);
#ifdef PJMEDIA_SDP_NEG_ANSWER_MULTIPLE_CODECS
pjmedia_sdp_neg_set_answer_multiple_codecs(session->inv_session->neg, PJ_TRUE);
if (!session->endpoint->preferred_codec_only) {
pjmedia_sdp_neg_set_answer_multiple_codecs(session->inv_session->neg, PJ_TRUE);
}
#endif
/*
@@ -2156,7 +2158,9 @@ static int new_invite(void *data)
pjsip_inv_set_local_sdp(invite->session->inv_session, local);
pjmedia_sdp_neg_set_prefer_remote_codec_order(invite->session->inv_session->neg, PJ_FALSE);
#ifdef PJMEDIA_SDP_NEG_ANSWER_MULTIPLE_CODECS
pjmedia_sdp_neg_set_answer_multiple_codecs(invite->session->inv_session->neg, PJ_TRUE);
if (!invite->session->endpoint->preferred_codec_only) {
pjmedia_sdp_neg_set_answer_multiple_codecs(invite->session->inv_session->neg, PJ_TRUE);
}
#endif
}