[asterisk-commits] dvossel: branch dvossel/shortbus r324765 - /team/dvossel/shortbus/include/ast...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Jun 23 17:05:56 2011
New Revision: 324765

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=324765
Log:
Structures for handling video strategies across bridge techs.

Modified:
    team/dvossel/shortbus/include/asterisk/bridging.h

Modified: team/dvossel/shortbus/include/asterisk/bridging.h
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/shortbus/include/asterisk/bridging.h?view=diff&rev=324765&r1=324764&r2=324765
==============================================================================
--- team/dvossel/shortbus/include/asterisk/bridging.h (original)
+++ team/dvossel/shortbus/include/asterisk/bridging.h Thu Jun 23 17:05:56 2011
@@ -167,12 +167,38 @@
 	AST_LIST_ENTRY(ast_bridge_channel) entry;
 };
 
+enum ast_bridge_video_mode_type {
+	/*! Video is not allowed in the bridge */
+	AST_BRIDGE_VIDEO_MODE_NONE = 0,
+	/*! A single user is picked as the only distributed of video across the bridge */
+	AST_BRIDGE_VIDEO_MODE_SINGLE_SRC,
+	/* Future modes
+	AST_BRIDGE_VIDEO_MODE_TALKER_ONLY, // Strongest talker's video feed is distributed
+	AST_BRIDGE_VIDEO_MODE_MIXED, // all marked users are mixed into a single frame
+	*/
+};
+
+struct ast_bridge_video_single_src_data {
+	/*! Only accept video coming from this channel */
+	struct ast_channel *src_chan;
+};
+
+struct ast_bridge_video_mode {
+	enum ast_bridge_video_mode_type mode;
+	/* Add data for all the video modes here. */
+	union {
+		struct ast_bridge_video_single_src_data single_src_data;
+	} mode_data;
+};
+
 /*!
  * \brief Structure that contains information about a bridge
  */
 struct ast_bridge {
 	/*! Number of channels participating in the bridge */
 	int num;
+	/*! The video mode this bridge is using */
+	struct ast_bridge_video_mode video_mode;
 	/*! The internal sample rate this bridge is mixed at when multiple channels are being mixed.
 	 *  If this value is 0, the bridge technology may auto adjust the internal mixing rate. */
 	unsigned int internal_sample_rate;