From 31a7c446e61bdf5ad2cd3284b7ddcd5f45d65140 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 5 Jun 2015 23:46:56 -0500 Subject: [PATCH] FS-7479 fix regression --- src/include/switch_resample.h | 2 +- src/switch_resample.c | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/include/switch_resample.h b/src/include/switch_resample.h index b8c28b6fec..eb1a30e5cb 100644 --- a/src/include/switch_resample.h +++ b/src/include/switch_resample.h @@ -175,7 +175,7 @@ SWITCH_DECLARE(uint32_t) switch_merge_sln(int16_t *data, uint32_t samples, int16 SWITCH_DECLARE(uint32_t) switch_unmerge_sln(int16_t *data, uint32_t samples, int16_t *other_data, uint32_t other_samples); SWITCH_DECLARE(void) switch_mux_channels(int16_t *data, switch_size_t samples, uint32_t orig_channels, uint32_t channels); -#define switch_resample_calc_buffer_size(_to, _from, _srclen) (uint32_t)((float)(_to / _from) * (float)_srclen * 2) +#define switch_resample_calc_buffer_size(_to, _from, _srclen) ((uint32_t)(((float)_to / (float)_from) * (float)_srclen) * 2) SWITCH_END_EXTERN_C diff --git a/src/switch_resample.c b/src/switch_resample.c index 000768b46c..bca11e578e 100644 --- a/src/switch_resample.c +++ b/src/switch_resample.c @@ -63,7 +63,9 @@ SWITCH_DECLARE(switch_status_t) switch_resample_perform_create(switch_audio_resa switch_zmalloc(resampler, sizeof(*resampler)); - resampler->resampler = speex_resampler_init(channels ? channels : 1, from_rate, to_rate, quality, &err); + if (!channels) channels = 1; + + resampler->resampler = speex_resampler_init(channels, from_rate, to_rate, quality, &err); if (!resampler->resampler) { free(resampler); @@ -77,20 +79,27 @@ SWITCH_DECLARE(switch_status_t) switch_resample_perform_create(switch_audio_resa resampler->to_rate = to_rate; resampler->factor = (lto_rate / lfrom_rate); resampler->rfactor = (lfrom_rate / lto_rate); - resampler->to_size = resample_buffer(to_rate, from_rate, (uint32_t) to_size); - resampler->to = malloc(resampler->to_size * sizeof(int16_t) * (channels ? channels : 1)); resampler->channels = channels; + + //resampler->to_size = resample_buffer(to_rate, from_rate, (uint32_t) to_size); + + resampler->to_size = switch_resample_calc_buffer_size(resampler->to_rate, resampler->from_rate, to_size) / 2; + resampler->to = malloc(resampler->to_size * sizeof(int16_t) * resampler->channels); + switch_assert(resampler->to); return SWITCH_STATUS_SUCCESS; } SWITCH_DECLARE(uint32_t) switch_resample_process(switch_audio_resampler_t *resampler, int16_t *src, uint32_t srclen) { - if (switch_resample_calc_buffer_size(resampler->to_rate, resampler->from_rate, srclen) > SWITCH_RECOMMENDED_BUFFER_SIZE) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Out of Buffer SPACE!\n"); - return 0; + int to_size = switch_resample_calc_buffer_size(resampler->to_rate, resampler->from_rate, srclen) / 2; + + if (to_size > resampler->to_size) { + resampler->to_size = to_size; + resampler->to = realloc(resampler->to, resampler->to_size * sizeof(int16_t) * resampler->channels); + switch_assert(resampler->to); } - + resampler->to_len = resampler->to_size; speex_resampler_process_interleaved_int(resampler->resampler, src, &srclen, resampler->to, &resampler->to_len); return resampler->to_len;