diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-01 18:09:01 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-01 18:09:01 +0000 |
| commit | 4d73c2aa4e70f691f92dd775067b18701ed76efb (patch) | |
| tree | e11117463874ba6a5a457a3afb4058a12908fdcb /main/rtp.c | |
| parent | e2494aaa351119870fa1f5a9566a2a3e03604b64 (diff) | |
Merged revisions 112210 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r112210 | file | 2008-04-01 15:06:13 -0300 (Tue, 01 Apr 2008) | 12 lines
Merged revisions 112209 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r112209 | file | 2008-04-01 15:02:43 -0300 (Tue, 01 Apr 2008) | 4 lines
Disable Packet2Packet bridging when we need to feed DTMF frames into the core. Some implementations do not like how we switch between things.
(closes issue #12212)
Reported by: bamby
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@112211 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/rtp.c')
| -rw-r--r-- | main/rtp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/rtp.c b/main/rtp.c index 1647074de..afb7656f9 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -3826,9 +3826,9 @@ enum ast_bridge_result ast_rtp_bridge(struct ast_channel *c0, struct ast_channel audio_p1_res = AST_RTP_TRY_PARTIAL; } - /* If the core will need to compensate and the P2P bridge will need to feed up DTMF frames then we can not reliably do so yet, so do not P2P bridge */ - if ((audio_p0_res == AST_RTP_TRY_PARTIAL && ast_test_flag(p0, FLAG_P2P_NEED_DTMF) && ast_test_flag(p0, FLAG_DTMF_COMPENSATE)) || - (audio_p1_res == AST_RTP_TRY_PARTIAL && ast_test_flag(p1, FLAG_P2P_NEED_DTMF) && ast_test_flag(p1, FLAG_DTMF_COMPENSATE))) { + /* If we need to feed frames into the core don't do a P2P bridge */ + if ((audio_p0_res == AST_RTP_TRY_PARTIAL && ast_test_flag(p0, FLAG_P2P_NEED_DTMF)) || + (audio_p1_res == AST_RTP_TRY_PARTIAL && ast_test_flag(p1, FLAG_P2P_NEED_DTMF))) { ast_channel_unlock(c0); ast_channel_unlock(c1); return AST_BRIDGE_FAILED_NOWARN; |