diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-13 13:42:22 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-13 13:42:22 +0000 |
commit | 6bfb727b9cf280b80306f6e1a8ef7334752cf868 (patch) | |
tree | 991814d3b1d0307dd6a49897bde480c41b770b36 /main | |
parent | 077e669611371058a7011b252318b64917ee2880 (diff) |
Merged revisions 194209 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r194209 | file | 2009-05-13 10:39:10 -0300 (Wed, 13 May 2009) | 18 lines
Merged revisions 194208 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r194208 | file | 2009-05-13 10:38:01 -0300 (Wed, 13 May 2009) | 11 lines
Fix RFC2833 issues with DTMF getting duplicated and with duration wrapping over.
(closes issue #14815)
Reported by: geoff2010
Patches:
v1-14815.patch uploaded by dimas (license 88)
Tested by: geoff2010, file, dimas, ZX81, moliveras
(closes issue #14460)
Reported by: moliveras
Tested by: moliveras
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@194213 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/rtp.c | 81 |
1 files changed, 58 insertions, 23 deletions
diff --git a/main/rtp.c b/main/rtp.c index 3ca696d63..1626dabab 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -64,7 +64,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define RTP_MTU 1200 -#define DEFAULT_DTMF_TIMEOUT 3000 /*!< samples */ +#define DEFAULT_DTMF_TIMEOUT (150 * (8000 / 1000)) /*!< samples */ static int dtmftimeout = DEFAULT_DTMF_TIMEOUT; @@ -133,7 +133,8 @@ struct ast_rtp { /* 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 */ unsigned int dtmfsamples; /* DTMF Transmission Variables */ unsigned int lastdigitts; @@ -985,7 +986,7 @@ static struct ast_frame *process_cisco_dtmf(struct ast_rtp *rtp, unsigned char * rtp->resp = 0; } else if (rtp->resp == resp) rtp->dtmfsamples += 20 * 8; - rtp->dtmfcount = dtmftimeout; + rtp->dtmf_timeout = dtmftimeout; return f; } @@ -1042,23 +1043,59 @@ static struct ast_frame *process_rfc2833(struct ast_rtp *rtp, unsigned char *dat 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; } rtp->dtmfsamples = samples; @@ -1739,17 +1776,15 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp) rtp->rxseqno = seqno; - if (rtp->dtmfcount) { - rtp->dtmfcount -= (timestamp - rtp->lastrxts); - - if (rtp->dtmfcount < 0) { - rtp->dtmfcount = 0; - } + if (rtp->dtmf_timeout && rtp->dtmf_timeout < timestamp) { + rtp->dtmf_timeout = 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; } } @@ -2681,7 +2716,7 @@ void ast_rtp_reset(struct ast_rtp *rtp) rtp->lastevent = 0; rtp->lasttxformat = 0; rtp->lastrxformat = 0; - rtp->dtmfcount = 0; + rtp->dtmf_timeout = 0; rtp->dtmfsamples = 0; rtp->seqno = 0; rtp->rxseqno = 0; @@ -4724,7 +4759,7 @@ static int __ast_rtp_reload(int reload) } 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; |