diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-09-09 13:56:16 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-09-09 13:56:16 -0500 |
| commit | 9d54dd04bbdad6849aee77536ab12c5fa6620680 (patch) | |
| tree | 16042126c4d0eac8d8308a8d18b3b4f776c12f41 /res/res_pjsip_session.c | |
| parent | 901e612739e6067c4d51656f35c49f005534f1de (diff) | |
| parent | 2a50c2910144e1b4095d171b1386fd5ebb0c5b5a (diff) | |
Merge "res/res_pjsip: Add preferred_codec_only config to pjsip endpoint."
Diffstat (limited to 'res/res_pjsip_session.c')
| -rw-r--r-- | res/res_pjsip_session.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c index f54ee9411..a26359ffb 100644 --- a/res/res_pjsip_session.c +++ b/res/res_pjsip_session.c @@ -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 } |