mirror of https://github.com/sipwise/asterisk.git
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
143 lines
4.3 KiB
143 lines
4.3 KiB
--- main/rtp.c (revision 191953)
|
|
+++ main/rtp.c (working copy)
|
|
@@ -73,7 +73,7 @@
|
|
|
|
#define RTP_MTU 1200
|
|
|
|
-#define DEFAULT_DTMF_TIMEOUT 3000 /*!< samples */
|
|
+#define DEFAULT_DTMF_TIMEOUT (150 * (8000 / 1000)) /*!< samples */
|
|
|
|
static int dtmftimeout = DEFAULT_DTMF_TIMEOUT;
|
|
|
|
@@ -139,7 +139,8 @@
|
|
/* DTMF Reception Variables */
|
|
char resp;
|
|
unsigned int lastevent;
|
|
- int dtmfcount;
|
|
+ unsigned int dtmf_duration; /*!< Total duration in samples since the digit start event */
|
|
+ unsigned int dtmf_timeout; /*!< When this timestamp is reached we consider END frame lost and forcibly abort digit */
|
|
/* DTMF Transmission Variables */
|
|
unsigned int lastdigitts;
|
|
char sending_digit; /*!< boolean - are we sending digits */
|
|
@@ -689,7 +690,7 @@
|
|
f = send_dtmf(rtp, AST_FRAME_DTMF_END);
|
|
}
|
|
rtp->resp = resp;
|
|
- rtp->dtmfcount = dtmftimeout;
|
|
+ rtp->dtmf_timeout = 0;
|
|
return f;
|
|
}
|
|
|
|
@@ -745,23 +746,59 @@
|
|
if (ast_test_flag(rtp, FLAG_DTMF_COMPENSATE)) {
|
|
if ((rtp->lastevent != timestamp) || (rtp->resp && rtp->resp != resp)) {
|
|
rtp->resp = resp;
|
|
- rtp->dtmfcount = 0;
|
|
+ rtp->dtmf_timeout = 0;
|
|
f = send_dtmf(rtp, AST_FRAME_DTMF_END);
|
|
f->len = 0;
|
|
rtp->lastevent = timestamp;
|
|
}
|
|
} else {
|
|
- if ((!(rtp->resp) && (!(event_end & 0x80))) || (rtp->resp && rtp->resp != resp)) {
|
|
- rtp->resp = resp;
|
|
- f = send_dtmf(rtp, AST_FRAME_DTMF_BEGIN);
|
|
- rtp->dtmfcount = dtmftimeout;
|
|
- } else if ((event_end & 0x80) && (rtp->lastevent != seqno) && rtp->resp) {
|
|
- f = send_dtmf(rtp, AST_FRAME_DTMF_END);
|
|
- f->len = ast_tvdiff_ms(ast_samp2tv(samples, 8000), ast_tv(0, 0)); /* XXX hard coded 8kHz */
|
|
- rtp->resp = 0;
|
|
- rtp->dtmfcount = 0;
|
|
- rtp->lastevent = seqno;
|
|
+ /* The duration parameter measures the complete
|
|
+ duration of the event (from the beginning) - RFC2833.
|
|
+ Account for the fact that duration is only 16 bits long
|
|
+ (about 8 seconds at 8000 Hz) and can wrap is digit
|
|
+ is hold for too long. */
|
|
+ unsigned int new_duration = rtp->dtmf_duration;
|
|
+ unsigned int last_duration = new_duration & 0xFFFF;
|
|
+
|
|
+ if (last_duration > 64000 && samples < last_duration)
|
|
+ new_duration += 0xFFFF + 1;
|
|
+ new_duration = (new_duration & ~0xFFFF) | samples;
|
|
+
|
|
+ if (event_end & 0x80) {
|
|
+ /* End event */
|
|
+ if ((rtp->lastevent != seqno) && rtp->resp) {
|
|
+ rtp->dtmf_duration = new_duration;
|
|
+ f = send_dtmf(rtp, AST_FRAME_DTMF_END);
|
|
+ f->len = ast_tvdiff_ms(ast_samp2tv(rtp->dtmf_duration, 8000), ast_tv(0, 0));
|
|
+ rtp->resp = 0;
|
|
+ rtp->dtmf_duration = rtp->dtmf_timeout = 0;
|
|
+ }
|
|
+ } else {
|
|
+ /* Begin/continuation */
|
|
+
|
|
+ if (rtp->resp && rtp->resp != resp) {
|
|
+ /* Another digit already began. End it */
|
|
+ f = send_dtmf(rtp, AST_FRAME_DTMF_END);
|
|
+ f->len = ast_tvdiff_ms(ast_samp2tv(rtp->dtmf_duration, 8000), ast_tv(0, 0));
|
|
+ rtp->resp = 0;
|
|
+ rtp->dtmf_duration = rtp->dtmf_timeout = 0;
|
|
+ }
|
|
+
|
|
+
|
|
+ if (rtp->resp) {
|
|
+ /* Digit continues */
|
|
+ rtp->dtmf_duration = new_duration;
|
|
+ } else {
|
|
+ /* New digit began */
|
|
+ rtp->resp = resp;
|
|
+ f = send_dtmf(rtp, AST_FRAME_DTMF_BEGIN);
|
|
+ rtp->dtmf_duration = samples;
|
|
+ }
|
|
+
|
|
+ rtp->dtmf_timeout = timestamp + rtp->dtmf_duration + dtmftimeout;
|
|
}
|
|
+
|
|
+ rtp->lastevent = seqno;
|
|
}
|
|
|
|
return f;
|
|
@@ -1291,17 +1328,15 @@
|
|
|
|
rtp->rxseqno = seqno;
|
|
|
|
- if (rtp->dtmfcount) {
|
|
- rtp->dtmfcount -= (timestamp - rtp->lastrxts);
|
|
+ if (rtp->dtmf_timeout && rtp->dtmf_timeout < timestamp) {
|
|
+ rtp->dtmf_timeout = 0;
|
|
|
|
- if (rtp->dtmfcount < 0) {
|
|
- rtp->dtmfcount = 0;
|
|
- }
|
|
-
|
|
- if (rtp->resp && !rtp->dtmfcount) {
|
|
+ if (rtp->resp) {
|
|
struct ast_frame *f;
|
|
f = send_dtmf(rtp, AST_FRAME_DTMF_END);
|
|
+ f->len = ast_tvdiff_ms(ast_samp2tv(rtp->dtmf_duration, 8000), ast_tv(0, 0));
|
|
rtp->resp = 0;
|
|
+ rtp->dtmf_timeout = rtp->dtmf_duration = 0;
|
|
return f;
|
|
}
|
|
}
|
|
@@ -2085,7 +2120,7 @@
|
|
rtp->lastevent = 0;
|
|
rtp->lasttxformat = 0;
|
|
rtp->lastrxformat = 0;
|
|
- rtp->dtmfcount = 0;
|
|
+ rtp->dtmf_timeout = 0;
|
|
rtp->seqno = 0;
|
|
rtp->rxseqno = 0;
|
|
}
|
|
@@ -3848,7 +3883,7 @@
|
|
}
|
|
if ((s = ast_variable_retrieve(cfg, "general", "dtmftimeout"))) {
|
|
dtmftimeout = atoi(s);
|
|
- if ((dtmftimeout < 0) || (dtmftimeout > 20000)) {
|
|
+ if ((dtmftimeout < 0) || (dtmftimeout > 64000)) {
|
|
ast_log(LOG_WARNING, "DTMF timeout of '%d' outside range, using default of '%d' instead\n",
|
|
dtmftimeout, DEFAULT_DTMF_TIMEOUT);
|
|
dtmftimeout = DEFAULT_DTMF_TIMEOUT;
|