提交 8a842f8f authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-10561: [freeswitch-core,mod_conference] Video concurrency improvements for…

FS-10561: [freeswitch-core,mod_conference] Video concurrency improvements for 1.8 -- fix locking regression #resolve
上级 bfa39a45
......@@ -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);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论