kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "AMI PlayDTMF Action: Make not compete with channel's media thread."

Browse Source
This commit is contained in:
George Joseph
2018-06-21 10:25:32 -05:00
committed by Gerrit Code Review
parent 2a8318554b 7d874c1af7
commit 46c1f81fad
3 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_senddtmf.c
View File

@@ -167,7 +167,7 @@ static int manager_play_dtmf(struct mansession *s, const struct message *m)
return 0;
}
ast_senddigit(chan, *digit, duration_ms);
ast_senddigit_external(chan, *digit, duration_ms);
chan = ast_channel_unref(chan);

18
include/asterisk/channel.h
View File

@@ -2177,13 +2177,31 @@ int ast_recvchar(struct ast_channel *chan, int timeout);
/*!
* \brief Send a DTMF digit to a channel.
*
* \param chan channel to act upon
* \param digit the DTMF digit to send, encoded in ASCII
* \param duration the duration of the digit ending in ms
*
* \pre This must only be called by the channel's media handler thread.
*
* \return 0 on success, -1 on failure
*/
int ast_senddigit(struct ast_channel *chan, char digit, unsigned int duration);
/*!
* \brief Send a DTMF digit to a channel from an external thread.
*
* \param chan channel to act upon
* \param digit the DTMF digit to send, encoded in ASCII
* \param duration the duration of the digit ending in ms
*
* \pre This must only be called by threads that are not the channel's
* media handler thread.
*
* \return 0 on success, -1 on failure
*/
int ast_senddigit_external(struct ast_channel *chan, char digit, unsigned int duration);
/*!
* \brief Send a DTMF digit to a channel.
* \param chan channel to act upon

20
main/channel.c
View File

@@ -4810,12 +4810,28 @@ int ast_senddigit_end(struct ast_channel *chan, char digit, unsigned int duratio
int ast_senddigit(struct ast_channel *chan, char digit, unsigned int duration)
{
if (duration < AST_DEFAULT_EMULATE_DTMF_DURATION) {
duration = AST_DEFAULT_EMULATE_DTMF_DURATION;
}
if (ast_channel_tech(chan)->send_digit_begin) {
ast_senddigit_begin(chan, digit);
ast_safe_sleep(chan, (duration >= AST_DEFAULT_EMULATE_DTMF_DURATION ? duration : AST_DEFAULT_EMULATE_DTMF_DURATION));
ast_safe_sleep(chan, duration);
}
return ast_senddigit_end(chan, digit, (duration >= AST_DEFAULT_EMULATE_DTMF_DURATION ? duration : AST_DEFAULT_EMULATE_DTMF_DURATION));
return ast_senddigit_end(chan, digit, duration);
}
int ast_senddigit_external(struct ast_channel *chan, char digit, unsigned int duration)
{
if (duration < AST_DEFAULT_EMULATE_DTMF_DURATION) {
duration = AST_DEFAULT_EMULATE_DTMF_DURATION;
}
if (ast_channel_tech(chan)->send_digit_begin) {
ast_senddigit_begin(chan, digit);
usleep(duration * 1000);
}
return ast_senddigit_end(chan, digit, duration);
}
int ast_prod(struct ast_channel *chan)