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

This commit is contained in:
Anthony Minessale 2017-03-03 19:32:30 -06:00
parent 06bd37b623
commit b1658a62cc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2504,7 +2504,11 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
canvas->video_count = last_video_count = video_count;
switch_mutex_unlock(conference->member_mutex);
switch_core_timer_next(&canvas->timer);
if (conference->playing_video_file) {
switch_core_timer_sync(&canvas->timer);
} else {
switch_core_timer_next(&canvas->timer);
}
now = switch_micro_time_now();
@ -3210,7 +3214,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
timestamp = canvas->timer.samplecount;
if (conference->playing_video_file) {
if (switch_core_file_read_video(&conference->fnode->fh, &write_frame, SVR_FLUSH) == SWITCH_STATUS_SUCCESS) {
if (switch_core_file_read_video(&conference->fnode->fh, &write_frame, SVR_BLOCK) == SWITCH_STATUS_SUCCESS) {
switch_img_free(&file_img);
if (canvas->play_file) {