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

FS-7800 disable video floor changes on multi canvas

This commit is contained in:
Anthony Minessale 2016-03-23 08:45:30 -05:00
parent c11c2832e4
commit 72e3462118
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2407,7 +2407,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
}
//VIDFLOOR
if (canvas->layout_floor_id > -1 && imember->id == conference->video_floor_holder &&
if (conference->canvas_count == 1 && 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);
}
@ -3464,6 +3464,10 @@ void conference_video_set_floor_holder(conference_obj_t *conference, conference_
conference_utils_clear_flag(conference, CFLAG_VID_FLOOR_LOCK);
}
if (conference->canvas_count > 1) {
return;
}
if (member && member->video_reservation_id) {
/* no video floor when a reservation id is set */
return;