Revert RTP changes for continuation of DTMF. Proxy commit by russell via SMS.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@174997 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2009-02-12 00:19:30 +00:00
parent 1d4e4ff3d1
commit 70f7c7e9cb

View File

@@ -1299,21 +1299,6 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
/* Record received timestamp as last received now */ /* Record received timestamp as last received now */
rtp->lastrxts = timestamp; rtp->lastrxts = timestamp;
if (rtp->dtmfcount) {
rtp->dtmfcount -= (timestamp - rtp->lastrxts);
if (rtp->dtmfcount < 0) {
rtp->dtmfcount = 0;
}
if (rtp->resp && !rtp->dtmfcount) {
struct ast_frame *f;
f = send_dtmf(rtp, AST_FRAME_DTMF_END);
rtp->resp = 0;
return f;
}
}
rtp->f.mallocd = 0; rtp->f.mallocd = 0;
rtp->f.datalen = res - hdrlen; rtp->f.datalen = res - hdrlen;
rtp->f.data = rtp->rawdata + hdrlen + AST_FRIENDLY_OFFSET; rtp->f.data = rtp->rawdata + hdrlen + AST_FRIENDLY_OFFSET;