kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-17 01:02:12 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Seven Du 2014-09-16 12:56:19 +08:00 committed by Michael Jerris
parent 4fc94e3907
commit 055de41484
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mod/applications/mod_conference/mod_conference.c
View 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); unlock_member(member);
switch_mutex_unlock(member->audio_out_mutex); switch_mutex_unlock(member->audio_out_mutex);
switch_mutex_unlock(member->audio_in_mutex); switch_mutex_unlock(member->audio_in_mutex);