diff options
| author | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-10 09:07:11 +0000 |
|---|---|---|
| committer | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-10 09:07:11 +0000 |
| commit | 278ce354d34a0c8160aa91df01569393860fc419 (patch) | |
| tree | de9004e4fceba5f8c843843f290c98c6c56ca2c4 | |
| parent | 2a8104662cafd141b4a5dfba114a9531ee3ed010 (diff) | |
Provide correct DTMF duration
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@53879 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 39c4e8e16..9f2c19d4d 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2215,7 +2215,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) || @@ -2238,7 +2238,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: @@ -2269,6 +2269,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); |