diff options
| author | Joshua Colp <jcolp@digium.com> | 2006-09-20 16:55:09 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2006-09-20 16:55:09 +0000 |
| commit | 659d4677205e2d54c419647b87dc87b32156ed2c (patch) | |
| tree | 4c394ff53e82d1f011154cb10f41f631631d968e /main | |
| parent | 75a39b53ad2b9ce74368f614f8b8a4dc5c8601fa (diff) | |
Expand codec check so that raw formats must be equal for a Packet2Packet bridge to occur
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43340 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/rtp.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/main/rtp.c b/main/rtp.c index 5d426fe52..d29185fe8 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -3066,19 +3066,25 @@ enum ast_bridge_result ast_rtp_bridge(struct ast_channel *c0, struct ast_channel /* Get codecs from both sides */ codec0 = pr0->get_codec ? pr0->get_codec(c0) : 0; codec1 = pr1->get_codec ? pr1->get_codec(c1) : 0; - if (pr0->get_codec && pr1->get_codec) { + if (codec0 && codec1 && !(codec0 & codec1)) { /* Hey, we can't do native bridging if both parties speak different codecs */ - if (!(codec0 & codec1)) { + if (option_debug) + ast_log(LOG_DEBUG, "Channel codec0 = %d is not codec1 = %d, cannot native bridge in RTP.\n", codec0, codec1); + ast_channel_unlock(c0); + ast_channel_unlock(c1); + return AST_BRIDGE_FAILED_NOWARN; + } + + /* If either side can only do a partial bridge, then don't try for a true native bridge */ + if (audio_p0_res == AST_RTP_TRY_PARTIAL || audio_p1_res == AST_RTP_TRY_PARTIAL) { + /* In order to do Packet2Packet bridging both sides must be in the same rawread/rawwrite */ + if (c0->rawreadformat != c1->rawwriteformat || c1->rawreadformat != c0->rawwriteformat) { if (option_debug) - ast_log(LOG_DEBUG, "Channel codec0 = %d is not codec1 = %d, cannot native bridge in RTP.\n", codec0, codec1); + ast_log(LOG_DEBUG, "Cannot packet2packet bridge - raw formats are incompatible\n"); ast_channel_unlock(c0); ast_channel_unlock(c1); return AST_BRIDGE_FAILED_NOWARN; } - } - - /* If either side can only do a partial bridge, then don't try for a true native bridge */ - if (audio_p0_res == AST_RTP_TRY_PARTIAL || audio_p1_res == AST_RTP_TRY_PARTIAL) { if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "Packet2Packet bridging %s and %s\n", c0->name, c1->name); res = bridge_p2p_loop(c0, c1, p0, p1, vp0, vp1, timeoutms, flags, fo, rc, pvt0, pvt1); |