From: Seven Du <dujinfang@gmail.com>
Date: Tue, 16 Sep 2014 04:56:19 +0000 (+0800)
Subject: FS-7513: let the core thread to read video if vid-floor in conference already locked... 
X-Git-Tag: v1.6.2~614^2~601
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=055de414845e494a226322e212cfeb9ddf8d2de0;p=thirdparty%2Ffreeswitch.git

FS-7513: let the core thread to read video if vid-floor in conference already locked-hold by someone else
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 802f7a27b6..46a3707c28 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -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);