]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7513: let the core thread to read video if vid-floor in conference already locked...
authorSeven Du <dujinfang@gmail.com>
Tue, 16 Sep 2014 04:56:19 +0000 (12:56 +0800)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:46:43 +0000 (12:46 -0500)
src/mod/applications/mod_conference/mod_conference.c

index 802f7a27b6ccce978f3eed0988690e19fe00a8c2..46a3707c2828e96564edd395e2200181dcf15165 100644 (file)
@@ -2394,6 +2394,11 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
                
        }
 
+       if (member->conference->video_floor_holder && member->conference->video_floor_holder != member && member->channel) {
+               // there's already someone hold the floor, tell the core thread start to read video
+               switch_channel_clear_flag(member->channel, CF_VIDEO_PASSIVE);
+       }
+
        unlock_member(member);
        switch_mutex_unlock(member->audio_out_mutex);
        switch_mutex_unlock(member->audio_in_mutex);