diff --git a/src/include/switch_resample.h b/src/include/switch_resample.h index 86c4345be5..8bd3543160 100644 --- a/src/include/switch_resample.h +++ b/src/include/switch_resample.h @@ -168,6 +168,8 @@ SWITCH_DECLARE(void) switch_change_sln_volume(int16_t *data, uint32_t samples, i SWITCH_DECLARE(uint32_t) switch_merge_sln(int16_t *data, uint32_t samples, int16_t *other_data, uint32_t other_samples); +SWITCH_DECLARE(void) switch_mux_channels(int16_t *data, uint32_t samples, uint32_t channels); + SWITCH_END_EXTERN_C #endif /* For Emacs: diff --git a/src/switch_core_file.c b/src/switch_core_file.c index f11b0a8df8..852f352842 100644 --- a/src/switch_core_file.c +++ b/src/switch_core_file.c @@ -120,7 +120,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_perform_file_open(const char *file, if (fh->pre_buffer_datalen) { //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Prebuffering %d bytes\n", (int)fh->pre_buffer_datalen); switch_buffer_create_dynamic(&fh->pre_buffer, fh->pre_buffer_datalen * fh->channels, fh->pre_buffer_datalen * fh->channels / 2, 0); - fh->pre_buffer_data = switch_core_alloc(fh->memory_pool, fh->pre_buffer_datalen); + fh->pre_buffer_data = switch_core_alloc(fh->memory_pool, fh->pre_buffer_datalen * fh->channels); + } + + if (fh->channels > 1) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "File has %d channels, muxing to mono will occur.\n", fh->channels); } switch_set_flag(fh, SWITCH_FILE_OPEN); @@ -164,6 +168,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_read(switch_file_handle_t *fh, if ((status = fh->file_interface->file_read(fh, fh->pre_buffer_data, &rlen)) != SWITCH_STATUS_SUCCESS || !rlen) { switch_set_flag(fh, SWITCH_FILE_BUFFER_DONE); } else { + if (fh->channels > 1) { + switch_mux_channels((int16_t *)fh->pre_buffer_data, rlen, fh->channels); + } switch_buffer_write(fh->pre_buffer, fh->pre_buffer_data, asis ? rlen : rlen * 2); } } @@ -185,6 +192,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_read(switch_file_handle_t *fh, switch_set_flag(fh, SWITCH_FILE_DONE); goto top; } + + if (fh->channels > 1) { + switch_mux_channels((int16_t *)data, *len, fh->channels); + } + } diff --git a/src/switch_resample.c b/src/switch_resample.c index 0abb3ec63c..478df61ca3 100644 --- a/src/switch_resample.c +++ b/src/switch_resample.c @@ -244,6 +244,27 @@ SWITCH_DECLARE(uint32_t) switch_merge_sln(int16_t *data, uint32_t samples, int16 return x; } +SWITCH_DECLARE(void) switch_mux_channels(int16_t *data, uint32_t samples, uint32_t channels) +{ + int16_t *buf; + switch_size_t len = samples * sizeof(int16_t); + uint32_t i = 0, j = 0, k = 0; + + switch_zmalloc(buf, len); + + for(i = 0; i < samples; i++) { + for (j = 0; j < channels; j++) { + int32_t z = buf[i] + data[k++]; + switch_normalize_to_16bit(z); + buf[i] = (int16_t) z; + } + } + + memcpy(data, buf, len); + free(buf); + +} + SWITCH_DECLARE(void) switch_change_sln_volume(int16_t *data, uint32_t samples, int32_t vol) { double newrate = 0;