From: Alec L Davis <sivad.a@paradise.net.nz>
Date: Fri, 27 May 2011 08:31:15 +0000 (+0000)
Subject: Fix *8 directed pickup locks system during pickupsound play out
X-Git-Tag: 1.8.5-rc1~11^2~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd24de330688de374c050869befa632b52b2fd65;p=thirdparty%2Fasterisk.git

Fix *8 directed pickup locks system during pickupsound play out

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
---

diff --git a/main/features.c b/main/features.c
index ee3d536bb3..86e62c541b 100644
--- a/main/features.c
+++ b/main/features.c
@@ -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);
 
 		res = ast_do_pickup(chan, target);
+		ast_channel_unlock(target);
 		if (!res) {
 			if (!ast_strlen_zero(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, "");
+				pbx_builtin_setvar_helper(target, "BRIDGE_PLAY_SOUND", pickupsound);
 			}
 		} else {
 			ast_log(LOG_WARNING, "pickup %s failed by %s\n", target->name, chan->name);
 		}
-		ast_channel_unlock(target);
 		target = ast_channel_unref(target);
 	}