diff options
Diffstat (limited to 'pjsip/src/pjsua-lib/pjsua_media.c')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index 28920079..8ede0f8c 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -1247,7 +1247,7 @@ pj_status_t pjsua_media_channel_init(pjsua_call_id call_id, pj_bool_t srtp_active; #if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0) - srtp_active = acc->cfg.use_srtp && srtp != NULL; + srtp_active = acc->cfg.use_srtp; #else srtp_active = PJ_FALSE; #endif @@ -1301,6 +1301,18 @@ pj_status_t pjsua_media_channel_create_sdp(pjsua_call_id call_id, return PJ_EBUSY; } + if (rem_sdp && rem_sdp->media_count != 0) { + pj_bool_t srtp_active; + +#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0) + srtp_active = pjsua_var.acc[call->acc_id].cfg.use_srtp; +#else + srtp_active = PJ_FALSE; +#endif + + call->audio_idx = find_audio_index(rem_sdp, srtp_active); + } + /* Media index must have been determined before */ pj_assert(call->audio_idx != -1); |