From ae4686013adc5f11f43854e555b63a8d3569e478 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 19 Feb 2015 18:10:37 -0600 Subject: [PATCH] FS-7513: add mutex --- src/mod/applications/mod_conference/mod_conference.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index f4179f2615..4ce8757d9c 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -1341,6 +1341,7 @@ static void init_canvas_layers(conference_obj_t *conference, video_layout_t *vla if (!conference->canvas) return; + switch_mutex_lock(conference->canvas->mutex); conference->canvas->layout_floor_id = -1; for (i = 0; i < vlayout->layers; i++) { @@ -1386,6 +1387,8 @@ static void init_canvas_layers(conference_obj_t *conference, video_layout_t *vla conference->canvas->layers_used = 0; conference->canvas->total_layers = vlayout->layers; + switch_mutex_unlock(conference->canvas->mutex); + } static void init_canvas(conference_obj_t *conference, video_layout_t *vlayout) @@ -1829,7 +1832,7 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread } } - + for (i = 0; i < MCU_MAX_LAYERS; i++) { layer = &conference->canvas->layers[i];