]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-8016 #resolve [Reduce buffering of video in conference mux]
authorAnthony Minessale <anthm@freeswitch.org>
Thu, 20 Aug 2015 17:03:14 +0000 (12:03 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Thu, 20 Aug 2015 17:03:14 +0000 (12:03 -0500)
src/mod/applications/mod_conference/conference_video.c

index 2a92d42544dfbe9028c81a959e19d2353e815a9b..08d2a91dc7c5f3cde01625543aac4fdf7450ba46 100644 (file)
@@ -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);
                }