diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-19 17:49:38 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-19 17:49:38 +0000 |
| commit | cc3938c1989d0b9f6a907ee2d64f2f66a01b2e29 (patch) | |
| tree | 3fe50ce72af12ead588e9b25a6bf636f67b0993d /channels/chan_zap.c | |
| parent | 397418eb0c2c20f83505c9af8d5bb8aa89cab8af (diff) | |
Merge the changes from the /team/group/vldtmf_fixup branch.
The main bug being addressed here is a problem introduced when two SIP
channels using SIP INFO dtmf have their media directly bridged. So, when a
DTMF END frame comes into Asterisk from an incoming INFO message, Asterisk
would try to emulate a digit of some length by first sending a DTMF BEGIN
frame and sending a DTMF END later timed off of incoming audio. However,
since there was no audio coming in, the DTMF_END was never generated. This
caused DTMF based features to no longer work.
To fix this, the core now knows when a channel doesn't care about DTMF BEGIN
frames (such as a SIP channel sending INFO dtmf). If this is the case, then
Asterisk will not emulate a digit of some length, and will instead just pass
through the single DTMF END event.
Channel drivers also now get passed the length of the digit to their digit_end
callback. This improves SIP INFO support even further by enabling us to put
the real digit duration in the INFO message instead of a hard coded 250ms.
Also, for an incoming INFO message, the duration is read from the frame and
passed into the core instead of just getting ignored.
(issue #8597, maybe others...)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@51311 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
| -rw-r--r-- | channels/chan_zap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 4d1935202..bbec9c182 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -673,7 +673,7 @@ static struct zt_chan_conf zt_chan_conf_default(void) { static struct ast_channel *zt_request(const char *type, int format, void *data, int *cause); static int zt_digit_begin(struct ast_channel *ast, char digit); -static int zt_digit_end(struct ast_channel *ast, char digit); +static int zt_digit_end(struct ast_channel *ast, char digit, unsigned int duration); static int zt_sendtext(struct ast_channel *c, const char *text); static int zt_call(struct ast_channel *ast, char *rdest, int timeout); static int zt_hangup(struct ast_channel *ast); @@ -1059,7 +1059,7 @@ out: return 0; } -static int zt_digit_end(struct ast_channel *chan, char digit) +static int zt_digit_end(struct ast_channel *chan, char digit, unsigned int duration) { struct zt_pvt *pvt; int res = 0; |