diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-24 20:43:16 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-24 20:43:16 +0000 |
| commit | 31b1f86e752ec3730ee1d5f249205607e4a34af3 (patch) | |
| tree | dd4deee4f56080843e86aa2f7f9d964915e17419 /main | |
| parent | 7a85bff00affb99633ae3ee92aaf54a0d31be083 (diff) | |
Merged revisions 178374 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r178374 | russell | 2009-02-24 14:39:57 -0600 (Tue, 24 Feb 2009) | 14 lines
Merged revisions 178373 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r178373 | russell | 2009-02-24 14:36:19 -0600 (Tue, 24 Feb 2009) | 6 lines
Only set dtmfcount on BEGIN, and ensure it gets reset to 0 properly.
(issue #14460)
Reported by: moliveras
Tested by: russell
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@178378 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/rtp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/rtp.c b/main/rtp.c index 4774179ce..2c647e78b 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -965,10 +965,11 @@ static struct ast_frame *process_rfc2833(struct ast_rtp *rtp, unsigned char *dat ast_log(LOG_DEBUG, "Ignoring RTP 2833 Event: %08x. Not a DTMF Digit.\n", event); return &ast_null_frame; } - + if (ast_test_flag(rtp, FLAG_DTMF_COMPENSATE)) { if ((rtp->lastevent != timestamp) || (rtp->resp && rtp->resp != resp)) { rtp->resp = resp; + rtp->dtmfcount = 0; f = send_dtmf(rtp, AST_FRAME_DTMF_END); f->len = 0; rtp->lastevent = timestamp; @@ -977,15 +978,16 @@ static struct ast_frame *process_rfc2833(struct ast_rtp *rtp, unsigned char *dat 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; } } - rtp->dtmfcount = dtmftimeout; rtp->dtmfsamples = samples; return f; |