Merged revisions 178373 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 24 Feb 2009 20:39:57 +0000 (20:39 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 24 Feb 2009 20:39:57 +0000 (20:39 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@178374 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/rtp.c

index 7826429..54f3a85 100644 (file)
@@ -1038,10 +1038,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;
@@ -1050,15 +1051,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;