提交 5b4c7259 authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-8384 #resolve [Locking contention in mod_conference]

上级 a711b7cd
......@@ -554,8 +554,6 @@ mcu_layer_t *conference_video_get_layer_locked(conference_member_t *member)
if (!member || member->canvas_id < 0 || member->video_layer_id < 0) return NULL;
switch_mutex_lock(member->conference->canvas_mutex);
canvas = member->conference->canvases[member->canvas_id];
if (!canvas) {
......@@ -571,10 +569,6 @@ mcu_layer_t *conference_video_get_layer_locked(conference_member_t *member)
end:
if (!layer) {
switch_mutex_unlock(member->conference->canvas_mutex);
}
return layer;
}
......@@ -592,8 +586,6 @@ void conference_video_release_layer(mcu_layer_t **layer)
switch_assert(canvas->conference);
switch_mutex_unlock(canvas->conference->canvas_mutex);
*layer = NULL;
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论