]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-8527 [mod_conference] Do not send the video of last_video_floor_holder to video_fl...
authorroot <root@mxserver2.(none)>
Fri, 13 Nov 2015 03:00:18 +0000 (11:00 +0800)
committermicjerry <root@mxserver2.(none)>
Tue, 17 Nov 2015 02:16:42 +0000 (10:16 +0800)
src/mod/applications/mod_conference/conference_video.c

index 1dabed8888e4387083304201785fce99578ed06c..41070a60e6b5e24d400e7b0a356ede5133f8b323 100644 (file)
@@ -3468,7 +3468,8 @@ switch_status_t conference_video_thread_callback(switch_core_session_t *session,
                        conference_member_t *fmember;
 
                        if ((fmember = conference_member_get(member->conference, member->conference->video_floor_holder))) {
-                               switch_core_session_write_video_frame(fmember->session, frame, SWITCH_IO_FLAG_NONE, 0);
+                               if (!conference_utils_member_test_flag(fmember, MFLAG_RECEIVING_VIDEO))
+                                       switch_core_session_write_video_frame(fmember->session, frame, SWITCH_IO_FLAG_NONE, 0);
                                switch_thread_rwlock_unlock(fmember->rwlock);
                        }
                }