From b3b2f605452146802884cf3fcaaecf0682ebfa42 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 13 Mar 2017 12:31:03 -0500 Subject: [PATCH] FS-10121: [mod_conference] Add role-id and layout transitions to conference --- .../mod_conference/conference_video.c | 33 +++++++++++++------ .../mod_conference/mod_conference.h | 2 ++ 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index b2b0edc1ee..28e3991b11 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -1415,6 +1415,9 @@ void conference_video_init_canvas_layers(conference_obj_t *conference, mcu_canva canvas->vlayout = vlayout; + canvas->res_count = 0; + canvas->role_count = 0; + for (i = 0; i < vlayout->layers; i++) { mcu_layer_t *layer = &canvas->layers[i]; @@ -1454,8 +1457,15 @@ void conference_video_init_canvas_layers(conference_obj_t *conference, mcu_canva /* if we ever decided to reload layers config on demand the pointer assignment below will lead to segs but we only load them once forever per conference so these pointers are valid for the life of the conference */ - layer->geometry.res_id = vlayout->images[i].res_id; - layer->geometry.role_id = vlayout->images[i].role_id; + + if ((layer->geometry.res_id = vlayout->images[i].res_id)) { + canvas->res_count++; + } + + if ((layer->geometry.role_id = vlayout->images[i].role_id)) { + canvas->role_count++; + } + layer->geometry.audio_position = vlayout->images[i].audio_position; } @@ -3056,25 +3066,29 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr layer = NULL; switch_mutex_lock(canvas->mutex); + - if (canvas->layout_floor_id > -1 && imember->id == conference->video_floor_holder && - imember->video_layer_id != canvas->layout_floor_id) { - conference_video_attach_video_layer(imember, canvas, canvas->layout_floor_id); + if (zstr(imember->video_role_id) || !canvas->role_count) { + if (canvas->layout_floor_id > -1 && imember->id == conference->video_floor_holder && + imember->video_layer_id != canvas->layout_floor_id) { + conference_video_attach_video_layer(imember, canvas, canvas->layout_floor_id); + layer = &canvas->layers[imember->video_layer_id]; + } } //printf("MEMBER %d layer_id %d canvas: %d/%d\n", imember->id, imember->video_layer_id, // canvas->layers_used, canvas->total_layers); - if (imember->video_role_id) { + if (!zstr(imember->video_role_id) && canvas->role_count) { if (imember->video_layer_id > -1) { layer = &canvas->layers[imember->video_layer_id]; } - if (!layer || (!layer->geometry.role_id || strcmp(layer->geometry.role_id, imember->video_role_id))) { + if (!layer || (zstr(layer->geometry.role_id) || strcmp(layer->geometry.role_id, imember->video_role_id))) { for (i = 0; i < canvas->total_layers; i++) { mcu_layer_t *xlayer = &canvas->layers[i]; - if (imember->video_role_id && 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); layer = xlayer; } @@ -3082,8 +3096,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr } } - - if (!layer && imember->video_layer_id > -1) { + if (imember->video_layer_id > -1) { layer = &canvas->layers[imember->video_layer_id]; if (layer->member_id != (int)imember->id) { diff --git a/src/mod/applications/mod_conference/mod_conference.h b/src/mod/applications/mod_conference/mod_conference.h index b13c7c0d58..5f6af27566 100644 --- a/src/mod/applications/mod_conference/mod_conference.h +++ b/src/mod/applications/mod_conference/mod_conference.h @@ -521,6 +521,8 @@ typedef struct mcu_canvas_s { int height; switch_image_t *img; mcu_layer_t layers[MCU_MAX_LAYERS]; + int res_count; + int role_count; int total_layers; int layers_used; int layout_floor_id;