kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-04 17:51:03 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anthony Minessale 2017-03-09 15:29:10 -06:00
parent e19e329fc7
commit 86355674f3
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2391,11 +2391,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
canvas->video_count = last_video_count = video_count; canvas->video_count = last_video_count = video_count;
switch_mutex_unlock(conference->member_mutex); switch_mutex_unlock(conference->member_mutex);
if (conference->playing_video_file) {
switch_core_timer_sync(&canvas->timer);
} else {
switch_core_timer_next(&canvas->timer); switch_core_timer_next(&canvas->timer);
}
now = switch_micro_time_now(); now = switch_micro_time_now();
@ -3097,7 +3093,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
timestamp = canvas->timer.samplecount; timestamp = canvas->timer.samplecount;
if (conference->playing_video_file) { if (conference->playing_video_file) {
if (switch_core_file_read_video(&conference->fnode->fh, &write_frame, SVR_BLOCK) == SWITCH_STATUS_SUCCESS) { if (switch_core_file_read_video(&conference->fnode->fh, &write_frame, SVR_FLUSH) == SWITCH_STATUS_SUCCESS) {
switch_img_free(&file_img); switch_img_free(&file_img);
if (canvas->play_file) { if (canvas->play_file) {
@ -3106,9 +3102,10 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
} }
switch_img_free(&file_img); switch_img_free(&file_img);
switch_img_fit(&write_frame.img, canvas->img->d_w, canvas->img->d_h, SWITCH_FIT_SIZE);
file_img = write_img = write_frame.img; file_img = write_img = write_frame.img;
switch_core_timer_sync(&canvas->timer); //switch_core_timer_sync(&canvas->timer);
timestamp = canvas->timer.samplecount; timestamp = canvas->timer.samplecount;
} else if (file_img) { } else if (file_img) {
write_img = file_img; write_img = file_img;