[svn-commits] file: branch file/bridging-softmixgen2 r183651 - /team/file/bridging-softmixg...

[SVN commits to the Digium repositories]

Author: file
Date: Sun Mar 22 15:26:59 2009
New Revision: 183651

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=183651
Log:
Do not setup transcoding between two segments if one of the segments has no channels in it.

Modified:
    team/file/bridging-softmixgen2/bridges/bridge_softmix.c

Modified: team/file/bridging-softmixgen2/bridges/bridge_softmix.c
URL: http://svn.digium.com/svn-view/asterisk/team/file/bridging-softmixgen2/bridges/bridge_softmix.c?view=diff&rev=183651&r1=183650&r2=183651
==============================================================================
--- team/file/bridging-softmixgen2/bridges/bridge_softmix.c (original)
+++ team/file/bridging-softmixgen2/bridges/bridge_softmix.c Sun Mar 22 15:26:59 2009
@@ -120,7 +120,7 @@
 	int i;
 
 	for (i = 0; i < SOFTMIX_SEGMENTS_MAX; i++) {
-		if (i == softmix_bridge_segment->position) {
+		if (i == softmix_bridge_segment->position || !softmix_bridge->segments[i].channels) {
 			continue;
 		}
 
@@ -133,6 +133,10 @@
 			      softmix_bridge->segments[i].format, softmix_bridge_segment->format))) {
 			return -1;
 		}
+
+		ast_debug(1, "Setup segment transcoding between segment '%d'(%s) and '%d'(%s)\n",
+			  softmix_bridge_segment->position, ast_getformatname(softmix_bridge_segment->format),
+			  i, ast_getformatname(softmix_bridge->segments[i].format));
 	}
 
 	return 0;