kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-15 11:29:56 +00:00
Code Issues Projects Releases Wiki Activity

FS-10472: [mod_conference] Crash due to hangup race in conference personal canvas mode -- Regression fixed with playing files

Browse Source
This commit is contained in:
Anthony Minessale 2017-07-14 15:09:30 -05:00
parent a205bb6358
commit 58dffd3759
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1428,7 +1428,6 @@ void conference_video_init_canvas_layers(conference_obj_t *conference, mcu_canva
switch_thread_rwlock_wrlock(canvas->video_rwlock); switch_thread_rwlock_wrlock(canvas->video_rwlock);
switch_mutex_lock(canvas->mutex); switch_mutex_lock(canvas->mutex);
canvas->layout_floor_id = -1;
for (i = 0; i < MCU_MAX_LAYERS; i++) { for (i = 0; i < MCU_MAX_LAYERS; i++) {
mcu_layer_t *layer = &canvas->layers[i]; mcu_layer_t *layer = &canvas->layers[i];
@ -1448,6 +1447,8 @@ void conference_video_init_canvas_layers(conference_obj_t *conference, mcu_canva
return; return;
} }
canvas->layout_floor_id = -1;
if (!vlayout) { if (!vlayout) {
vlayout = canvas->new_vlayout; vlayout = canvas->new_vlayout;
canvas->new_vlayout = NULL; canvas->new_vlayout = NULL;
@ -3664,18 +3665,20 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
for (j = 0; j < file_count; j++) { for (j = 0; j < file_count; j++) {
switch_image_t *img = file_imgs[j]; switch_image_t *img = file_imgs[j];
layer = NULL;
if (j == 0 && imember->canvas->layout_floor_id > -1) { if (j == 0 && imember->canvas->layout_floor_id > -1) {
layer = &imember->canvas->layers[imember->canvas->layout_floor_id]; layer = &imember->canvas->layers[imember->canvas->layout_floor_id];
conference_video_scale_and_patch(layer, img, SWITCH_FALSE);
} else if (i < imember->canvas->total_layers) { } else if (i < imember->canvas->total_layers) {
layer = &imember->canvas->layers[i++]; layer = &imember->canvas->layers[i++];
conference_video_scale_and_patch(layer, img, SWITCH_FALSE);
}
} }
if (imember->session) { if (layer) {
switch_core_session_rwunlock(imember->session); switch_img_free(&layer->banner_img);
switch_img_free(&layer->logo_img);
layer->member_id = -1;
conference_video_scale_and_patch(layer, img, SWITCH_FALSE);
}
} }
} }