提交 72e34621 authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-7800 disable video floor changes on multi canvas

上级 c11c2832
...@@ -2407,7 +2407,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr ...@@ -2407,7 +2407,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
} }
//VIDFLOOR //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) { imember->video_layer_id != canvas->layout_floor_id) {
conference_video_attach_video_layer(imember, canvas, 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_ ...@@ -3464,6 +3464,10 @@ void conference_video_set_floor_holder(conference_obj_t *conference, conference_
conference_utils_clear_flag(conference, CFLAG_VID_FLOOR_LOCK); conference_utils_clear_flag(conference, CFLAG_VID_FLOOR_LOCK);
} }
if (conference->canvas_count > 1) {
return;
}
if (member && member->video_reservation_id) { if (member && member->video_reservation_id) {
/* no video floor when a reservation id is set */ /* no video floor when a reservation id is set */
return; return;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论