kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 16:39:14 +00:00
Code Issues Projects Releases Wiki Activity

FS-7513: add mutex

Browse Source
This commit is contained in:
Anthony Minessale 2015-02-19 18:10:37 -06:00 committed by Michael Jerris
parent c2963fa4fa
commit ae4686013a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mod/applications/mod_conference/mod_conference.c
View File

@ -1341,6 +1341,7 @@ static void init_canvas_layers(conference_obj_t *conference, video_layout_t *vla
if (!conference->canvas) return; if (!conference->canvas) return;
switch_mutex_lock(conference->canvas->mutex);
conference->canvas->layout_floor_id = -1; conference->canvas->layout_floor_id = -1;
for (i = 0; i < vlayout->layers; i++) { 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->layers_used = 0;
conference->canvas->total_layers = vlayout->layers; conference->canvas->total_layers = vlayout->layers;
switch_mutex_unlock(conference->canvas->mutex);
} }
static void init_canvas(conference_obj_t *conference, video_layout_t *vlayout) 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++) { for (i = 0; i < MCU_MAX_LAYERS; i++) {
layer = &conference->canvas->layers[i]; layer = &conference->canvas->layers[i];