[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.19-568-gb424008

[Colin Guthrie]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  6897217d26066353492b6b906ddbaa58c2dae054 (commit)

- Log -----------------------------------------------------------------
b424008 echo-cancel: Use S16NE for adrian module
-----------------------------------------------------------------------

Summary of changes:
 src/modules/echo-cancel/adrian.c |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

-----------------------------------------------------------------------

commit b42400816031c17cdf6a63f446510e13d0ab9828
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Mon Sep 27 16:57:01 2010 +0530

    echo-cancel: Use S16NE for adrian module
    
    This forces us to get native-endian samples in the adrian module so that
    we can rely on the existing endianness conversion mechanisms instead of
    doing it in the module.

diff --git a/src/modules/echo-cancel/adrian.c b/src/modules/echo-cancel/adrian.c
index bf1918d..446966f 100644
--- a/src/modules/echo-cancel/adrian.c
+++ b/src/modules/echo-cancel/adrian.c
@@ -44,7 +44,7 @@ static const char* const valid_modargs[] = {
 static void pa_adrian_ec_fixate_spec(pa_sample_spec *source_ss, pa_channel_map *source_map,
 				    pa_sample_spec *sink_ss, pa_channel_map *sink_map)
 {
-    source_ss->format = PA_SAMPLE_S16LE;
+    source_ss->format = PA_SAMPLE_S16NE;
     source_ss->channels = 1;
     pa_channel_map_init_mono(source_map);
 
@@ -103,14 +103,10 @@ void pa_adrian_ec_run(pa_echo_canceller *ec, const uint8_t *rec, const uint8_t *
     unsigned int i;
 
     for (i = 0; i < ec->params.priv.adrian.blocksize; i += 2) {
-        /* We know it's S16LE mono data */
-        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);
-        out[i] = (uint8_t) (res & 0xff);
-        out[i + 1] = (uint8_t) ((res >> 8) & 0xff);
+        /* We know it's S16NE mono data */
+        int r = *(int16_t *)(rec + i);
+        int p = *(int16_t *)(play + i);
+        *(int16_t *)(out + i) = (int16_t) AEC_doAEC(ec->params.priv.adrian.aec, r, p);
     }
 }
 

-- 
hooks/post-receive
PulseAudio Sound Server