From ebff42790f19e96da5527a0afb5bf350c4519410 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 20 Aug 2015 12:03:14 -0500 Subject: [PATCH] FS-8016 #resolve [Reduce buffering of video in conference mux] --- src/mod/applications/mod_conference/conference_video.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index 2a92d42544..08d2a91dc7 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -1772,7 +1772,7 @@ void conference_video_pop_next_image(conference_member_t *member, switch_image_t break; } size = switch_queue_size(member->video_queue); - } while(size > member->conference->video_fps.fps / 2); + } while(size > 1); if (conference_utils_member_test_flag(member, MFLAG_CAN_BE_SEEN) && member->video_layer_id > -1 && member->video_flow != SWITCH_MEDIA_FLOW_SENDONLY) { if (img) { @@ -3293,7 +3293,7 @@ switch_status_t conference_video_thread_callback(switch_core_session_t *session, switch_image_t *img_copy = NULL; if (frame->img && (member->video_layer_id > -1 || member->canvas) && conference_utils_member_test_flag(member, MFLAG_CAN_BE_SEEN) && - !member->conference->playing_video_file && switch_queue_size(member->video_queue) < member->conference->video_fps.fps) { + !member->conference->playing_video_file) { switch_img_copy(frame->img, &img_copy); switch_queue_push(member->video_queue, img_copy); }