From 8670e5f801b5fd3717e88854fef28041350ceca1 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 14 Dec 2015 16:05:51 -0600 Subject: [PATCH] FS-8642 addtl patch --- src/mod/applications/mod_conference/conference_video.c | 3 ++- src/switch_channel.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index 45ca7c41c7..e4301fc279 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -649,6 +649,7 @@ void conference_video_detach_video_layer(conference_member_t *member) member->avatar_patched = 0; conference_video_check_used_layers(canvas); canvas->send_keyframe = 1; + member->managed_kps = 0; if (conference_utils_test_flag(member->conference, CFLAG_JSON_STATUS)) { conference_member_update_status_field(member); @@ -876,7 +877,6 @@ void conference_video_layer_set_banner(conference_member_t *member, mcu_layer_t void conference_video_reset_video_bitrate_counters(conference_member_t *member) { - member->managed_kps = 0; member->blackouts = 0; member->good_img = 0; member->blanks = 0; @@ -972,6 +972,7 @@ switch_status_t conference_video_attach_video_layer(conference_member_t *member, switch_img_fill(canvas->img, layer->x_pos, layer->y_pos, layer->screen_w, layer->screen_h, &canvas->letterbox_bgcolor); conference_video_reset_video_bitrate_counters(member); + member->managed_kps = 0; if (conference_utils_test_flag(member->conference, CFLAG_JSON_STATUS)) { conference_member_update_status_field(member); diff --git a/src/switch_channel.c b/src/switch_channel.c index a62a39a388..1b8f1e894e 100644 --- a/src/switch_channel.c +++ b/src/switch_channel.c @@ -1858,7 +1858,7 @@ SWITCH_DECLARE(void) switch_channel_set_flag_value(switch_channel_t *channel, sw switch_core_session_start_video_thread(channel->session); } - if (flag == CF_VIDEO_DECODED_READ) { + if (flag == CF_VIDEO_DECODED_READ && channel->flags[CF_VIDEO]) { switch_core_session_request_video_refresh(channel->session); if (!switch_core_session_in_video_thread(channel->session)) { switch_channel_wait_for_flag(channel, CF_VIDEO_READY, SWITCH_TRUE, 10000, NULL);