kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rewind

This commit is contained in:
Anthony Minessale 2018-03-30 11:45:02 -05:00 committed by Muteesa Fred
parent 7ca8eec496
commit 2a6990a7e0
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/applications/mod_conference/conference_member.c
View File

@ -1070,7 +1070,7 @@ void conference_member_set_floor_holder(conference_obj_t *conference, conference
}
if (member && conference_utils_member_test_flag(member, MFLAG_DED_VID_LAYER)) {
goto end;
return;
}
conference->floor_holder_score_iir = 0;

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

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