From 6897217d26066353492b6b906ddbaa58c2dae054 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Thu, 23 Sep 2010 17:46:00 +0530 Subject: echo-cancel: Ensure correct handling of endianness 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. --- src/modules/echo-cancel/adrian.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/modules/echo-cancel/adrian.c') diff --git a/src/modules/echo-cancel/adrian.c b/src/modules/echo-cancel/adrian.c index c8acaa8b..bf1918d3 100644 --- a/src/modules/echo-cancel/adrian.c +++ b/src/modules/echo-cancel/adrian.c @@ -30,6 +30,7 @@ #endif #include +#include #include "echo-cancel.h" /* 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) { /* We know it's S16LE mono data */ - int r = (((int8_t) rec[i + 1]) << 8) | rec[i]; - int p = (((int8_t) play[i + 1]) << 8) | play[i]; + int r = PA_INT16_FROM_LE(*(int16_t *)(rec + i)); + int p = PA_INT16_FROM_LE(*(int16_t *)(play + i)); int res; res = AEC_doAEC(ec->params.priv.adrian.aec, r, p); -- cgit