]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-9483 #resolve [mod_conference missing keyframe after reinvite]
authorAnthony Minessale <anthm@freeswitch.org>
Tue, 6 Sep 2016 16:03:08 +0000 (11:03 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Tue, 6 Sep 2016 16:03:08 +0000 (11:03 -0500)
src/mod/applications/mod_conference/conference_loop.c
src/mod/applications/mod_conference/conference_video.c

index 67592c874a3df51f3177e313b8141de31687d4b3..83d040f5f2ee9f42618780523e3b580d929b25cd 100644 (file)
@@ -711,6 +711,7 @@ void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, void *ob
                        conference_video_check_avatar(member, SWITCH_FALSE);
                        switch_core_session_video_reinit(member->session);
                        conference_video_set_floor_holder(member->conference, member, SWITCH_FALSE);
+                       switch_core_session_request_video_refresh(member->session);
                } else if (conference_utils_member_test_flag(member, MFLAG_ACK_VIDEO) && !switch_channel_test_flag(channel, CF_VIDEO)) {
                        conference_video_check_avatar(member, SWITCH_FALSE);
                }
index 252e149f6c6aa90d090b0cf153362df4d027e3a9..84e16366ac6e3daa11f737753942c379538036be 100644 (file)
@@ -1731,6 +1731,7 @@ void conference_video_check_avatar(conference_member_t *member, switch_bool_t fo
        if (!force && switch_channel_test_flag(member->channel, CF_VIDEO_READY) && 
                switch_core_session_media_flow(member->session, SWITCH_MEDIA_TYPE_VIDEO) != SWITCH_MEDIA_FLOW_SENDONLY && switch_core_session_media_flow(member->session, SWITCH_MEDIA_TYPE_VIDEO) != SWITCH_MEDIA_FLOW_INACTIVE) {
                conference_utils_member_set_flag_locked(member, MFLAG_ACK_VIDEO);
+               switch_core_session_request_video_refresh(member->session);
        } else {
                if (member->conference->no_video_avatar) {
                        avatar = member->conference->no_video_avatar;