kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-18 01:28:42 +00:00
Code Issues Projects Releases Wiki Activity

FS-8384 #resolve [Locking contention in mod_conference]

Browse Source
This commit is contained in:
Anthony Minessale 2015-10-23 13:58:33 -05:00
parent a711b7cd88
commit 5b4c725963
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod/applications/mod_conference/conference_video.c
View File

@ -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; 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]; canvas = member->conference->canvases[member->canvas_id];
if (!canvas) { if (!canvas) {
@ -571,10 +569,6 @@ mcu_layer_t *conference_video_get_layer_locked(conference_member_t *member)
end: end:
if (!layer) {
switch_mutex_unlock(member->conference->canvas_mutex);
}
return layer; return layer;
} }
@ -592,8 +586,6 @@ void conference_video_release_layer(mcu_layer_t **layer)
switch_assert(canvas->conference); switch_assert(canvas->conference);
switch_mutex_unlock(canvas->conference->canvas_mutex);
*layer = NULL; *layer = NULL;
} }