FS-8658: [mod_verto] windows fixes for mod_verto

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 45ca7c41c77565f2d438561c1b6280ae2f38807b..e4301fc27972a06571a5c6c13497ffb07e3d61eb 100644 (file)
--- 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 a62a39a388535b84a6e140806f582f3c1437ab19..1b8f1e894e79431842a33b5cf89d9af9578edf32 100644 (file)
--- 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);