ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 05:02:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix vid switching in webrtc

Browse Source
This commit is contained in:
Anthony Minessale
2013-10-15 04:57:57 +05:00
parent 230e005a08
commit 850c154bd4
2 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mod/applications/mod_conference/mod_conference.c
+16 -3
View File
@@ -1599,7 +1599,7 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
static void conference_set_video_floor_holder(conference_obj_t *conference, conference_member_t *member, switch_bool_t force)
{
switch_event_t *event;
conference_member_t *old_member = NULL;
conference_member_t *old_member = NULL, *imember = NULL;
int old_id = 0;
if (!member) {
@@ -1623,8 +1623,6 @@ static void conference_set_video_floor_holder(conference_obj_t *conference, conf
switch_mutex_lock(conference->mutex);
if (!member) {
conference_member_t *imember;
for (imember = conference->members; imember; imember = imember->next) {
if (imember != conference->video_floor_holder && imember->channel && switch_channel_test_flag(imember->channel, CF_VIDEO)) {
member = imember;
@@ -1648,6 +1646,20 @@ static void conference_set_video_floor_holder(conference_obj_t *conference, conf
//switch_channel_clear_flag(old_member->channel, CF_VIDEO_PASSIVE);
}
for (imember = conference->members; imember; imember = imember->next) {
if (!imember->channel || !switch_channel_test_flag(imember->channel, CF_VIDEO)) {
continue;
}
switch_channel_clear_flag(imember->channel, CF_VIDEO_ECHO);
if (imember == conference->video_floor_holder) {
switch_channel_set_flag(imember->channel, CF_VIDEO_PASSIVE);
} else {
switch_channel_clear_flag(imember->channel, CF_VIDEO_PASSIVE);
}
switch_core_session_refresh_video(imember->session);
}
switch_set_flag(conference, CFLAG_FLOOR_CHANGE);
switch_mutex_unlock(conference->mutex);
@@ -7505,6 +7517,7 @@ SWITCH_STANDARD_APP(conference_function)
switch_channel_set_flag(channel, CF_CONFERENCE);
switch_channel_set_flag(channel, CF_VIDEO_PASSIVE);
if (switch_channel_answer(channel) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Channel answer failed.\n");
goto end;