mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

echo-cancel: Ensure correct handling of endianness

Browse source 
The adrian module was using home-brewed endianness conversion instead of
the appropriate mactos, and speex assumed a little-endian host. This
fixes both of these.
This commit is contained in:
Arun Raghavan 2010-09-23 17:46:00 +05:30
parent 83d3c8f22b
commit 6897217d26
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/echo-cancel/adrian.c
View file

@ -30,6 +30,7 @@
#endif #endif
#include <pulsecore/modargs.h> #include <pulsecore/modargs.h>
#include <pulsecore/endianmacros.h>
#include "echo-cancel.h" #include "echo-cancel.h"
/* should be between 10-20 ms */ /* should be between 10-20 ms */
@ -103,8 +104,8 @@ void pa_adrian_ec_run(pa_echo_canceller *ec, const uint8_t *rec, const uint8_t *
for (i = 0; i < ec->params.priv.adrian.blocksize; i += 2) { for (i = 0; i < ec->params.priv.adrian.blocksize; i += 2) {
/* We know it's S16LE mono data */ /* We know it's S16LE mono data */
int r = (((int8_t) rec[i + 1]) << 8) | rec[i]; int r = PA_INT16_FROM_LE(*(int16_t *)(rec + i));
int p = (((int8_t) play[i + 1]) << 8) | play[i]; int p = PA_INT16_FROM_LE(*(int16_t *)(play + i));
int res; int res;
res = AEC_doAEC(ec->params.priv.adrian.aec, r, p); res = AEC_doAEC(ec->params.priv.adrian.aec, r, p);

2
src/modules/echo-cancel/speex.c
View file

@ -42,7 +42,7 @@ static const char* const valid_modargs[] = {
static void pa_speex_ec_fixate_spec(pa_sample_spec *source_ss, pa_channel_map *source_map, static void pa_speex_ec_fixate_spec(pa_sample_spec *source_ss, pa_channel_map *source_map,
pa_sample_spec *sink_ss, pa_channel_map *sink_map) pa_sample_spec *sink_ss, pa_channel_map *sink_map)
{ {
source_ss->format = PA_SAMPLE_S16LE; source_ss->format = PA_SAMPLE_S16NE;
*sink_ss = *source_ss; *sink_ss = *source_ss;
*sink_map = *source_map; *sink_map = *source_map;