kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-8016 #resolve [Reduce buffering of video in conference mux]

This commit is contained in:
Anthony Minessale 2015-08-20 12:03:14 -05:00
parent d71c4d4555
commit ebff42790f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/applications/mod_conference/conference_video.c
View 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);
}