From 136dc465d6ee5295d9b85dc5af703e41e2dd9102 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 20 Apr 2017 10:53:55 -0500 Subject: [PATCH] FS-10254: [mod_conference] Send keyframe from shared encoder on layout changes #resolve --- .../applications/mod_conference/conference_video.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index 6a09886983..a0eb047476 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -2320,6 +2320,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr int files_playing = 0; int last_personal = conference_utils_test_flag(conference, CFLAG_PERSONAL_CANVAS) ? 1 : 0; int last_video_count = 0; + int watchers = 0, last_watchers = 0; canvas->video_timer_reset = 1; canvas->video_layout_group = conference->video_layout_group; @@ -2374,11 +2375,18 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr switch_mutex_unlock(conference->file_mutex); switch_mutex_lock(conference->member_mutex); + watchers = 0; + for (imember = conference->members; imember; imember = imember->next) { int no_muted = conference_utils_test_flag(imember->conference, CFLAG_VIDEO_MUTE_EXIT_CANVAS); int no_av = conference_utils_test_flag(imember->conference, CFLAG_VIDEO_REQUIRED_FOR_CANVAS); int seen = conference_utils_member_test_flag(imember, MFLAG_CAN_BE_SEEN); + if (imember->channel && switch_channel_ready(imember->channel) && switch_channel_test_flag(imember->channel, CF_VIDEO_READY) && + imember->watching_canvas_id == canvas->canvas_id) { + watchers++; + } + if (imember->channel && switch_channel_ready(imember->channel) && switch_channel_test_flag(imember->channel, CF_VIDEO_READY) && !conference_utils_member_test_flag(imember, MFLAG_SECOND_SCREEN) && conference_utils_member_test_flag(imember, MFLAG_RUNNING) && (!no_muted || seen) && (!no_av || (no_av && !imember->avatar_png_img)) @@ -2434,6 +2442,10 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr count_changed = 1; } + if (count_changed || watchers != last_watchers) { + canvas->send_keyframe = 1; + } + if (count_changed && !personal) { layout_group_t *lg = NULL; video_layout_t *vlayout = NULL; @@ -2447,7 +2459,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr } } - + last_watchers = watchers; last_file_count = file_count; if (do_refresh) {