[asterisk-commits] dvossel: branch dvossel/shortbus r325819 - /team/dvossel/shortbus/bridges/

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Jun 30 13:59:08 2011
New Revision: 325819

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=325819
Log:
Fixes logic for single src video in softmix code.

Modified:
    team/dvossel/shortbus/bridges/bridge_softmix.c

Modified: team/dvossel/shortbus/bridges/bridge_softmix.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/shortbus/bridges/bridge_softmix.c?view=diff&rev=325819&r1=325818&r2=325819
==============================================================================
--- team/dvossel/shortbus/bridges/bridge_softmix.c (original)
+++ team/dvossel/shortbus/bridges/bridge_softmix.c Thu Jun 30 13:59:08 2011
@@ -476,6 +476,10 @@
 		case AST_BRIDGE_VIDEO_MODE_NONE:
 			break;
 		case AST_BRIDGE_VIDEO_MODE_SINGLE_SRC:
+			if (ast_bridge_is_video_src(bridge, bridge_channel->chan)) {
+				softmix_pass_video(bridge, bridge_channel, frame);
+			}
+			break;
 		case AST_BRIDGE_VIDEO_MODE_TALKER_SRC:
 			ast_mutex_lock(&sc->lock);
 			ast_bridge_update_talker_src_video_mode(bridge, bridge_channel->chan, sc->video_talker.energy_average, ast_format_get_video_mark(&frame->subclass.format));