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/branches/1.4@178373 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/rtp.c b/main/rtp.c
index 8ac8d832dadb8c5e224348f87fdda9d553223ed1..131e27d2e24b7a91e0e2a5e2cde44e636efbf385 100644 (file)
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -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 ((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;
@@ -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)) {
                        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;
-
        return f;
 }
 
@@ -1332,7 +1333,6 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
                rtp->f.delivery.tv_usec = 0;
                if (mark)
                        rtp->f.subclass |= 0x1;
-               
        }
        rtp->f.src = "RTP";
        return &rtp->f;