diff options
| author | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-10 09:21:22 +0000 |
|---|---|---|
| committer | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-10 09:21:22 +0000 |
| commit | 8be4fd12ab3b2d50bf5e6c429007e01101a08a82 (patch) | |
| tree | fdd265878a88929bae2925f87dcd24fdf45a466e /main | |
| parent | bb5299f19a44e028e61e99a77edaf1d762446c52 (diff) | |
Merged revisions 53879 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r53879 | pcadach | 2007-02-10 01:07:11 -0800 (Сбт, 10 Фев 2007) | 1 line
Provide correct DTMF duration
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@53883 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/channel.c b/main/channel.c index aeef62b2e..1a8cfabd5 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2132,7 +2132,7 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) } break; case AST_FRAME_DTMF_END: - ast_log(LOG_DTMF, "DTMF end '%c' received on %s\n", f->subclass, chan->name); + ast_log(LOG_DTMF, "DTMF end '%c' received on %s, duration %ld ms\n", f->subclass, chan->name, f->len); /* Queue it up if DTMF is deffered, or if DTMF emulation is forced. * However, only let emulation be forced if the other end cares about BEGIN frames */ if ( ast_test_flag(chan, AST_FLAG_DEFER_DTMF) || @@ -2155,7 +2155,7 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) } else { ast_clear_flag(chan, AST_FLAG_IN_DTMF); if (!f->len) - f->len = ast_tvdiff_ms(chan->dtmf_begin_tv, ast_tvnow()); + f->len = ast_tvdiff_ms(ast_tvnow(), chan->dtmf_begin_tv); } break; case AST_FRAME_DTMF_BEGIN: @@ -2186,6 +2186,7 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) chan->emulate_dtmf_duration = 0; f->frametype = AST_FRAME_DTMF_END; f->subclass = chan->emulate_dtmf_digit; + f->len = ast_tvdiff_ms(ast_tvnow(), chan->dtmf_begin_tv); } else { chan->emulate_dtmf_duration -= f->samples / 8; /* XXX 8kHz */ ast_frfree(f); |