kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
In multi-party bridges, Asterisk currently supports two video modes:
 * Follow the talker, in which the speaker with the most energy is shown
   to all participants but the speaker, and the speaker sees the
   previous video source
 * Explicitly set video sources, in which all participants see a locked
   video source

Prior to this patch, ARI had no ability to manipulate the video source.
This isn't important for two-party bridges, in which Asterisk merely
relays the video between the participants. However, in a multi-party
bridge, it can be advantageous to allow an external application to
manipulate the video source.

This patch provides two new routes to accomplish this:
(1) setVideoSource: POST /bridges/{bridgeId}/videoSource/{channelId}
    Sets a video source to an explicit channel
(2) clearVideoSource: DELETE /bridges/{bridgeId}/videoSource
    Removes any explicit video source, and sets the video mode to talk
    detection

ASTERISK-26595 #close

Change-Id: I98e455d5bffc08ea5e8d6b84ccaf063c714e6621
This commit is contained in:
Matt Jordan
2016-11-08 10:11:41 -06:00
parent d1739bcf07
commit a72ef38113
15 changed files with 645 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
main/stasis_bridges.c
View File

@@ -242,7 +242,13 @@ struct ast_bridge_snapshot *ast_bridge_snapshot_create(struct ast_bridge *bridge
snapshot = ao2_alloc_options(sizeof(*snapshot), bridge_snapshot_dtor,
AO2_ALLOC_OPT_LOCK_NOLOCK);
if (!snapshot || ast_string_field_init(snapshot, 128)) {
if (!snapshot) {
return NULL;
}
if (ast_string_field_init(snapshot, 128)
|| ast_string_field_init_extended(snapshot, video_source_id)) {
ao2_ref(snapshot, -1);
return NULL;
}
@@ -268,6 +274,16 @@ struct ast_bridge_snapshot *ast_bridge_snapshot_create(struct ast_bridge *bridge
snapshot->capabilities = bridge->technology->capabilities;
snapshot->num_channels = bridge->num_channels;
snapshot->num_active = bridge->num_active;
snapshot->video_mode = bridge->softmix.video_mode.mode;
if (snapshot->video_mode == AST_BRIDGE_VIDEO_MODE_SINGLE_SRC
&& bridge->softmix.video_mode.mode_data.single_src_data.chan_vsrc) {
ast_string_field_set(snapshot, video_source_id,
ast_channel_uniqueid(bridge->softmix.video_mode.mode_data.single_src_data.chan_vsrc));
} else if (snapshot->video_mode == AST_BRIDGE_VIDEO_MODE_TALKER_SRC
&& bridge->softmix.video_mode.mode_data.talker_src_data.chan_vsrc) {
ast_string_field_set(snapshot, video_source_id,
ast_channel_uniqueid(bridge->softmix.video_mode.mode_data.talker_src_data.chan_vsrc));
}
ao2_ref(snapshot, +1);
return snapshot;
@@ -590,18 +606,25 @@ struct ast_json *ast_bridge_snapshot_to_json(
return NULL;
}
json_bridge = ast_json_pack("{s: s, s: s, s: s, s: s, s: s, s: s, s: o}",
json_bridge = ast_json_pack("{s: s, s: s, s: s, s: s, s: s, s: s, s: o, s: s}",
"id", snapshot->uniqueid,
"technology", snapshot->technology,
"bridge_type", capability2str(snapshot->capabilities),
"bridge_class", snapshot->subclass,
"creator", snapshot->creator,
"name", snapshot->name,
"channels", json_channels);
"channels", json_channels,
"video_mode", ast_bridge_video_mode_to_string(snapshot->video_mode));
if (!json_bridge) {
return NULL;
}
if (snapshot->video_mode != AST_BRIDGE_VIDEO_MODE_NONE
&& !ast_strlen_zero(snapshot->video_source_id)) {
ast_json_object_set(json_bridge, "video_source_id",
ast_json_string_create(snapshot->video_source_id));
}
return ast_json_ref(json_bridge);
}