From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 6 Sep 2016 16:03:08 +0000 (-0500)
Subject: FS-9483 #resolve [mod_conference missing keyframe after reinvite]
X-Git-Tag: v1.6.11~9^2~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a4058df8a05e16bd220da92a4de1cc8b15865f9;p=thirdparty%2Ffreeswitch.git

FS-9483 #resolve [mod_conference missing keyframe after reinvite]
---

diff --git a/src/mod/applications/mod_conference/conference_loop.c b/src/mod/applications/mod_conference/conference_loop.c
index 67592c874a..83d040f5f2 100644
--- a/src/mod/applications/mod_conference/conference_loop.c
+++ b/src/mod/applications/mod_conference/conference_loop.c
@@ -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);
 		}
diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 252e149f6c..84e16366ac 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -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;