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

FS-10561: [freeswitch-core,mod_conference] Video concurrency improvements for 1.8 -- fix locking regression #resolve

This commit is contained in:
Anthony Minessale 2017-08-16 14:16:45 -05:00
parent bfa39a457e
commit 8a842f8f7c
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -586,7 +586,6 @@ void conference_event_adv_layout(conference_obj_t *conference, mcu_canvas_t *can
cJSON_AddItemToObject(msg, "eventChannel", cJSON_CreateString(conference->info_event_channel));
cJSON_AddItemToObject(data, "contentType", cJSON_CreateString("layout-info"));
switch_mutex_lock(canvas->write_mutex);
switch_mutex_lock(canvas->mutex);
if ((obj = get_canvas_info(canvas))) {
@ -622,7 +621,6 @@ void conference_event_adv_layout(conference_obj_t *conference, mcu_canvas_t *can
cJSON_AddItemToObject(data, "canvasInfo", obj);
}
switch_mutex_unlock(canvas->write_mutex);
switch_mutex_unlock(canvas->mutex);
switch_event_channel_broadcast(conference->info_event_channel, &msg, "mod_conference", conference_globals.event_channel_id);