kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only set dtmfcount on BEGIN, and ensure it gets reset to 0 properly.

Browse Source 
(issue #14460)
Reported by: moliveras
Tested by: russell


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@178373 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-02-24 20:36:19 +00:00
parent cdf5240895
commit da0d84c3e4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/rtp.c
View File

@@ -745,6 +745,7 @@ static struct ast_frame *process_rfc2833(struct ast_rtp *rtp, unsigned char *dat
if (ast_test_flag(rtp, FLAG_DTMF_COMPENSATE)) { if (ast_test_flag(rtp, FLAG_DTMF_COMPENSATE)) {
if ((rtp->lastevent != timestamp) || (rtp->resp && rtp->resp != resp)) { if ((rtp->lastevent != timestamp) || (rtp->resp && rtp->resp != resp)) {
rtp->resp = resp; rtp->resp = resp;
rtp->dtmfcount = 0;
f = send_dtmf(rtp, AST_FRAME_DTMF_END); f = send_dtmf(rtp, AST_FRAME_DTMF_END);
f->len = 0; f->len = 0;
rtp->lastevent = timestamp; rtp->lastevent = timestamp;
@@ -753,16 +754,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)) { if ((!(rtp->resp) && (!(event_end & 0x80))) || (rtp->resp && rtp->resp != resp)) {
rtp->resp = resp; rtp->resp = resp;
f = send_dtmf(rtp, AST_FRAME_DTMF_BEGIN); f = send_dtmf(rtp, AST_FRAME_DTMF_BEGIN);
rtp->dtmfcount = dtmftimeout;
} else if ((event_end & 0x80) && (rtp->lastevent != seqno) && rtp->resp) { } else if ((event_end & 0x80) && (rtp->lastevent != seqno) && rtp->resp) {
f = send_dtmf(rtp, AST_FRAME_DTMF_END); 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 */ f->len = ast_tvdiff_ms(ast_samp2tv(samples, 8000), ast_tv(0, 0)); /* XXX hard coded 8kHz */
rtp->resp = 0; rtp->resp = 0;
rtp->dtmfcount = 0;
rtp->lastevent = seqno; rtp->lastevent = seqno;
} }
} }
rtp->dtmfcount = dtmftimeout;
return f; return f;
} }
@@ -1332,7 +1333,6 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
rtp->f.delivery.tv_usec = 0; rtp->f.delivery.tv_usec = 0;
if (mark) if (mark)
rtp->f.subclass |= 0x1; rtp->f.subclass |= 0x1;
} }
rtp->f.src = "RTP"; rtp->f.src = "RTP";
return &rtp->f; return &rtp->f;