retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-10225: [mod_conference] Incorrect layout chosen when playing a file in a conference with a layout group #resolve 

Conflicts:
	src/mod/applications/mod_conference/conference_video.c
This commit is contained in:
Anthony Minessale 2017-04-11 17:45:15 -05:00 committed by Mike Jerris
parent 59d6c456e3
commit a6b53cdfe0
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1354,7 +1354,7 @@ void conference_video_write_canvas_image_to_codec_group(conference_obj_t *confer
video_layout_t *conference_video_find_best_layout(conference_obj_t *conference, layout_group_t *lg, uint32_t count, uint32_t file_count)
{
video_layout_node_t *vlnode = NULL, *last = NULL;
video_layout_node_t *vlnode = NULL, *last = NULL, *least = NULL;
if (count == 1 && file_count == 1) file_count = 0;
@ -1373,20 +1373,31 @@ video_layout_t *conference_video_find_best_layout(conference_obj_t *conference,
for (vlnode = lg->layouts; vlnode; vlnode = vlnode->next) {
int x, file_layers = 0, member_count = (int)count - file_count, total = vlnode->vlayout->layers;
for (x = total; x >= 0; x--) {
if (vlnode->vlayout->images[x].fileonly) {
file_layers++;
}
}
if ((vlnode->vlayout->layers - file_layers >= member_count && file_layers >= file_count) || vlnode->vlayout->layers - file_layers > (int)count) {
if ((vlnode->vlayout->layers - file_layers >= member_count && file_layers >= file_count)) {
break;
}
if (vlnode->vlayout->layers - file_layers >= (int)count) {
if (!least || least->vlayout->layers > vlnode->vlayout->layers) {
least = vlnode;
}
}
last = vlnode;
}
if (least) {
vlnode = least;
}
return vlnode? vlnode->vlayout : last ? last->vlayout : NULL;
}