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

FS-4622 --resolve

This commit is contained in:
Anthony Minessale 2013-04-17 15:17:51 -05:00
parent 6d016e81c4
commit 64341dc194
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/switch_resample.c
View File

@ -273,24 +273,17 @@ SWITCH_DECLARE(uint32_t) switch_unmerge_sln(int16_t *data, uint32_t samples, int
SWITCH_DECLARE(void) switch_mux_channels(int16_t *data, switch_size_t samples, uint32_t channels) SWITCH_DECLARE(void) switch_mux_channels(int16_t *data, switch_size_t samples, uint32_t channels)
{ {
int16_t *buf;
switch_size_t len = samples * sizeof(int16_t);
switch_size_t i = 0; switch_size_t i = 0;
uint32_t j = 0, k = 0; uint32_t j = 0;
switch_zmalloc(buf, len);
for (i = 0; i < samples; i++) { for (i = 0; i < samples; i++) {
int32_t z = 0;
for (j = 0; j < channels; j++) { for (j = 0; j < channels; j++) {
int32_t z = buf[i] + data[k++]; z += data[i * channels + j];
switch_normalize_to_16bit(z); switch_normalize_to_16bit(z);
buf[i] = (int16_t) z; data[i] = (int16_t) z;
} }
} }
memcpy(data, buf, len);
free(buf);
} }
SWITCH_DECLARE(void) switch_change_sln_volume_granular(int16_t *data, uint32_t samples, int32_t vol) SWITCH_DECLARE(void) switch_change_sln_volume_granular(int16_t *data, uint32_t samples, int32_t vol)