]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-8602 #resolve [conference does not auto-generate layouts properly when callers...
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 2 Dec 2015 21:08:53 +0000 (15:08 -0600)
committerAnthony Minessale <anthm@freeswitch.org>
Wed, 2 Dec 2015 21:08:53 +0000 (15:08 -0600)
src/mod/applications/mod_conference/conference_video.c

index e973f352fad1f567764392302cd2b650bfebc376..6a16604226840b23e7be18a30e147639560d83f0 100644 (file)
@@ -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++;
                                }
                        }