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

FS-11031: [mod_conference] refresh and keyframes sent too often in multi-canvas mode #resolve

This commit is contained in:
Anthony Minessale 2018-03-14 13:40:08 -05:00 committed by Muteesa Fred
parent 054229fb68
commit b272c5e521
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2667,10 +2667,25 @@ switch_status_t conference_video_find_layer(conference_obj_t *conference, mcu_ca
void conference_video_next_canvas(conference_member_t *imember)
{
if (imember->canvas_id == (int)imember->conference->canvas_count - 1) {
imember->canvas_id = 0;
} else {
imember->canvas_id++;
int x = 0, y = 0;
if (imember->conference->canvas_count < 2) {
return;
}
y = imember->canvas_id;
for (x = 0; x < imember->conference->canvas_count; x++) {
if (y == (int)imember->conference->canvas_count - 1) {
y = 0;
} else {
y++;
}
if (imember->conference->canvases[y]->video_count < imember->conference->canvases[y]->total_layers) {
imember->canvas_id = y;
break;
}
}
imember->layer_timeout = DEFAULT_LAYER_TIMEOUT;