retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-10472: [mod_conference] Crash due to hangup race in conference personal canvas mode -- Regression fixed with playing files cont (manual cherry-pick)

This commit is contained in:
Anthony Minessale 2017-07-14 15:18:31 -05:00
parent 26cbfd4f6c
commit c540248da4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1050,7 +1050,6 @@ void conference_video_init_canvas_layers(conference_obj_t *conference, mcu_canva
switch_thread_rwlock_wrlock(canvas->video_rwlock);
switch_mutex_lock(canvas->mutex);
canvas->layout_floor_id = -1;
for (i = 0; i < MCU_MAX_LAYERS; i++) {
mcu_layer_t *layer = &canvas->layers[i];
@ -1070,6 +1069,8 @@ void conference_video_init_canvas_layers(conference_obj_t *conference, mcu_canva
return;
}
canvas->layout_floor_id = -1;
if (!vlayout) {
switch_mutex_unlock(canvas->mutex);
switch_thread_rwlock_unlock(canvas->video_rwlock);
@ -3057,12 +3058,18 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
for (j = 0; j < file_count; j++) {
switch_image_t *img = file_imgs[j];
layer = NULL;
if (j == 0 && imember->canvas->layout_floor_id > -1) {
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) {
layer = &imember->canvas->layers[i++];
}
if (layer) {
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);
}
}