[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r338034 - /team/irroot/distr...

[SVN commits to the Asterisk project]

Author: irroot
Date: Tue Sep 27 05:04:55 2011
New Revision: 338034

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=338034
Log:
chan_local fixup pvt must be unlocked as per dvosel

Modified:
    team/irroot/distrotech-customers-trunk/channels/chan_local.c

Modified: team/irroot/distrotech-customers-trunk/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_local.c?view=diff&rev=338034&r1=338033&r2=338034
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_local.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_local.c Tue Sep 27 05:04:55 2011
@@ -607,14 +607,18 @@
 	} else if (f && (f->frametype == AST_FRAME_VOICE)) {
 		/* fixup audio formats nativeformat has changed we must adjust
 		 * ast is p->owner and is locked here*/
+		ao2_unlock(p);
 		bridge = ast_bridged_channel(ast);
+		ao2_lock(p);
 		if (bridge && !ast_format_cap_identical(bridge->nativeformats, ast->nativeformats)) {
-			while (lockcheck && ast_channel_trylock(p->chan)) {
+			while (lockcheck && p->chan && ast_channel_trylock(p->chan)) {
 				lockcheck--;
+				ao2_unlock(p);
 				usleep(1000);
+				ao2_lock(p);
 			}
 			if (lockcheck) {
-				ast_format_cap_copy(bridge->nativeformats, p->owner->nativeformats);
+				ast_format_cap_copy(bridge->nativeformats, ast->nativeformats);
 				ast_set_read_format(ast, &ast->readformat);
 				ast_set_write_format(ast, &ast->writeformat);
 				ast_format_cap_copy(bridge->nativeformats, p->chan->nativeformats);