FS-8384 #resolve [Locking contention in mod_conference]

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index bf469577ca1f226fe9865434ffb68197a29145f8..d45bc853b47fa7291418e8a4c5a6395ffc7e48ce 100644 (file)
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -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;
 }