kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-26 22:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix *8 directed pickup locks system during pickupsound play out

Browse Source 
move playout from sip_pickup_thread to bridge using BRIDGE_PLAY_SOUND method,
This stop the clash of 2 threads trying to write audio to same channel.
In addition fixes choppy audio beep in issue 19177.
 
 (issue #18654)
 (issue #19177)
 Reported by: Docent
 Patches: 
      review1232-1.88888888 alecdavis (license 585)
 Tested by: alecdavis
 
Review: https://reviewboard.asterisk.org/r/1232/



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@321211 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Alec L Davis
2011-05-27 08:31:15 +00:00
parent a35ebe0f61
commit fd24de3306
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/features.c
View File

@@ -5726,20 +5726,14 @@ int ast_pickup_call(struct ast_channel *chan)
ast_log(LOG_NOTICE, "pickup %s attempt by %s\n", target->name, chan->name); ast_log(LOG_NOTICE, "pickup %s attempt by %s\n", target->name, chan->name);
res = ast_do_pickup(chan, target); res = ast_do_pickup(chan, target);
ast_channel_unlock(target);
if (!res) { if (!res) {
if (!ast_strlen_zero(pickupsound)) { if (!ast_strlen_zero(pickupsound)) {
/*! pbx_builtin_setvar_helper(target, "BRIDGE_PLAY_SOUND", pickupsound);
* \todo We are not the bridge thread when we inject this sound
* so we need to hold the target channel lock while the sound is
* played. A better way needs to be found as this pauses the
* system.
*/
ast_stream_and_wait(target, pickupsound, "");
} }
} else { } else {
ast_log(LOG_WARNING, "pickup %s failed by %s\n", target->name, chan->name); ast_log(LOG_WARNING, "pickup %s failed by %s\n", target->name, chan->name);
} }
ast_channel_unlock(target);
target = ast_channel_unref(target); target = ast_channel_unref(target);
} }