[asterisk-commits] russell: trunk r279917 - in /trunk: ./ channels/chan_dahdi.c channels/sig_pri.c

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Jul 27 14:55:40 2010
New Revision: 279917

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=279917
Log:
Merged revisions 279916 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r279916 | russell | 2010-07-27 14:50:56 -0500 (Tue, 27 Jul 2010) | 12 lines
  
  Fix inband DTMF detection on outgoing ISDN calls.
  
  This is a regression from the sig_pri split from chan_dahdi.  When a call is
  first initiated, the inband DTMF detector is not enabled if it's an outgoing
  ISDN call.  However, it needs to be turned on once the media path starts up.
  This handling was put back in the open_media() callback of chan_dahdi.  In
  sig_pri, open_media() calls were added to a few places where it was needed,
  including handling of PRI_EVENT_RINGING, PRI_EVENT_PROGRESS, and
  PRI_EVENT_PROCEEDING.
  
  Thanks to rmudgett for helping me with the patch!
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c
    trunk/channels/sig_pri.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Tue Jul 27 14:55:40 2010
@@ -1,1 +1,1 @@
-/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601,279619,279636-279815,279817,279850,279887
+/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601,279619,279636-279815,279817,279850,279887,279916

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=279917&r1=279916&r2=279917
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Tue Jul 27 14:55:40 2010
@@ -2504,6 +2504,11 @@
 	}
 	if (res < 0) {
 		ast_log(LOG_WARNING, "Unable to set gains on channel %d\n", pvt->channel);
+	}
+
+	if (pvt->dsp_features && pvt->dsp) {
+		ast_dsp_set_features(pvt->dsp, pvt->dsp_features);
+		pvt->dsp_features = 0;
 	}
 }
 #endif	/* defined(HAVE_PRI) */

Modified: trunk/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_pri.c?view=diff&rev=279917&r1=279916&r2=279917
==============================================================================
--- trunk/channels/sig_pri.c (original)
+++ trunk/channels/sig_pri.c Tue Jul 27 14:55:40 2010
@@ -4907,6 +4907,17 @@
 						pri_queue_control(pri, chanpos, AST_CONTROL_RINGING);
 						pri->pvts[chanpos]->alerting = 1;
 
+						if (
+#ifdef PRI_PROGRESS_MASK
+							e->ringing.progressmask & PRI_PROG_INBAND_AVAILABLE
+#else
+							e->ringing.progress == 8
+#endif
+							) {
+							sig_pri_open_media(pri->pvts[chanpos]);
+						}
+
+
 #ifdef SUPPORT_USERUSER
 						if (!ast_strlen_zero(e->ringing.useruserinfo)) {
 							struct ast_channel *owner;
@@ -4965,6 +4976,7 @@
 						pri_queue_control(pri, chanpos, AST_CONTROL_PROGRESS);
 						pri->pvts[chanpos]->progress = 1;
 						sig_pri_set_dialing(pri->pvts[chanpos], 0);
+						sig_pri_open_media(pri->pvts[chanpos]);
 					}
 					sig_pri_unlock_private(pri->pvts[chanpos]);
 				}
@@ -4998,6 +5010,7 @@
 						pri_queue_control(pri, chanpos, AST_CONTROL_PROGRESS);
 						pri->pvts[chanpos]->progress = 1;
 						sig_pri_set_dialing(pri->pvts[chanpos], 0);
+						sig_pri_open_media(pri->pvts[chanpos]);
 					}
 					sig_pri_unlock_private(pri->pvts[chanpos]);
 				}