kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-9525 #resolve [Client initiated REINVITE with different audio codec into conference causes choppy audio]

This commit is contained in:
Anthony Minessale 2016-09-22 14:00:12 -05:00
parent f410ac3403
commit 4aaaf76190
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mod/applications/mod_conference/conference_loop.c
View File

@ -1108,18 +1108,19 @@ void conference_loop_output(conference_member_t *member)
uint32_t flush_len; uint32_t flush_len;
uint32_t low_count, bytes; uint32_t low_count, bytes;
call_list_t *call_list, *cp; call_list_t *call_list, *cp;
switch_codec_implementation_t read_impl = { 0 }; switch_codec_implementation_t read_impl = { 0 }, real_read_impl = { 0 };
int sanity; int sanity;
switch_status_t st; switch_status_t st;
switch_core_session_get_read_impl(member->session, &read_impl); switch_core_session_get_read_impl(member->session, &read_impl);
switch_core_session_get_real_read_impl(member->session, &real_read_impl);
channel = switch_core_session_get_channel(member->session); channel = switch_core_session_get_channel(member->session);
interval = read_impl.microseconds_per_packet / 1000; interval = read_impl.microseconds_per_packet / 1000;
samples = switch_samples_per_packet(member->conference->rate, interval); samples = switch_samples_per_packet(member->conference->rate, interval);
//csamples = samples; //csamples = samples;
tsamples = member->orig_read_impl.samples_per_packet; tsamples = real_read_impl.samples_per_packet;
low_count = 0; low_count = 0;
bytes = samples * 2 * member->conference->channels; bytes = samples * 2 * member->conference->channels;
call_list = NULL; call_list = NULL;
@ -1136,8 +1137,8 @@ void conference_loop_output(conference_member_t *member)
return; return;
} }
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_DEBUG, "Setup timer %s success interval: %u samples: %u\n", switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_DEBUG, "Setup timer %s success interval: %u samples: %u from codec %s\n",
member->conference->timer_name, interval, tsamples); member->conference->timer_name, interval, tsamples, real_read_impl.iananame);
write_frame.data = data = switch_core_session_alloc(member->session, SWITCH_RECOMMENDED_BUFFER_SIZE); write_frame.data = data = switch_core_session_alloc(member->session, SWITCH_RECOMMENDED_BUFFER_SIZE);

2
src/switch_core_codec.c
View File

@ -132,6 +132,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_real_read_codec(switch_c
cur_codec = cur_codec->next; cur_codec = cur_codec->next;
} }
session->real_read_codec = codec; session->real_read_codec = codec;
session->real_read_impl = *codec->implementation;
/* set read_codec with real_read_codec if it no longer is ready */ /* set read_codec with real_read_codec if it no longer is ready */
if (!switch_core_codec_ready(session->read_codec)) { if (!switch_core_codec_ready(session->read_codec)) {
session->read_codec = codec; session->read_codec = codec;