From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 2 Dec 2015 21:08:53 +0000 (-0600)
Subject: FS-8602 #resolve [conference does not auto-generate layouts properly when callers... 
X-Git-Tag: v1.6.6~1^2~77^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c021d22ea66e10fd33527fed2ef623834bb0af13;p=thirdparty%2Ffreeswitch.git

FS-8602 #resolve [conference does not auto-generate layouts properly when callers with no camera are present]
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index e973f352fa..6a16604226 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -2088,8 +2088,9 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
 
 			switch_mutex_lock(conference->member_mutex);
 			for (imember = conference->members; imember; imember = imember->next) {
-				if (imember->channel && switch_channel_ready(imember->channel) && conference_utils_member_test_flag(imember, MFLAG_RUNNING) 
-					&& imember->canvas_id == canvas->canvas_id) {
+				if (imember->channel && switch_channel_ready(imember->channel) && switch_channel_test_flag(imember->channel, CF_VIDEO) && 
+					conference_utils_member_test_flag(imember, MFLAG_RUNNING) 
+					&& imember->canvas_id == canvas->canvas_id && imember->video_media_flow != SWITCH_MEDIA_FLOW_SENDONLY) {
 					canvas_count++;
 				}
 			}