kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1244 in FS/freeswitch from ~DRAGOS_OANCEA_NX/freeswitch-dragos-nx:fix/FS-10191/disable_video_floor_event_for_audio to master 

* commit '4d4afbeb5d9a6aa2d8fced093aeba9b27c1e5623':
  FS-10191: don't send "video-floor-change" event for audio-only conference
This commit is contained in:
Andrey Volk 2019-09-05 12:24:23 -05:00
parent eee07bd95f 4d4afbeb5d
commit d0c6b30c15
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/applications/mod_conference/conference_loop.c
View File

@ -1193,7 +1193,7 @@ void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, void *ob
member->last_score = member->score;
if (member->id == member->conference->floor_holder) {
if ((switch_channel_test_flag(channel, CF_VIDEO) || member->avatar_png_img) && (member->id == member->conference->floor_holder)) {
if (member->id != member->conference->video_floor_holder &&
(member->floor_packets > member->conference->video_floor_packets || member->energy_level == 0)) {
conference_video_set_floor_holder(member->conference, member, SWITCH_FALSE);