[asterisk-commits] file: branch 1.6.0 r181297 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed Mar 11 11:42:21 2009
New Revision: 181297

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=181297
Log:
Merged revisions 181296 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r181296 | file | 2009-03-11 13:40:48 -0300 (Wed, 11 Mar 2009) | 16 lines
  
  Merged revisions 181295 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r181295 | file | 2009-03-11 13:36:50 -0300 (Wed, 11 Mar 2009) | 9 lines
    
    Fix a problem with inband DTMF detection on outgoing SIP calls when dtmfmode=auto.
    
    When dtmfmode was set to auto the inband DTMF detector was not setup
    on outgoing SIP calls. This caused inband DTMF detection to fail.
    The inband DTMF detector is now setup for both dtmfmode inband and auto.
    
    (closes issue #13713)
    Reported by: makoto
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=181297&r1=181296&r2=181297
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Wed Mar 11 11:42:21 2009
@@ -5507,9 +5507,7 @@
 	else
 		ast_debug(3, "This channel will not be able to handle video.\n");
 
-
-
-	if (ast_test_flag(&i->flags[0], SIP_DTMF) ==  SIP_DTMF_INBAND) {
+	if ((ast_test_flag(&i->flags[0], SIP_DTMF) == SIP_DTMF_INBAND) || (ast_test_flag(&i->flags[0], SIP_DTMF) == SIP_DTMF_AUTO)) {
 		i->vad = ast_dsp_new();
 		ast_dsp_set_features(i->vad, DSP_FEATURE_DTMF_DETECT);
 		if (global_relaxdtmf)