[Asterisk-cvs] asterisk/channels chan_modem.c,1.22,1.23 chan_modem_i4l.c,1.15,1.16
markster at lists.digium.com
markster at lists.digium.com
Tue Jun 22 10:31:12 CDT 2004
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv19959/channels
Modified Files:
chan_modem.c chan_modem_i4l.c
Log Message:
Make DTMF mode configurable on ISDN
Index: chan_modem.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_modem.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- chan_modem.c 21 Jun 2004 04:29:50 -0000 1.22
+++ chan_modem.c 22 Jun 2004 14:17:06 -0000 1.23
@@ -63,6 +63,13 @@
/* Default Listen */
static char incomingmsn[AST_MAX_EXTENSION]="";
+/* Default DTMF-detection mode (i4l/asterisk) */
+static int dtmfmode = MODEM_DTMF_AST;
+/* Default DTMF-generation mode (i4l (outband) / asterisk (inband) */
+static int dtmfmodegen = MODEM_DTMF_AST;
+
+struct ast_dsp *dsp = NULL;
+
/* Default valid outgoing MSN */
static char outgoingmsn[AST_MAX_EXTENSION]="";
@@ -711,6 +718,8 @@
strncpy(tmp->language, language, sizeof(tmp->language)-1);
strncpy(tmp->msn, msn, sizeof(tmp->msn)-1);
strncpy(tmp->incomingmsn, incomingmsn, sizeof(tmp->incomingmsn)-1);
+ tmp->dtmfmode = dtmfmode;
+ tmp->dtmfmodegen = dtmfmodegen;
snprintf(tmp->outgoingmsn, sizeof(tmp->outgoingmsn), ",%s,", outgoingmsn);
strncpy(tmp->dev, iface, sizeof(tmp->dev)-1);
/* Maybe in the future we want to allow variable
@@ -972,6 +981,36 @@
strncpy(msn, v->value, sizeof(msn)-1);
} else if (!strcasecmp(v->name, "incomingmsn")) {
strncpy(incomingmsn, v->value, sizeof(incomingmsn)-1);
+ } else if (!strcasecmp(v->name, "dtmfmode")) {
+ char tmp[80];
+ char *alt;
+ strncpy(tmp, v->value, sizeof(tmp) - 1);
+ alt = strchr(tmp, '/');
+ if (!strcasecmp(tmp, "none"))
+ dtmfmode=MODEM_DTMF_NONE;
+ else if (!strcasecmp(tmp, "asterisk"))
+ dtmfmode = MODEM_DTMF_AST;
+ else if (!strcasecmp(tmp, "i4l"))
+ dtmfmode = MODEM_DTMF_I4L;
+ else {
+ ast_log(LOG_WARNING, "Unknown dtmf detection mode '%s', using 'asterisk'\n", v->value);
+ dtmfmode = MODEM_DTMF_AST;
+ }
+ if (alt) {
+ if (!strcasecmp(alt, "none"))
+ dtmfmodegen=MODEM_DTMF_NONE;
+ else if (!strcasecmp(alt, "asterisk"))
+ dtmfmodegen = MODEM_DTMF_AST;
+ else if (!strcasecmp(alt, "i4l"))
+ dtmfmodegen = MODEM_DTMF_I4L;
+ else if (!strcasecmp(alt, "both"))
+ dtmfmodegen = MODEM_DTMF_I4L | MODEM_DTMF_AST;
+ else {
+ ast_log(LOG_WARNING, "Unknown dtmf generation mode '%s', using 'asterisk'\n", v->value);
+ dtmfmodegen = MODEM_DTMF_AST;
+ }
+ } else
+ dtmfmodegen = dtmfmode;
} else if (!strcasecmp(v->name, "outgoingmsn")) {
strncpy(outgoingmsn, v->value, sizeof(outgoingmsn)-1);
} else if (!strcasecmp(v->name, "language")) {
Index: chan_modem_i4l.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_modem_i4l.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- chan_modem_i4l.c 21 Jun 2004 04:29:50 -0000 1.15
+++ chan_modem_i4l.c 22 Jun 2004 14:17:06 -0000 1.16
@@ -24,6 +24,8 @@
#include <asterisk/frame.h>
#include <asterisk/logger.h>
#include <asterisk/options.h>
+#include <asterisk/dsp.h>
+#include <asterisk/callerid.h>
#include "alaw.h"
#define STATE_COMMAND 0
@@ -94,6 +96,21 @@
return -1;
}
p->ministate = STATE_VOICE;
+
+ /* let ast dsp detect dtmf */
+ if (p->dtmfmode & MODEM_DTMF_AST) {
+ if (p->dsp) {
+ ast_log(LOG_DEBUG, "Already have a dsp on %s?\n", p->dev);
+ } else {
+ p->dsp = ast_dsp_new();
+ if (p->dsp) {
+ ast_log(LOG_DEBUG, "Detecting DTMF inband with sw DSP on %s\n",p->dev);
+ ast_dsp_set_features(p->dsp, DSP_FEATURE_DTMF_DETECT);
+ ast_dsp_digitmode(p->dsp, DSP_DIGITMODE_DTMF | 0);
+ }
+ }
+ }
+
return 0;
}
@@ -277,7 +294,7 @@
case '9':
case '*':
case '#':
- ast_log(LOG_DEBUG, "DTMF: '%c' (%d)\n", esc, esc);
+ ast_log(LOG_DEBUG, "Detected outband DTMF digit: '%c' (%d)\n", esc, esc);
p->fr.frametype=AST_FRAME_DTMF;
p->fr.subclass=esc;
return &p->fr;
@@ -409,8 +426,11 @@
if (f)
break;
}
- if (f)
+ if (f) {
+ if( ! (!(p->dtmfmode & MODEM_DTMF_I4L) && f->frametype == AST_FRAME_DTMF))
return f;
+ }
+
/* If we get here, we have a complete voice frame */
p->fr.frametype = AST_FRAME_VOICE;
p->fr.subclass = AST_FORMAT_SLINEAR;
@@ -421,6 +441,16 @@
p->fr.offset = AST_FRIENDLY_OFFSET;
p->fr.src = __FUNCTION__;
p->obuflen = 0;
+
+ /* process with dsp */
+ if (p->dsp) {
+ f = ast_dsp_process(p->owner, p->dsp, &p->fr);
+ if (f && (f->frametype == AST_FRAME_DTMF)) {
+ ast_log(LOG_DEBUG, "Detected inband DTMF digit: %c on %s\n", f->subclass, p->dev);
+ return f;
+ }
+ }
+
return &p->fr;
}
return NULL;
@@ -510,6 +540,21 @@
return -1;
}
p->ministate = STATE_VOICE;
+
+ /* let ast dsp detect dtmf */
+ if (p->dtmfmode & MODEM_DTMF_AST) {
+ if (p->dsp) {
+ ast_log(LOG_DEBUG, "Already have a dsp on %s?\n", p->dev);
+ } else {
+ p->dsp = ast_dsp_new();
+ if (p->dsp) {
+ ast_log(LOG_DEBUG, "Detecting DTMF inband with sw DSP on %s\n",p->dev);
+ ast_dsp_set_features(p->dsp, DSP_FEATURE_DTMF_DETECT);
+ ast_dsp_digitmode(p->dsp, DSP_DIGITMODE_DTMF | 0);
+ }
+ }
+ }
+
return 0;
}
@@ -517,9 +562,16 @@
{
char c[2];
if (p->ministate == STATE_VOICE) {
+ if (p->dtmfmodegen & MODEM_DTMF_I4L) {
c[0] = CHAR_DLE;
c[1] = digit;
write(p->fd, c, 2);
+ ast_log(LOG_DEBUG, "Send ISDN out-of-band DTMF %c\n",digit);
+ }
+ if(p->dtmfmodegen & MODEM_DTMF_AST) {
+ ast_log(LOG_DEBUG, "Generating inband DTMF\n");
+ return -1;
+ }
} else
ast_log(LOG_DEBUG, "Asked to send digit but call not up on %s\n", p->dev);
return 0;
@@ -567,9 +619,14 @@
char dummy[50];
int dtr = TIOCM_DTR;
+ /* free the memory used by the DSP */
+ if (p->dsp) {
+ ast_dsp_free(p->dsp);
+ p->dsp = NULL;
+ }
+
/* down DTR to hangup modem */
ioctl(p->fd, TIOCMBIC, &dtr);
-
/* Read anything outstanding */
while(read(p->fd, dummy, sizeof(dummy)) > 0);
More information about the svn-commits
mailing list