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

FS-10091: [mod_conference] Conference play file with full-screen=true has side effect on member video #resolve

This commit is contained in:
Anthony Minessale 2017-03-03 17:35:03 -06:00
parent c50aac4eb8
commit 08fa9f62ae
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2696,16 +2696,15 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
conference_video_attach_video_layer(imember, canvas, canvas->layout_floor_id); conference_video_attach_video_layer(imember, canvas, canvas->layout_floor_id);
} }
conference_video_pop_next_image(imember, &img);
layer = NULL;
if (conference->playing_video_file) { if (conference->playing_video_file) {
switch_img_free(&img); switch_img_free(&img);
switch_core_session_rwunlock(imember->session); switch_core_session_rwunlock(imember->session);
continue; continue;
} }
conference_video_pop_next_image(imember, &img);
layer = NULL;
switch_mutex_lock(canvas->mutex); switch_mutex_lock(canvas->mutex);
//printf("MEMBER %d layer_id %d canvas: %d/%d\n", imember->id, imember->video_layer_id, //printf("MEMBER %d layer_id %d canvas: %d/%d\n", imember->id, imember->video_layer_id,