提交 055de414 authored 作者: Seven Du's avatar Seven Du 提交者: Michael Jerris

FS-7513: let the core thread to read video if vid-floor in conference already…

FS-7513: let the core thread to read video if vid-floor in conference already locked-hold by someone else
上级 4fc94e39
...@@ -2394,6 +2394,11 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe ...@@ -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);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论