FS-10031: [mod_conference] Personal canvas mode doesn't switch layouts properly when...

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 850d274f963165f3ff4c23151e257c58491c5321..6c4e061aae408a36fc744473262a860ecc85c590 100644 (file)
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -1419,6 +1419,8 @@ video_layout_t *conference_video_find_best_layout(conference_obj_t *conference,
 {
        video_layout_node_t *vlnode = NULL, *last = NULL;
 
+       if (count == 1 && file_count == 1) file_count = 0;
+
        if (!count) {
                count = conference->members_with_video;
                file_count = 0;
@@ -1440,7 +1442,7 @@ video_layout_t *conference_video_find_best_layout(conference_obj_t *conference,
                                file_layers++;
                        }
                }
-
+               
                if ((vlnode->vlayout->layers - file_layers >= member_count && file_layers >= file_count) || vlnode->vlayout->layers - file_layers > (int)count) {
                        break;
                }
@@ -2826,14 +2828,14 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                                        if (conference->members_with_video == 1 && file_count) {
                                                total = 0;
                                        }
-
-                                       if (canvas->video_layout_group && (lg = switch_core_hash_find(conference->layout_group_hash, canvas->video_layout_group))) {
+                                       
+                                       if (conference->video_layout_group && (lg = switch_core_hash_find(conference->layout_group_hash, conference->video_layout_group))) {
                                                if ((vlayout = conference_video_find_best_layout(conference, lg, total + file_count, file_count))) {
                                                        conference_video_init_canvas_layers(conference, imember->canvas, vlayout);
                                                }
                                        }
-
-                                       if (imember->channel && !switch_channel_test_flag(imember->channel, CF_VIDEO_BITRATE_UNMANAGABLE) &&
+                                       
+                                       if (imember->channel && !switch_channel_test_flag(imember->channel, CF_VIDEO_BITRATE_UNMANAGABLE) && 
                                                conference_utils_test_flag(conference, CFLAG_MANAGE_INBOUND_VIDEO_BITRATE)) {
                                                switch_core_media_get_vid_params(imember->session, &vid_params);
                                                kps = switch_calc_bitrate(vid_params.width, vid_params.height, conference->video_quality, (int)(imember->conference->video_fps.fps));