kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-27 11:47:41 +00:00
Code Issues Projects Releases Wiki Activity

FS-8354: #resolve [revert back ported patch for rate change detection it introducted a regression]

Browse Source
This commit is contained in:
Brian West 2015-10-16 15:47:56 -05:00
parent f90dd4b1c0
commit 02d7baf79e
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mod/applications/mod_conference/mod_conference.c
View File

@ -4267,7 +4267,7 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
switch_frame_t *read_frame = NULL; switch_frame_t *read_frame = NULL;
uint32_t hangover = 40, hangunder = 5, hangover_hits = 0, hangunder_hits = 0, diff_level = 400; uint32_t hangover = 40, hangunder = 5, hangover_hits = 0, hangunder_hits = 0, diff_level = 400;
switch_core_session_t *session = member->session; switch_core_session_t *session = member->session;
uint32_t flush_len; uint32_t flush_len, loops = 0;
switch_frame_t tmp_frame = { 0 }; switch_frame_t tmp_frame = { 0 };
if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) {
@ -4531,16 +4531,20 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
member->last_score = member->score; member->last_score = member->score;
} }
loops++;
if (switch_channel_test_flag(member->channel, CF_CONFERENCE_RESET_MEDIA)) { if (switch_channel_test_flag(member->channel, CF_CONFERENCE_RESET_MEDIA)) {
switch_channel_clear_flag(member->channel, CF_CONFERENCE_RESET_MEDIA); switch_channel_clear_flag(member->channel, CF_CONFERENCE_RESET_MEDIA);
member->loop_loop = 1; if (loops > 500) {
member->loop_loop = 1;
if (setup_media(member, member->conference)) { if (setup_media(member, member->conference)) {
switch_mutex_unlock(member->read_mutex); switch_mutex_unlock(member->read_mutex);
break; break;
}
} }
goto do_continue;
} }
/* skip frames that are not actual media or when we are muted or silent */ /* skip frames that are not actual media or when we are muted or silent */
@ -4873,11 +4877,6 @@ static void conference_loop_output(conference_member_t *member)
switch_buffer_t *use_buffer = NULL; switch_buffer_t *use_buffer = NULL;
uint32_t mux_used = 0; uint32_t mux_used = 0;
if (switch_channel_test_flag(member->channel, CF_CONFERENCE_RESET_MEDIA)) {
switch_cond_next();
continue;
}
switch_mutex_lock(member->write_mutex); switch_mutex_lock(member->write_mutex);