From dbec35e734ac401003f42a49b29b9ccdd43add10 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 2 Mar 2015 20:58:48 -0600 Subject: [PATCH] FS-7513: move code up --- src/mod/applications/mod_conference/mod_conference.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 2acfee326a..ffd8bd0f85 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -3641,6 +3641,11 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe switch_assert(conference != NULL); switch_assert(member != NULL); + if (member->session && switch_test_flag(conference, CFLAG_TRANSCODE_VIDEO)) { + switch_channel_set_flag(channel, CF_VIDEO_DECODED_READ); + switch_core_media_gen_key_frame(member->session); + } + switch_mutex_lock(conference->mutex); switch_mutex_lock(member->audio_in_mutex); switch_mutex_lock(member->audio_out_mutex); @@ -3689,13 +3694,6 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe switch_set_flag_locked(member, MFLAG_ACK_VIDEO); } - if (switch_test_flag(conference, CFLAG_TRANSCODE_VIDEO)) { - switch_channel_set_flag(channel, CF_VIDEO_DECODED_READ); - switch_core_media_gen_key_frame(member->session); - } - - - if ((var = switch_channel_get_variable_dup(member->channel, "video_mute_png", SWITCH_FALSE, -1))) { member->video_mute_png = switch_core_strdup(member->pool, var); }