From: Anthony Minessale Date: Fri, 14 Feb 2014 17:40:21 +0000 (+0500) Subject: regression from 8f82979d8af920415bce2f9e9e3cb84cdc0ca682 using wrong values to calcul... X-Git-Tag: v1.2.23~98 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab3f4f395b9e477093ee47adcc74145e3c9c2ea7;p=thirdparty%2Ffreeswitch.git regression from 8f82979d8af920415bce2f9e9e3cb84cdc0ca682 using wrong values to calculate buffer size Conflicts: src/mod/applications/mod_conference/mod_conference.c --- diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 763ec3adcd..6518cdc53c 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -3151,7 +3151,7 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v switch_core_session_get_read_impl(session, &member->read_impl); switch_channel_audio_sync(channel); - flush_len = switch_samples_per_packet(member->read_impl.actual_samples_per_second, (member->read_impl.microseconds_per_packet / 1000)) * 6; + flush_len = switch_samples_per_packet(member->conference->rate, member->conference->interval) * 6; /* As long as we have a valid read, feed that data into an input buffer where the conference thread will take it and mux it with any audio from other channels. */