Merge "res/ari/resource_bridges: Add the ability to manipulate the video source"

This commit is contained in:
zuul
2016-11-16 16:48:09 -06:00
committed by Gerrit Code Review
15 changed files with 645 additions and 14 deletions

View File

@@ -903,6 +903,15 @@ int ast_bridge_is_video_src(struct ast_bridge *bridge, struct ast_channel *chan)
*/
void ast_bridge_remove_video_src(struct ast_bridge *bridge, struct ast_channel *chan);
/*!
* \brief Converts an enum representation of a bridge video mode to string
*
* \param video_mode The video mode
*
* \retval A string representation of \c video_mode
*/
const char *ast_bridge_video_mode_to_string(enum ast_bridge_video_mode_type video_mode);
enum ast_transfer_result {
/*! The transfer completed successfully */
AST_BRIDGE_TRANSFER_SUCCESS,

View File

@@ -58,6 +58,10 @@ struct ast_bridge_snapshot {
unsigned int num_channels;
/*! Number of active channels in the bridge. */
unsigned int num_active;
/*! The video mode of the bridge */
enum ast_bridge_video_mode_type video_mode;
/*! Unique ID of the channel providing video, if one exists */
AST_STRING_FIELD_EXTENDED(video_source_id);
};
/*!