kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-29 13:43:07 +00:00
Code Issues Projects Releases Wiki Activity

FS-7513: missing some logic for those with video to take layers from those with avatars

Browse Source
This commit is contained in:
Anthony Minessale 2015-04-14 20:47:18 -05:00 committed by Michael Jerris
parent a988ec5743
commit 7d60e6e868
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod/applications/mod_conference/mod_conference.c
View File

@ -1764,7 +1764,7 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread
switch_frame_t write_frame = { 0 }; switch_frame_t write_frame = { 0 };
uint8_t *packet = NULL; uint8_t *packet = NULL;
switch_image_t *write_img = NULL, *file_img = NULL; switch_image_t *write_img = NULL, *file_img = NULL;
uint32_t timestamp = 0; uint32_t timestamp = 0, avatar_layers = 0;
video_layout_t *vlayout = get_layout(conference); video_layout_t *vlayout = get_layout(conference);
if (!vlayout) { if (!vlayout) {
@ -1916,7 +1916,17 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread
} }
} }
if (!layer && conference->canvas->layers_used < conference->canvas->total_layers && avatar_layers = 0;
for (i = 0; i < conference->canvas->total_layers; i++) {
mcu_layer_t *xlayer = &conference->canvas->layers[i];
if (xlayer->is_avatar && xlayer->member_id != conference->video_floor_holder) {
avatar_layers++;
}
}
if (!layer && (conference->canvas->layers_used < conference->canvas->total_layers ||
(avatar_layers && !imember->avatar_png_img)) &&
(imember->avatar_png_img || imember->video_flow != SWITCH_MEDIA_FLOW_SENDONLY)) { (imember->avatar_png_img || imember->video_flow != SWITCH_MEDIA_FLOW_SENDONLY)) {
/* find an empty layer */ /* find an empty layer */
for (i = 0; i < conference->canvas->total_layers; i++) { for (i = 0; i < conference->canvas->total_layers; i++) {