summaryrefslogtreecommitdiff
path: root/include/asterisk/bridge.h
diff options
context:
space:
mode:
authorJenkins2 <jenkins2@gerrit.asterisk.org>2017-06-06 06:57:24 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-06-06 06:57:24 -0500
commitbb2f6234da761194100d30f33d4d839f75ab78f1 (patch)
tree0e374db6de7d2347a216b4319311f03eb5ee9eb8 /include/asterisk/bridge.h
parent97abf6d4759627aec3ef65e43413214b192918a5 (diff)
parent2da869408ae5556022526bcd0f526d92fdbb5a5f (diff)
Merge "Add primitive SFU support to bridge_softmix."
Diffstat (limited to 'include/asterisk/bridge.h')
-rw-r--r--include/asterisk/bridge.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/asterisk/bridge.h b/include/asterisk/bridge.h
index a9b01a6bb..6915af28b 100644
--- a/include/asterisk/bridge.h
+++ b/include/asterisk/bridge.h
@@ -102,6 +102,10 @@ enum ast_bridge_video_mode_type {
/*! A single user's video feed is distributed to all bridge channels, but
* that feed is automatically picked based on who is talking the most. */
AST_BRIDGE_VIDEO_MODE_TALKER_SRC,
+ /*! Operate as a selective forwarding unit. Video from each participant is
+ * cloned to a dedicated stream on a subset of the remaining participants.
+ */
+ AST_BRIDGE_VIDEO_MODE_SFU,
};
/*! \brief This is used for both SINGLE_SRC mode to set what channel
@@ -267,6 +271,8 @@ struct ast_bridge_softmix {
unsigned int binaural_active;
};
+AST_LIST_HEAD_NOLOCK(ast_bridge_channels_list, ast_bridge_channel);
+
/*!
* \brief Structure that contains information about a bridge
*/
@@ -284,7 +290,7 @@ struct ast_bridge {
/*! Call ID associated with the bridge */
ast_callid callid;
/*! Linked list of channels participating in the bridge */
- AST_LIST_HEAD_NOLOCK(, ast_bridge_channel) channels;
+ struct ast_bridge_channels_list channels;
/*! Queue of actions to perform on the bridge. */
AST_LIST_HEAD_NOLOCK(, ast_frame) action_queue;
/*! Softmix technology parameters. */