kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-21 19:45:34 +00:00
Code Issues Projects Releases Wiki Activity

FS-8211 #resolve [Conference video recordings of layouts with overlap have flickering video]

Browse Source
This commit is contained in:
Anthony Minessale 2015-09-23 13:24:14 -05:00
parent 819a2c13a9
commit dd6da6e06a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1915,7 +1915,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
canvas->video_timer_reset = 1; canvas->video_timer_reset = 1;
packet = switch_core_alloc(conference->pool, SWITCH_RTP_MAX_BUF_LEN); packet = switch_core_alloc(conference->pool, SWITCH_RTP_MAX_BUF_LEN);
while (conference_globals.running && !conference_utils_test_flag(conference, CFLAG_DESTRUCT) && conference_utils_test_flag(conference, CFLAG_VIDEO_MUXING)) { while (conference_globals.running && !conference_utils_test_flag(conference, CFLAG_DESTRUCT) && conference_utils_test_flag(conference, CFLAG_VIDEO_MUXING)) {
switch_bool_t need_refresh = SWITCH_FALSE, send_keyframe = SWITCH_FALSE, need_reset = SWITCH_FALSE; switch_bool_t need_refresh = SWITCH_FALSE, send_keyframe = SWITCH_FALSE, need_reset = SWITCH_FALSE;
switch_time_t now; switch_time_t now;
@ -2562,12 +2562,12 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
write_frame.img = write_img; write_frame.img = write_img;
wait_for_canvas(canvas);
if (canvas->recording) { if (canvas->recording) {
conference_video_check_recording(conference, canvas, &write_frame); conference_video_check_recording(conference, canvas, &write_frame);
} }
wait_for_canvas(canvas);
if (conference->canvas_count > 1) { if (conference->canvas_count > 1) {
switch_image_t *img_copy = NULL; switch_image_t *img_copy = NULL;