[asterisk-commits] file: trunk r53435 - in /trunk: ./ main/rtp.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed Feb  7 11:57:37 2007
New Revision: 53435

URL: http://svn.digium.com/view/asterisk?view=rev&rev=53435
Log:
Merged revisions 53434 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r53434 | file | 2007-02-07 12:53:03 -0500 (Wed, 07 Feb 2007) | 2 lines

We can not reliably do P2P bridging with DTMF passing back with compensation if we need to listen for DTMF frames. (issue #8962 reported by caio1982)

........

Modified:
    trunk/   (props changed)
    trunk/main/rtp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?view=diff&rev=53435&r1=53434&r2=53435
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Wed Feb  7 11:57:37 2007
@@ -3348,6 +3348,14 @@
 		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))) {
+		ast_channel_unlock(c0);
+		ast_channel_unlock(c1);
+		return AST_BRIDGE_FAILED_NOWARN;
+	}
+
 	/* Get codecs from both sides */
 	codec0 = pr0->get_codec ? pr0->get_codec(c0) : 0;
 	codec1 = pr1->get_codec ? pr1->get_codec(c1) : 0;