kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-10472: [mod_conference] Crash due to hangup race in conference personal canvas mode -- the saga continues

This commit is contained in:
Anthony Minessale 2017-07-20 02:51:36 -05:00
parent d45a256ce0
commit de67e8031c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3622,7 +3622,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
}
}
if (layer) {
if (layer && !file_count) {
personal_attach(layer, omember);
}
@ -3642,7 +3642,9 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
layer->avatar_patched = 0;
} else {
if (!layer->avatar_patched) {
conference_video_scale_and_patch(layer, omember->avatar_png_img, SWITCH_FALSE);
if (omember->avatar_png_img) {
switch_img_copy(omember->avatar_png_img, &layer->cur_img);
}
layer->avatar_patched = 1;
}
use_img = NULL;
@ -3663,7 +3665,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
switch_img_fit(&tmp, layer->screen_w, layer->screen_h, SWITCH_FIT_SIZE);
//conference_video_member_video_mute_banner(imember->canvas, layer, imember);
conference_video_member_video_mute_banner(tmp, omember);
conference_video_scale_and_patch(layer, tmp, SWITCH_FALSE);
switch_img_copy(tmp, &layer->cur_img);
}
layer->mute_patched = 1;
@ -3689,6 +3691,8 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
switch_image_t *img = file_imgs[j];
layer = NULL;
if (!img) continue;
if (j == 0 && imember->canvas->layout_floor_id > -1) {
layer = &imember->canvas->layers[imember->canvas->layout_floor_id];
} else if (i < imember->canvas->total_layers) {
@ -3699,7 +3703,8 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
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);
switch_img_copy(img, &layer->cur_img);
conference_video_scale_and_patch(layer, NULL, SWITCH_FALSE);
}
}