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

FS-11678: add/fix muxing to 2 channels (when audio file is multichannel - more than 2 channels)

This commit is contained in:
Dragos Oancea 2019-03-14 14:27:06 +00:00
parent 99bd3b3c6e
commit 2997ceb56f
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/switch_resample.c
View File

@ -279,13 +279,38 @@ SWITCH_DECLARE(void) switch_mux_channels(int16_t *data, switch_size_t samples, u
switch_assert(channels < 11); switch_assert(channels < 11);
if (orig_channels > channels) { if (orig_channels > channels) {
if (channels == 1) {
for (i = 0; i < samples; i++) { for (i = 0; i < samples; i++) {
int32_t z = 0; int32_t z = 0; int16_t y, last = 0;
for (j = 0; j < orig_channels; j++) { for (j = 0; j < orig_channels; j++) {
z += data[i * orig_channels + j]; y = (int16_t) data[i * orig_channels + j];
if (y != last) z += y;
last = y;
}
switch_normalize_to_16bit(z); switch_normalize_to_16bit(z);
data[i] = (int16_t) z; data[i] = (int16_t) z;
} }
} else if (channels == 2) {
int mark_buf = 0;
for (i = 0; i < samples; i++) {
int32_t z_left = 0, z_right = 0; int16_t y_left, y_right, last_left = 0, last_right = 0;
for (j = 0; j < orig_channels; j++) {
if (j % 2) {
y_left = (int16_t) data[i * orig_channels + j];
if (y_left != last_left) z_left += y_left;
last_left = y_left;
} else {
y_right = (int16_t) data[i * orig_channels + j];
if (y_right != last_right) z_right += y_right;
last_right = y_right;
}
}
/* mark_buf will always be smaller than the size of data in bytes because orig_channels > channels */
switch_normalize_to_16bit(z_left);
data[mark_buf++] = (int16_t) z_left;
switch_normalize_to_16bit(z_right);
data[mark_buf++] = (int16_t) z_right;
}
} }
} else if (orig_channels < channels) { } else if (orig_channels < channels) {