kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-14 04:54:49 +00:00
Code Issues Projects Releases Wiki Activity

FS-10121: [mod_conference] Add role-id and layout transitions to conference

Browse Source
This commit is contained in:
Anthony Minessale 2017-03-13 14:26:59 -05:00
parent b3b2f60545
commit 420896c534
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/applications/mod_conference/conference_video.c
View File

@ -3072,7 +3072,6 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
if (canvas->layout_floor_id > -1 && imember->id == conference->video_floor_holder && if (canvas->layout_floor_id > -1 && imember->id == conference->video_floor_holder &&
imember->video_layer_id != canvas->layout_floor_id) { imember->video_layer_id != canvas->layout_floor_id) {
conference_video_attach_video_layer(imember, canvas, canvas->layout_floor_id); conference_video_attach_video_layer(imember, canvas, canvas->layout_floor_id);
layer = &canvas->layers[imember->video_layer_id];
} }
} }
@ -3080,17 +3079,18 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
// canvas->layers_used, canvas->total_layers); // canvas->layers_used, canvas->total_layers);
if (!zstr(imember->video_role_id) && canvas->role_count) { if (!zstr(imember->video_role_id) && canvas->role_count) {
mcu_layer_t *tlayer;
if (imember->video_layer_id > -1) { if (imember->video_layer_id > -1) {
layer = &canvas->layers[imember->video_layer_id]; tlayer = &canvas->layers[imember->video_layer_id];
} }
if (!layer || (zstr(layer->geometry.role_id) || strcmp(layer->geometry.role_id, imember->video_role_id))) { if (!tlayer || (zstr(layer->geometry.role_id) || strcmp(tlayer->geometry.role_id, imember->video_role_id))) {
for (i = 0; i < canvas->total_layers; i++) { for (i = 0; i < canvas->total_layers; i++) {
mcu_layer_t *xlayer = &canvas->layers[i]; mcu_layer_t *xlayer = &canvas->layers[i];
if (!zstr(imember->video_role_id) && !zstr(xlayer->geometry.role_id) && !strcmp(xlayer->geometry.role_id, imember->video_role_id)) { if (!zstr(imember->video_role_id) && !zstr(xlayer->geometry.role_id) && !strcmp(xlayer->geometry.role_id, imember->video_role_id)) {
conference_video_attach_video_layer(imember, canvas, i); conference_video_attach_video_layer(imember, canvas, i);
layer = xlayer;
} }
} }
} }
@ -3119,6 +3119,10 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
switch_img_free(&img); switch_img_free(&img);
} }
if (imember->video_layer_id < 0) {
layer = NULL;
}
if (!layer && (!conference_utils_test_flag(imember->conference, CFLAG_VIDEO_REQUIRED_FOR_CANVAS) || ((switch_channel_test_flag(imember->channel, CF_VIDEO_READY) && switch_core_session_media_flow(imember->session, SWITCH_MEDIA_TYPE_VIDEO) != SWITCH_MEDIA_FLOW_SENDONLY && switch_core_session_media_flow(imember->session, SWITCH_MEDIA_TYPE_VIDEO) != SWITCH_MEDIA_FLOW_INACTIVE)))) { if (!layer && (!conference_utils_test_flag(imember->conference, CFLAG_VIDEO_REQUIRED_FOR_CANVAS) || ((switch_channel_test_flag(imember->channel, CF_VIDEO_READY) && switch_core_session_media_flow(imember->session, SWITCH_MEDIA_TYPE_VIDEO) != SWITCH_MEDIA_FLOW_SENDONLY && switch_core_session_media_flow(imember->session, SWITCH_MEDIA_TYPE_VIDEO) != SWITCH_MEDIA_FLOW_INACTIVE)))) {
if (conference_video_find_layer(conference, canvas, imember, &layer) == SWITCH_STATUS_SUCCESS) { if (conference_video_find_layer(conference, canvas, imember, &layer) == SWITCH_STATUS_SUCCESS) {
imember->layer_timeout = 0; imember->layer_timeout = 0;