[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.19-567-g6897217
Colin Guthrie
gitmailer-noreply at 0pointer.de
Mon Sep 27 03:56:05 PDT 2010
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 395dae4d1a344e3355146877b5b49c3da4516a08 (commit)
- Log -----------------------------------------------------------------
6897217 echo-cancel: Ensure correct handling of endianness
83d3c8f echo-cancel: orc-ify some bits for optimisation
963250a echo-cancel: Add SSE optimisation to the adrian module
ab4223e cpu: Add CPU information to pa_core
ffcf3c8 build: Fix make distcheck
-----------------------------------------------------------------------
Summary of changes:
build/orc.mak | 71 +++++++
configure.ac | 9 +
m4/orc.m4 | 56 ++++++
src/Makefile.am | 12 +-
src/daemon/main.c | 13 +-
src/modules/echo-cancel/adrian-aec-orc-dist.c | 250 +++++++++++++++++++++++++
src/modules/echo-cancel/adrian-aec-orc-dist.h | 61 ++++++
src/modules/echo-cancel/adrian-aec-orc.orc | 8 +
src/modules/echo-cancel/adrian-aec.c | 45 +++++-
src/modules/echo-cancel/adrian-aec.h | 16 ++-
src/modules/echo-cancel/adrian.c | 15 +-
src/modules/echo-cancel/adrian.h | 2 +-
src/modules/echo-cancel/echo-cancel.h | 8 +-
src/modules/echo-cancel/module-echo-cancel.c | 2 +-
src/modules/echo-cancel/speex.c | 4 +-
src/pulsecore/core.h | 2 +
src/pulsecore/cpu-arm.c | 39 +++--
src/pulsecore/cpu-arm.h | 3 +-
src/pulsecore/cpu-x86.c | 68 ++++---
src/pulsecore/cpu-x86.h | 3 +-
src/{pulse/error.h => pulsecore/cpu.h} | 33 ++--
21 files changed, 631 insertions(+), 89 deletions(-)
create mode 100644 build/orc.mak
create mode 100644 m4/orc.m4
create mode 100644 src/modules/echo-cancel/adrian-aec-orc-dist.c
create mode 100644 src/modules/echo-cancel/adrian-aec-orc-dist.h
create mode 100644 src/modules/echo-cancel/adrian-aec-orc.orc
copy src/{pulse/error.h => pulsecore/cpu.h} (64%)
-----------------------------------------------------------------------
commit ffcf3c8a6c3f8a98eaa9bad5b9b573fa843da9cb
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date: Thu Sep 23 17:16:41 2010 +0530
build: Fix make distcheck
src/utils/qpaeq was not being dist'ed
diff --git a/src/Makefile.am b/src/Makefile.am
index bc058ea..ef6419b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -122,6 +122,7 @@ EXTRA_DIST = \
daemon/start-pulseaudio-x11.in \
daemon/start-pulseaudio-kde.in \
utils/padsp \
+ utils/qpaeq \
modules/module-defs.h.m4 \
daemon/pulseaudio.desktop.in \
daemon/pulseaudio-kde.desktop.in \
commit ab4223e9cffbc21399c0468dd89a2e57122fbfee
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date: Tue Sep 14 15:21:49 2010 +0530
cpu: Add CPU information to pa_core
This retains CPU information (processor type and supported features) in
pa_core, so that this information can be used by modules at init time to
figure out what optimisations may be used.
diff --git a/src/Makefile.am b/src/Makefile.am
index ef6419b..6675798 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -852,6 +852,7 @@ libpulsecore_ at PA_MAJORMINORMICRO@_la_SOURCES = \
pulsecore/resampler.c pulsecore/resampler.h \
pulsecore/rtpoll.c pulsecore/rtpoll.h \
pulsecore/sample-util.c pulsecore/sample-util.h \
+ pulsecore/cpu.h \
pulsecore/cpu-arm.c pulsecore/cpu-arm.h \
pulsecore/cpu-x86.c pulsecore/cpu-x86.h \
pulsecore/svolume_c.c pulsecore/svolume_arm.c \
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 9bea2ae..0e7b54a 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -934,11 +934,6 @@ int main(int argc, char *argv[]) {
pa_memtrap_install();
- if (!getenv("PULSE_NO_SIMD")) {
- pa_cpu_init_x86();
- pa_cpu_init_arm();
- }
-
pa_assert_se(mainloop = pa_mainloop_new());
if (!(c = pa_core_new(pa_mainloop_get_api(mainloop), !conf->disable_shm, conf->shm_size))) {
@@ -964,6 +959,14 @@ int main(int argc, char *argv[]) {
c->server_type = conf->local_server_type;
#endif
+ c->cpu_info.cpu_type = PA_CPU_UNDEFINED;
+ if (!getenv("PULSE_NO_SIMD")) {
+ if (pa_cpu_init_x86(&(c->cpu_info.flags.x86)))
+ c->cpu_info.cpu_type = PA_CPU_X86;
+ if (pa_cpu_init_arm(&(c->cpu_info.flags.arm)))
+ c->cpu_info.cpu_type = PA_CPU_ARM;
+ }
+
pa_assert_se(pa_signal_init(pa_mainloop_get_api(mainloop)) == 0);
pa_signal_new(SIGINT, signal_callback, c);
pa_signal_new(SIGTERM, signal_callback, c);
diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
index bfcea4f..6088f91 100644
--- a/src/pulsecore/core.h
+++ b/src/pulsecore/core.h
@@ -24,6 +24,7 @@
#include <pulse/mainloop-api.h>
#include <pulse/sample.h>
+#include <pulsecore/cpu.h>
typedef struct pa_core pa_core;
@@ -169,6 +170,7 @@ struct pa_core {
int realtime_priority;
pa_server_type_t server_type;
+ pa_cpu_info cpu_info;
/* hooks */
pa_hook hooks[PA_CORE_HOOK_MAX];
diff --git a/src/pulsecore/cpu-arm.c b/src/pulsecore/cpu-arm.c
index bf632f7..1d0d765 100644
--- a/src/pulsecore/cpu-arm.c
+++ b/src/pulsecore/cpu-arm.c
@@ -80,12 +80,11 @@ static char *get_cpuinfo(void) {
}
#endif /* defined (__arm__) && defined (__linux__) */
-void pa_cpu_init_arm (void) {
+pa_bool_t pa_cpu_init_arm (pa_cpu_arm_flag_t *flags) {
#if defined (__arm__)
#if defined (__linux__)
char *cpuinfo, *line;
int arch;
- pa_cpu_arm_flag_t flags = 0;
/* We need to read the CPU flags from /proc/cpuinfo because there is no user
* space support to get the CPU features. This only works on linux AFAIK. */
@@ -94,13 +93,15 @@ void pa_cpu_init_arm (void) {
return;
}
+ *flags = 0;
+
/* get the CPU architecture */
if ((line = get_cpuinfo_line (cpuinfo, "CPU architecture"))) {
arch = strtoul (line, NULL, 0);
if (arch >= 6)
- flags |= PA_CPU_ARM_V6;
+ *flags |= PA_CPU_ARM_V6;
if (arch >= 7)
- flags |= PA_CPU_ARM_V7;
+ *flags |= PA_CPU_ARM_V7;
pa_xfree(line);
}
@@ -111,13 +112,13 @@ void pa_cpu_init_arm (void) {
while ((current = pa_split_spaces (line, &state))) {
if (!strcmp (current, "vfp"))
- flags |= PA_CPU_ARM_VFP;
+ *flags |= PA_CPU_ARM_VFP;
else if (!strcmp (current, "edsp"))
- flags |= PA_CPU_ARM_EDSP;
+ *flags |= PA_CPU_ARM_EDSP;
else if (!strcmp (current, "neon"))
- flags |= PA_CPU_ARM_NEON;
+ *flags |= PA_CPU_ARM_NEON;
else if (!strcmp (current, "vfpv3"))
- flags |= PA_CPU_ARM_VFPV3;
+ *flags |= PA_CPU_ARM_VFPV3;
pa_xfree(current);
}
@@ -125,17 +126,23 @@ void pa_cpu_init_arm (void) {
pa_xfree(cpuinfo);
pa_log_info ("CPU flags: %s%s%s%s%s%s",
- (flags & PA_CPU_ARM_V6) ? "V6 " : "",
- (flags & PA_CPU_ARM_V7) ? "V7 " : "",
- (flags & PA_CPU_ARM_VFP) ? "VFP " : "",
- (flags & PA_CPU_ARM_EDSP) ? "EDSP " : "",
- (flags & PA_CPU_ARM_NEON) ? "NEON " : "",
- (flags & PA_CPU_ARM_VFPV3) ? "VFPV3 " : "");
+ (*flags & PA_CPU_ARM_V6) ? "V6 " : "",
+ (*flags & PA_CPU_ARM_V7) ? "V7 " : "",
+ (*flags & PA_CPU_ARM_VFP) ? "VFP " : "",
+ (*flags & PA_CPU_ARM_EDSP) ? "EDSP " : "",
+ (*flags & PA_CPU_ARM_NEON) ? "NEON " : "",
+ (*flags & PA_CPU_ARM_VFPV3) ? "VFPV3 " : "");
+
+ if (*flags & PA_CPU_ARM_V6)
+ pa_volume_func_init_arm (*flags);
+
+ return TRUE;
+
#else /* defined (__linux__) */
pa_log ("ARM cpu features not yet supported on this OS");
#endif /* defined (__linux__) */
- if (flags & PA_CPU_ARM_V6)
- pa_volume_func_init_arm (flags);
+#else /* defined (__arm__) */
+ return FALSE;
#endif /* defined (__arm__) */
}
diff --git a/src/pulsecore/cpu-arm.h b/src/pulsecore/cpu-arm.h
index a87cb63..0e0c3e4 100644
--- a/src/pulsecore/cpu-arm.h
+++ b/src/pulsecore/cpu-arm.h
@@ -24,6 +24,7 @@
***/
#include <stdint.h>
+#include <pulsecore/macro.h>
typedef enum pa_cpu_arm_flag {
PA_CPU_ARM_V6 = (1 << 0),
@@ -34,7 +35,7 @@ typedef enum pa_cpu_arm_flag {
PA_CPU_ARM_VFPV3 = (1 << 5)
} pa_cpu_arm_flag_t;
-void pa_cpu_init_arm (void);
+pa_bool_t pa_cpu_init_arm (pa_cpu_arm_flag_t *flags);
/* some optimized functions */
void pa_volume_func_init_arm(pa_cpu_arm_flag_t flags);
diff --git a/src/pulsecore/cpu-x86.c b/src/pulsecore/cpu-x86.c
index b173072..062a4c1 100644
--- a/src/pulsecore/cpu-x86.c
+++ b/src/pulsecore/cpu-x86.c
@@ -46,11 +46,12 @@ get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d)
}
#endif
-void pa_cpu_init_x86 (void) {
+pa_bool_t pa_cpu_init_x86 (pa_cpu_x86_flag_t *flags) {
#if defined (__i386__) || defined (__amd64__)
uint32_t eax, ebx, ecx, edx;
uint32_t level;
- pa_cpu_x86_flag_t flags = 0;
+
+ *flags = 0;
/* get standard level */
get_cpuid (0x00000000, &level, &ebx, &ecx, &edx);
@@ -58,28 +59,28 @@ void pa_cpu_init_x86 (void) {
get_cpuid (0x00000001, &eax, &ebx, &ecx, &edx);
if (edx & (1<<15))
- flags |= PA_CPU_X86_CMOV;
+ *flags |= PA_CPU_X86_CMOV;
if (edx & (1<<23))
- flags |= PA_CPU_X86_MMX;
+ *flags |= PA_CPU_X86_MMX;
if (edx & (1<<25))
- flags |= PA_CPU_X86_SSE;
+ *flags |= PA_CPU_X86_SSE;
if (edx & (1<<26))
- flags |= PA_CPU_X86_SSE2;
+ *flags |= PA_CPU_X86_SSE2;
if (ecx & (1<<0))
- flags |= PA_CPU_X86_SSE3;
+ *flags |= PA_CPU_X86_SSE3;
if (ecx & (1<<9))
- flags |= PA_CPU_X86_SSSE3;
+ *flags |= PA_CPU_X86_SSSE3;
if (ecx & (1<<19))
- flags |= PA_CPU_X86_SSE4_1;
+ *flags |= PA_CPU_X86_SSE4_1;
if (ecx & (1<<20))
- flags |= PA_CPU_X86_SSE4_2;
+ *flags |= PA_CPU_X86_SSE4_2;
}
/* get extended level */
@@ -88,42 +89,45 @@ void pa_cpu_init_x86 (void) {
get_cpuid (0x80000001, &eax, &ebx, &ecx, &edx);
if (edx & (1<<22))
- flags |= PA_CPU_X86_MMXEXT;
+ *flags |= PA_CPU_X86_MMXEXT;
if (edx & (1<<23))
- flags |= PA_CPU_X86_MMX;
+ *flags |= PA_CPU_X86_MMX;
if (edx & (1<<30))
- flags |= PA_CPU_X86_3DNOWEXT;
+ *flags |= PA_CPU_X86_3DNOWEXT;
if (edx & (1<<31))
- flags |= PA_CPU_X86_3DNOW;
+ *flags |= PA_CPU_X86_3DNOW;
}
pa_log_info ("CPU flags: %s%s%s%s%s%s%s%s%s%s%s",
- (flags & PA_CPU_X86_CMOV) ? "CMOV " : "",
- (flags & PA_CPU_X86_MMX) ? "MMX " : "",
- (flags & PA_CPU_X86_SSE) ? "SSE " : "",
- (flags & PA_CPU_X86_SSE2) ? "SSE2 " : "",
- (flags & PA_CPU_X86_SSE3) ? "SSE3 " : "",
- (flags & PA_CPU_X86_SSSE3) ? "SSSE3 " : "",
- (flags & PA_CPU_X86_SSE4_1) ? "SSE4_1 " : "",
- (flags & PA_CPU_X86_SSE4_2) ? "SSE4_2 " : "",
- (flags & PA_CPU_X86_MMXEXT) ? "MMXEXT " : "",
- (flags & PA_CPU_X86_3DNOW) ? "3DNOW " : "",
- (flags & PA_CPU_X86_3DNOWEXT) ? "3DNOWEXT " : "");
+ (*flags & PA_CPU_X86_CMOV) ? "CMOV " : "",
+ (*flags & PA_CPU_X86_MMX) ? "MMX " : "",
+ (*flags & PA_CPU_X86_SSE) ? "SSE " : "",
+ (*flags & PA_CPU_X86_SSE2) ? "SSE2 " : "",
+ (*flags & PA_CPU_X86_SSE3) ? "SSE3 " : "",
+ (*flags & PA_CPU_X86_SSSE3) ? "SSSE3 " : "",
+ (*flags & PA_CPU_X86_SSE4_1) ? "SSE4_1 " : "",
+ (*flags & PA_CPU_X86_SSE4_2) ? "SSE4_2 " : "",
+ (*flags & PA_CPU_X86_MMXEXT) ? "MMXEXT " : "",
+ (*flags & PA_CPU_X86_3DNOW) ? "3DNOW " : "",
+ (*flags & PA_CPU_X86_3DNOWEXT) ? "3DNOWEXT " : "");
/* activate various optimisations */
- if (flags & PA_CPU_X86_MMX) {
- pa_volume_func_init_mmx (flags);
- pa_remap_func_init_mmx (flags);
+ if (*flags & PA_CPU_X86_MMX) {
+ pa_volume_func_init_mmx (*flags);
+ pa_remap_func_init_mmx (*flags);
}
- if (flags & (PA_CPU_X86_SSE | PA_CPU_X86_SSE2)) {
- pa_volume_func_init_sse (flags);
- pa_remap_func_init_sse (flags);
- pa_convert_func_init_sse (flags);
+ if (*flags & (PA_CPU_X86_SSE | PA_CPU_X86_SSE2)) {
+ pa_volume_func_init_sse (*flags);
+ pa_remap_func_init_sse (*flags);
+ pa_convert_func_init_sse (*flags);
}
+ return TRUE;
+#else /* defined (__i386__) || defined (__amd64__) */
+ return FALSE;
#endif /* defined (__i386__) || defined (__amd64__) */
}
diff --git a/src/pulsecore/cpu-x86.h b/src/pulsecore/cpu-x86.h
index 285c203..0045ef6 100644
--- a/src/pulsecore/cpu-x86.h
+++ b/src/pulsecore/cpu-x86.h
@@ -24,6 +24,7 @@
***/
#include <stdint.h>
+#include <pulsecore/macro.h>
typedef enum pa_cpu_x86_flag {
PA_CPU_X86_MMX = (1 << 0),
@@ -39,7 +40,7 @@ typedef enum pa_cpu_x86_flag {
PA_CPU_X86_CMOV = (1 << 10)
} pa_cpu_x86_flag_t;
-void pa_cpu_init_x86 (void);
+pa_bool_t pa_cpu_init_x86 (pa_cpu_x86_flag_t *flags);
#if defined (__i386__)
typedef int32_t pa_reg_x86;
diff --git a/src/pulsecore/cpu.h b/src/pulsecore/cpu.h
new file mode 100644
index 0000000..7fe6f0b
--- /dev/null
+++ b/src/pulsecore/cpu.h
@@ -0,0 +1,45 @@
+#ifndef foocpuhfoo
+#define foocpuhfoo
+
+/***
+ This file is part of PulseAudio.
+
+ Copyright 2010 Arun Raghavan
+
+ PulseAudio is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License,
+ or (at your option) any later version.
+
+ PulseAudio is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with PulseAudio; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ USA.
+***/
+
+#include <pulsecore/cpu-x86.h>
+#include <pulsecore/cpu-arm.h>
+
+typedef enum {
+ PA_CPU_UNDEFINED = 0,
+ PA_CPU_X86,
+ PA_CPU_ARM,
+} pa_cpu_type_t;
+
+typedef struct pa_cpu_info pa_cpu_info;
+
+struct pa_cpu_info {
+ pa_cpu_type_t cpu_type;
+
+ union {
+ pa_cpu_x86_flag_t x86;
+ pa_cpu_arm_flag_t arm;
+ } flags;
+};
+
+#endif /* foocpuhfoo */
commit 963250abb99ab43b209281c2aa5398205492e555
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date: Tue Sep 21 20:42:32 2010 +0530
echo-cancel: Add SSE optimisation to the adrian module
Optimises the core inner-product function, which takes the most CPU. The
SSE-optimised bits of the adrian echo canceller only if the CPU that PA
is running on actually supports SSE.
diff --git a/src/modules/echo-cancel/adrian-aec.c b/src/modules/echo-cancel/adrian-aec.c
index 69107c7..39c2d63 100644
--- a/src/modules/echo-cancel/adrian-aec.c
+++ b/src/modules/echo-cancel/adrian-aec.c
@@ -17,6 +17,10 @@
#include "adrian-aec.h"
+#ifdef __SSE__
+#include <xmmintrin.h>
+#endif
+
/* Vector Dot Product */
static REAL dotp(REAL a[], REAL b[])
{
@@ -31,8 +35,32 @@ static REAL dotp(REAL a[], REAL b[])
return sum0 + sum1;
}
+static REAL dotp_sse(REAL a[], REAL b[]) __attribute__((noinline));
+static REAL dotp_sse(REAL a[], REAL b[])
+{
+#ifdef __SSE__
+ /* This is taken from speex's inner product implementation */
+ int j;
+ REAL sum;
+ __m128 acc = _mm_setzero_ps();
+
+ for (j=0;j<NLMS_LEN;j+=8)
+ {
+ acc = _mm_add_ps(acc, _mm_mul_ps(_mm_load_ps(a+j), _mm_loadu_ps(b+j)));
+ acc = _mm_add_ps(acc, _mm_mul_ps(_mm_load_ps(a+j+4), _mm_loadu_ps(b+j+4)));
+ }
+ acc = _mm_add_ps(acc, _mm_movehl_ps(acc, acc));
+ acc = _mm_add_ss(acc, _mm_shuffle_ps(acc, acc, 0x55));
+ _mm_store_ss(&sum, acc);
-AEC* AEC_init(int RATE)
+ return sum;
+#else
+ return dotp(a, b);
+#endif
+}
+
+
+AEC* AEC_init(int RATE, int have_vector)
{
AEC *a = pa_xnew(AEC, 1);
a->hangover = 0;
@@ -57,6 +85,11 @@ AEC* AEC_init(int RATE)
a->dumpcnt = 0;
memset(a->ws, 0, sizeof(a->ws));
+ if (have_vector)
+ a->dotp = dotp_sse;
+ else
+ a->dotp = dotp;
+
return a;
}
@@ -146,7 +179,7 @@ static REAL AEC_nlms_pw(AEC *a, REAL d, REAL x_, float stepsize)
// (mic signal - estimated mic signal from spk signal)
e = d;
if (a->hangover > 0) {
- e -= dotp(a->w, a->x + a->j);
+ e -= a->dotp(a->w, a->x + a->j);
}
ef = IIR1_highpass(a->Fe, e); // pre-whitening of e
diff --git a/src/modules/echo-cancel/adrian-aec.h b/src/modules/echo-cancel/adrian-aec.h
index 1f5b090..df9f3e6 100644
--- a/src/modules/echo-cancel/adrian-aec.h
+++ b/src/modules/echo-cancel/adrian-aec.h
@@ -13,6 +13,13 @@
#ifndef _AEC_H /* include only once */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <pulsecore/macro.h>
+#include <pulse/xmalloc.h>
+
#define WIDEB 2
// use double if your CPU does software-emulation of float
@@ -315,6 +322,9 @@ struct AEC {
// variables are public for visualization
int hangover;
float stepsize;
+
+ // vfuncs that are picked based on processor features available
+ REAL (*dotp) (REAL[], REAL[]);
};
/* Double-Talk Detector
@@ -338,7 +348,7 @@ static void AEC_leaky(AEC *a);
*/
static REAL AEC_nlms_pw(AEC *a, REAL d, REAL x_, float stepsize);
- AEC* AEC_init(int RATE);
+ AEC* AEC_init(int RATE, int have_vector);
/* Acoustic Echo Cancellation and Suppression of one sample
* in d: microphone signal with echo
diff --git a/src/modules/echo-cancel/adrian.c b/src/modules/echo-cancel/adrian.c
index 86db1e2..c8acaa8 100644
--- a/src/modules/echo-cancel/adrian.c
+++ b/src/modules/echo-cancel/adrian.c
@@ -51,12 +51,12 @@ static void pa_adrian_ec_fixate_spec(pa_sample_spec *source_ss, pa_channel_map *
*sink_map = *source_map;
}
-pa_bool_t pa_adrian_ec_init(pa_echo_canceller *ec,
+pa_bool_t pa_adrian_ec_init(pa_core *c, pa_echo_canceller *ec,
pa_sample_spec *source_ss, pa_channel_map *source_map,
pa_sample_spec *sink_ss, pa_channel_map *sink_map,
uint32_t *blocksize, const char *args)
{
- int framelen, rate;
+ int framelen, rate, have_vector = 0;
uint32_t frame_size_ms;
pa_modargs *ma;
@@ -80,7 +80,11 @@ pa_bool_t pa_adrian_ec_init(pa_echo_canceller *ec,
pa_log_debug ("Using framelen %d, blocksize %u, channels %d, rate %d", framelen, ec->params.priv.adrian.blocksize, source_ss->channels, source_ss->rate);
- ec->params.priv.adrian.aec = AEC_init(rate);
+ /* For now we only support SSE */
+ if (c->cpu_info.cpu_type == PA_CPU_X86 && (c->cpu_info.flags.x86 & PA_CPU_X86_SSE))
+ have_vector = 1;
+
+ ec->params.priv.adrian.aec = AEC_init(rate, have_vector);
if (!ec->params.priv.adrian.aec)
goto fail;
diff --git a/src/modules/echo-cancel/adrian.h b/src/modules/echo-cancel/adrian.h
index d02e934..639fa9e 100644
--- a/src/modules/echo-cancel/adrian.h
+++ b/src/modules/echo-cancel/adrian.h
@@ -27,5 +27,5 @@
typedef struct AEC AEC;
-AEC* AEC_init(int RATE);
+AEC* AEC_init(int RATE, int have_vector);
int AEC_doAEC(AEC *a, int d_, int x_);
diff --git a/src/modules/echo-cancel/echo-cancel.h b/src/modules/echo-cancel/echo-cancel.h
index 448ad99..5f6adbc 100644
--- a/src/modules/echo-cancel/echo-cancel.h
+++ b/src/modules/echo-cancel/echo-cancel.h
@@ -25,6 +25,7 @@
#include <pulse/sample.h>
#include <pulse/channelmap.h>
+#include <pulsecore/core.h>
#include <pulsecore/macro.h>
#include <speex/speex_echo.h>
@@ -50,7 +51,8 @@ struct pa_echo_canceller_params {
typedef struct pa_echo_canceller pa_echo_canceller;
struct pa_echo_canceller {
- pa_bool_t (*init) (pa_echo_canceller *ec,
+ pa_bool_t (*init) (pa_core *c,
+ pa_echo_canceller *ec,
pa_sample_spec *source_ss,
pa_channel_map *source_map,
pa_sample_spec *sink_ss,
@@ -64,7 +66,7 @@ struct pa_echo_canceller {
};
/* Speex canceller functions */
-pa_bool_t pa_speex_ec_init(pa_echo_canceller *ec,
+pa_bool_t pa_speex_ec_init(pa_core *c, pa_echo_canceller *ec,
pa_sample_spec *source_ss, pa_channel_map *source_map,
pa_sample_spec *sink_ss, pa_channel_map *sink_map,
uint32_t *blocksize, const char *args);
@@ -72,7 +74,7 @@ void pa_speex_ec_run(pa_echo_canceller *ec, const uint8_t *rec, const uint8_t *p
void pa_speex_ec_done(pa_echo_canceller *ec);
/* Adrian Andre's echo canceller */
-pa_bool_t pa_adrian_ec_init(pa_echo_canceller *ec,
+pa_bool_t pa_adrian_ec_init(pa_core *c, pa_echo_canceller *ec,
pa_sample_spec *source_ss, pa_channel_map *source_map,
pa_sample_spec *sink_ss, pa_channel_map *sink_map,
uint32_t *blocksize, const char *args);
diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c
index 8ae45a5..b6c82a5 100644
--- a/src/modules/echo-cancel/module-echo-cancel.c
+++ b/src/modules/echo-cancel/module-echo-cancel.c
@@ -1398,7 +1398,7 @@ int pa__init(pa_module*m) {
u->asyncmsgq = pa_asyncmsgq_new(0);
u->need_realign = TRUE;
if (u->ec->init) {
- if (!u->ec->init(u->ec, &source_ss, &source_map, &sink_ss, &sink_map, &u->blocksize, pa_modargs_get_value(ma, "aec_args", NULL))) {
+ if (!u->ec->init(u->core, u->ec, &source_ss, &source_map, &sink_ss, &sink_map, &u->blocksize, pa_modargs_get_value(ma, "aec_args", NULL))) {
pa_log("Failed to init AEC engine");
goto fail;
}
diff --git a/src/modules/echo-cancel/speex.c b/src/modules/echo-cancel/speex.c
index 17a89d2..4351d23 100644
--- a/src/modules/echo-cancel/speex.c
+++ b/src/modules/echo-cancel/speex.c
@@ -48,7 +48,7 @@ static void pa_speex_ec_fixate_spec(pa_sample_spec *source_ss, pa_channel_map *s
*sink_map = *source_map;
}
-pa_bool_t pa_speex_ec_init(pa_echo_canceller *ec,
+pa_bool_t pa_speex_ec_init(pa_core *c, pa_echo_canceller *ec,
pa_sample_spec *source_ss, pa_channel_map *source_map,
pa_sample_spec *sink_ss, pa_channel_map *sink_map,
uint32_t *blocksize, const char *args)
commit 83d3c8f22bab997dde81074fd547aef6e56451d5
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date: Mon Sep 13 18:41:30 2010 +0530
echo-cancel: orc-ify some bits for optimisation
This uses Orc to optimise an inner loop in the core NLMS function of the
Adrian echo canceller.
diff --git a/build/orc.mak b/build/orc.mak
new file mode 100644
index 0000000..d230998
--- /dev/null
+++ b/build/orc.mak
@@ -0,0 +1,71 @@
+#
+# This is a makefile.am fragment to build Orc code.
+#
+# Define ORC_SOURCE and then include this file, such as:
+#
+# ORC_SOURCE=gstadderorc
+# include $(top_srcdir)/common/orc.mak
+#
+# This fragment will create tmp-orc.c and gstadderorc.h from
+# gstadderorc.orc.
+#
+# When 'make dist' is run at the top level, or 'make orc-update'
+# in a directory including this fragment, the generated source
+# files will be copied to $(ORC_SOURCE)-dist.[ch]. These files
+# should be checked in to git, since they are used if Orc is
+# disabled.
+#
+# Note that this file defines BUILT_SOURCES, so any later usage
+# of BUILT_SOURCES in the Makefile.am that includes this file
+# must use '+='.
+#
+
+
+EXTRA_DIST += $(ORC_SOURCE).orc
+
+ORC_NODIST_SOURCES = tmp-orc.c $(ORC_SOURCE).h
+BUILT_SOURCES += tmp-orc.c $(ORC_SOURCE).h
+
+
+orc-update: tmp-orc.c $(ORC_SOURCE).h
+ cp tmp-orc.c $(srcdir)/$(ORC_SOURCE)-dist.c
+ cp $(ORC_SOURCE).h $(srcdir)/$(ORC_SOURCE)-dist.h
+
+orcc_v_gen = $(orcc_v_gen_$(V))
+orcc_v_gen_ = $(orcc_v_gen_$(AM_DEFAULT_VERBOSITY))
+orcc_v_gen_0 = @echo " ORCC $@";
+
+cp_v_gen = $(cp_v_gen_$(V))
+cp_v_gen_ = $(cp_v_gen_$(AM_DEFAULT_VERBOSITY))
+cp_v_gen_0 = @echo " CP $@";
+
+if HAVE_ORC
+tmp-orc.c: $(srcdir)/$(ORC_SOURCE).orc
+ $(orcc_v_gen)$(ORCC) --implementation -o $(builddir)/tmp-orc.c $(srcdir)/$(ORC_SOURCE).orc
+
+$(ORC_SOURCE).h: $(srcdir)/$(ORC_SOURCE).orc
+ mkdir -p $$(dirname $(builddir)/$(ORC_SOURCE).h)
+ $(orcc_v_gen)$(ORCC) --header -o $(builddir)/$(ORC_SOURCE).h $(srcdir)/$(ORC_SOURCE).orc
+else
+tmp-orc.c: $(srcdir)/$(ORC_SOURCE).orc
+ $(cp_v_gen)cp $(srcdir)/$(ORC_SOURCE)-dist.c tmp-orc.c
+
+$(ORC_SOURCE).h: $(srcdir)/$(ORC_SOURCE).orc
+ $(cp_v_gen)cp $(srcdir)/$(ORC_SOURCE)-dist.h $(ORC_SOURCE).h
+endif
+
+clean-local: clean-orc
+.PHONY: clean-orc
+clean-orc:
+ rm -f tmp-orc.c $(ORC_SOURCE).h
+
+dist-hook: dist-hook-orc
+.PHONY: dist-hook-orc
+dist-hook-orc: tmp-orc.c $(ORC_SOURCE).h
+ rm -f tmp-orc.c~
+ cmp -s tmp-orc.c $(srcdir)/$(ORC_SOURCE)-dist.c || \
+ cp tmp-orc.c $(srcdir)/$(ORC_SOURCE)-dist.c
+ cmp -s $(ORC_SOURCE).h $(srcdir)/$(ORC_SOURCE)-dist.h || \
+ cp $(ORC_SOURCE).h $(srcdir)/$(ORC_SOURCE)-dist.h
+ cp -p $(srcdir)/$(ORC_SOURCE)-dist.c $(distdir)/
+ cp -p $(srcdir)/$(ORC_SOURCE)-dist.h $(distdir)/
diff --git a/configure.ac b/configure.ac
index 5d69c92..4599128 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1321,6 +1321,9 @@ if test "x${with_fftw}" != "xno"; then
fi
AM_CONDITIONAL([HAVE_FFTW], [test "x$HAVE_FFTW" = "x1"])
+### ORC (optional) ###
+ORC_CHECK([0.4.9])
+
### Build and Install man pages ###
AC_ARG_ENABLE(manpages,
AS_HELP_STRING([--disable-manpages],[Disable building and installation of man pages]),
@@ -1573,6 +1576,11 @@ if test "x${HAVE_FFTW}" = "x1" ; then
ENABLE_FFTW=yes
fi
+ENABLE_ORC=no
+if test "x${HAVE_ORC}" = "xyes" ; then
+ ENABLE_ORC=yes
+fi
+
ENABLE_OPENSSL=no
if test "x${HAVE_OPENSSL}" = "x1" ; then
ENABLE_OPENSSL=yes
@@ -1626,6 +1634,7 @@ echo "
Enable gdbm: ${ENABLE_GDBM}
Enable simple database: ${ENABLE_SIMPLEDB}
Enable fftw: ${ENABLE_FFTW}
+ Enable orc: ${ENABLE_ORC}
System User: ${PA_SYSTEM_USER}
System Group: ${PA_SYSTEM_GROUP}
diff --git a/m4/orc.m4 b/m4/orc.m4
new file mode 100644
index 0000000..92bf21e
--- /dev/null
+++ b/m4/orc.m4
@@ -0,0 +1,56 @@
+dnl pkg-config-based checks for Orc
+
+dnl specific:
+dnl ORC_CHECK([REQUIRED_VERSION])
+
+AC_DEFUN([ORC_CHECK],
+[
+ ORC_REQ=ifelse([$1], , "0.4.5", [$1])
+
+ AC_ARG_ENABLE(orc,
+ AC_HELP_STRING([--enable-orc],[use Orc if installed]),
+ [case "${enableval}" in
+ auto) enable_orc=auto ;;
+ yes) enable_orc=yes ;;
+ no) enable_orc=no ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-orc) ;;
+ esac
+ ],
+ [enable_orc=auto]) dnl Default value
+
+ if test "x$enable_orc" != "xno" ; then
+ PKG_CHECK_MODULES(ORC, orc-0.4 >= $ORC_REQ, [
+ AC_DEFINE(HAVE_ORC, 1, [Use Orc])
+ ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
+ AC_SUBST(ORCC)
+ HAVE_ORC=yes
+ ], [
+ if test "x$enable_orc" = "xyes" ; then
+ AC_MSG_ERROR([--enable-orc specified, but Orc >= $ORC_REQ not found])
+ fi
+ AC_DEFINE(DISABLE_ORC, 1, [Disable Orc])
+ HAVE_ORC=no
+ ])
+ else
+ AC_DEFINE(DISABLE_ORC, 1, [Disable Orc])
+ HAVE_ORC=no
+ fi
+ AM_CONDITIONAL(HAVE_ORC, test "x$HAVE_ORC" = "xyes")
+
+]))
+
+AC_DEFUN([ORC_OUTPUT],
+[
+ if test "$HAVE_ORC" = yes ; then
+ printf "configure: *** Orc acceleration enabled.\n"
+ else
+ if test "x$enable_orc" = "xno" ; then
+ printf "configure: *** Orc acceleration disabled by --disable-orc. Slower code paths\n"
+ printf " will be used.\n"
+ else
+ printf "configure: *** Orc acceleration disabled. Requires Orc >= $ORC_REQ, which was\n"
+ printf " not found. Slower code paths will be used.\n"
+ fi
+ fi
+ printf "\n"
+])
diff --git a/src/Makefile.am b/src/Makefile.am
index 6675798..4061b3c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1708,13 +1708,17 @@ module_suspend_on_idle_la_LIBADD = $(AM_LIBADD) libpulsecore- at PA_MAJORMINORMICRO
module_suspend_on_idle_la_CFLAGS = $(AM_CFLAGS)
# echo-cancel module
+ORC_SOURCE=modules/echo-cancel/adrian-aec-orc
+include $(top_srcdir)/build/orc.mak
module_echo_cancel_la_SOURCES = modules/echo-cancel/module-echo-cancel.c modules/echo-cancel/echo-cancel.h \
modules/echo-cancel/speex.c \
modules/echo-cancel/adrian-aec.c modules/echo-cancel/adrian-aec.h \
- modules/echo-cancel/adrian.c modules/echo-cancel/adrian.h
+ modules/echo-cancel/adrian.c modules/echo-cancel/adrian.h \
+ $(ORC_SOURCE).orc
+nodist_module_echo_cancel_la_SOURCES = $(ORC_NODIST_SOURCES)
module_echo_cancel_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_echo_cancel_la_LIBADD = $(AM_LIBADD) libpulsecore- at PA_MAJORMINORMICRO@.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la $(LIBSPEEX_LIBS)
-module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(LIBSPEEX_CFLAGS)
+module_echo_cancel_la_LIBADD = $(AM_LIBADD) libpulsecore- at PA_MAJORMINORMICRO@.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la $(LIBSPEEX_LIBS) $(ORC_LIBS)
+module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(LIBSPEEX_CFLAGS) $(ORC_CFLAGS)
# RTP modules
module_rtp_send_la_SOURCES = modules/rtp/module-rtp-send.c
diff --git a/src/modules/echo-cancel/adrian-aec-orc-dist.c b/src/modules/echo-cancel/adrian-aec-orc-dist.c
new file mode 100644
index 0000000..ea93d0b
--- /dev/null
+++ b/src/modules/echo-cancel/adrian-aec-orc-dist.c
@@ -0,0 +1,250 @@
+
+/* autogenerated from adrian-aec-orc.orc */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#ifndef DISABLE_ORC
+#include <orc/orc.h>
+#endif
+
+#ifndef _ORC_INTEGER_TYPEDEFS_
+#define _ORC_INTEGER_TYPEDEFS_
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <stdint.h>
+typedef int8_t orc_int8;
+typedef int16_t orc_int16;
+typedef int32_t orc_int32;
+typedef int64_t orc_int64;
+typedef uint8_t orc_uint8;
+typedef uint16_t orc_uint16;
+typedef uint32_t orc_uint32;
+typedef uint64_t orc_uint64;
+#elif defined(_MSC_VER)
+typedef signed __int8 orc_int8;
+typedef signed __int16 orc_int16;
+typedef signed __int32 orc_int32;
+typedef signed __int64 orc_int64;
+typedef unsigned __int8 orc_uint8;
+typedef unsigned __int16 orc_uint16;
+typedef unsigned __int32 orc_uint32;
+typedef unsigned __int64 orc_uint64;
+#else
+#include <limits.h>
+typedef signed char orc_int8;
+typedef short orc_int16;
+typedef int orc_int32;
+typedef unsigned char orc_uint8;
+typedef unsigned short orc_uint16;
+typedef unsigned int orc_uint32;
+#if INT_MAX == LONG_MAX
+typedef long long orc_int64;
+typedef unsigned long long orc_uint64;
+#else
+typedef long orc_int64;
+typedef unsigned long orc_uint64;
+#endif
+#endif
+typedef union { orc_int16 i; orc_int8 x2[2]; } orc_union16;
+typedef union { orc_int32 i; float f; orc_int16 x2[2]; orc_int8 x4[4]; } orc_union32;
+typedef union { orc_int64 i; double f; orc_int32 x2[2]; orc_int16 x4[4]; } orc_union64;
+#endif
+
+void update_tap_weights (float * d1, const float * s1, float p1, int n);
+
+
+/* begin Orc C target preamble */
+#define ORC_CLAMP(x,a,b) ((x)<(a) ? (a) : ((x)>(b) ? (b) : (x)))
+#define ORC_ABS(a) ((a)<0 ? -(a) : (a))
+#define ORC_MIN(a,b) ((a)<(b) ? (a) : (b))
+#define ORC_MAX(a,b) ((a)>(b) ? (a) : (b))
+#define ORC_SB_MAX 127
+#define ORC_SB_MIN (-1-ORC_SB_MAX)
+#define ORC_UB_MAX 255
+#define ORC_UB_MIN 0
+#define ORC_SW_MAX 32767
+#define ORC_SW_MIN (-1-ORC_SW_MAX)
+#define ORC_UW_MAX 65535
+#define ORC_UW_MIN 0
+#define ORC_SL_MAX 2147483647
+#define ORC_SL_MIN (-1-ORC_SL_MAX)
+#define ORC_UL_MAX 4294967295U
+#define ORC_UL_MIN 0
+#define ORC_CLAMP_SB(x) ORC_CLAMP(x,ORC_SB_MIN,ORC_SB_MAX)
+#define ORC_CLAMP_UB(x) ORC_CLAMP(x,ORC_UB_MIN,ORC_UB_MAX)
+#define ORC_CLAMP_SW(x) ORC_CLAMP(x,ORC_SW_MIN,ORC_SW_MAX)
+#define ORC_CLAMP_UW(x) ORC_CLAMP(x,ORC_UW_MIN,ORC_UW_MAX)
+#define ORC_CLAMP_SL(x) ORC_CLAMP(x,ORC_SL_MIN,ORC_SL_MAX)
+#define ORC_CLAMP_UL(x) ORC_CLAMP(x,ORC_UL_MIN,ORC_UL_MAX)
+#define ORC_SWAP_W(x) ((((x)&0xff)<<8) | (((x)&0xff00)>>8))
+#define ORC_SWAP_L(x) ((((x)&0xff)<<24) | (((x)&0xff00)<<8) | (((x)&0xff0000)>>8) | (((x)&0xff000000)>>24))
+#define ORC_SWAP_Q(x) ((((x)&0xffULL)<<56) | (((x)&0xff00ULL)<<40) | (((x)&0xff0000ULL)<<24) | (((x)&0xff000000ULL)<<8) | (((x)&0xff00000000ULL)>>8) | (((x)&0xff0000000000ULL)>>24) | (((x)&0xff000000000000ULL)>>40) | (((x)&0xff00000000000000ULL)>>56))
+#define ORC_PTR_OFFSET(ptr,offset) ((void *)(((unsigned char *)(ptr)) + (offset)))
+#define ORC_DENORMAL(x) ((x) & ((((x)&0x7f800000) == 0) ? 0xff800000 : 0xffffffff))
+#define ORC_ISNAN(x) ((((x)&0x7f800000) == 0x7f800000) && (((x)&0x007fffff) != 0))
+#define ORC_DENORMAL_DOUBLE(x) ((x) & ((((x)&0x7ff0000000000000ULL) == 0) ? 0xfff0000000000000ULL : 0xffffffffffffffffULL))
+#define ORC_ISNAN_DOUBLE(x) ((((x)&0x7ff0000000000000ULL) == 0x7ff0000000000000ULL) && (((x)&0x000fffffffffffffULL) != 0))
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#define ORC_RESTRICT restrict
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#define ORC_RESTRICT __restrict__
+#else
+#define ORC_RESTRICT
+#endif
+/* end Orc C target preamble */
+
+
+
+/* update_tap_weights */
+#ifdef DISABLE_ORC
+void
+update_tap_weights (float * d1, const float * s1, float p1, int n){
+ int i;
+ orc_union32 * ORC_RESTRICT ptr0;
+ const orc_union32 * ORC_RESTRICT ptr4;
+ orc_union32 var33;
+ orc_union32 var34;
+ orc_union32 var35;
+ orc_union32 var36;
+ orc_union32 var37;
+
+ ptr0 = (orc_union32 *)d1;
+ ptr4 = (orc_union32 *)s1;
+
+ /* 0: loadpl */
+ var33.i = p1;
+
+ for (i = 0; i < n; i++) {
+ /* 1: loadl */
+ var34 = ptr4[i];
+ /* 2: mulf */
+ {
+ orc_union32 _src1;
+ orc_union32 _src2;
+ orc_union32 _dest1;
+ _src1.i = ORC_DENORMAL(var33.i);
+ _src2.i = ORC_DENORMAL(var34.i);
+ _dest1.f = _src1.f * _src2.f;
+ var37.i = ORC_DENORMAL(_dest1.i);
+ }
+ /* 3: loadl */
+ var35 = ptr0[i];
+ /* 4: addf */
+ {
+ orc_union32 _src1;
+ orc_union32 _src2;
+ orc_union32 _dest1;
+ _src1.i = ORC_DENORMAL(var35.i);
+ _src2.i = ORC_DENORMAL(var37.i);
+ _dest1.f = _src1.f + _src2.f;
+ var36.i = ORC_DENORMAL(_dest1.i);
+ }
+ /* 5: storel */
+ ptr0[i] = var36;
+ }
+
+}
+
+#else
+static void
+_backup_update_tap_weights (OrcExecutor * ORC_RESTRICT ex)
+{
+ int i;
+ int n = ex->n;
+ orc_union32 * ORC_RESTRICT ptr0;
+ const orc_union32 * ORC_RESTRICT ptr4;
+ orc_union32 var33;
+ orc_union32 var34;
+ orc_union32 var35;
+ orc_union32 var36;
+ orc_union32 var37;
+
+ ptr0 = (orc_union32 *)ex->arrays[0];
+ ptr4 = (orc_union32 *)ex->arrays[4];
+
+ /* 0: loadpl */
+ var33.i = ex->params[24];
+
+ for (i = 0; i < n; i++) {
+ /* 1: loadl */
+ var34 = ptr4[i];
+ /* 2: mulf */
+ {
+ orc_union32 _src1;
+ orc_union32 _src2;
+ orc_union32 _dest1;
+ _src1.i = ORC_DENORMAL(var33.i);
+ _src2.i = ORC_DENORMAL(var34.i);
+ _dest1.f = _src1.f * _src2.f;
+ var37.i = ORC_DENORMAL(_dest1.i);
+ }
+ /* 3: loadl */
+ var35 = ptr0[i];
+ /* 4: addf */
+ {
+ orc_union32 _src1;
+ orc_union32 _src2;
+ orc_union32 _dest1;
+ _src1.i = ORC_DENORMAL(var35.i);
+ _src2.i = ORC_DENORMAL(var37.i);
+ _dest1.f = _src1.f + _src2.f;
+ var36.i = ORC_DENORMAL(_dest1.i);
+ }
+ /* 5: storel */
+ ptr0[i] = var36;
+ }
+
+}
+
+void
+update_tap_weights (float * d1, const float * s1, float p1, int n)
+{
+ OrcExecutor _ex, *ex = &_ex;
+ static int p_inited = 0;
+ static OrcProgram *p = 0;
+ void (*func) (OrcExecutor *);
+
+ if (!p_inited) {
+ orc_once_mutex_lock ();
+ if (!p_inited) {
+ OrcCompileResult result;
+
+ p = orc_program_new ();
+ orc_program_set_name (p, "update_tap_weights");
+ orc_program_set_backup_function (p, _backup_update_tap_weights);
+ orc_program_add_destination (p, 4, "d1");
+ orc_program_add_source (p, 4, "s1");
+ orc_program_add_constant (p, 0, 0x00000000, "c1");
+ orc_program_add_constant (p, 0, 0x00000000, "c2");
+ orc_program_add_constant (p, 0, 0x00000000, "c3");
+ orc_program_add_constant (p, 0, 0x00000000, "c4");
+ orc_program_add_constant (p, 0, 0x00000000, "c5");
+ orc_program_add_constant (p, 0, 0x00000000, "c6");
+ orc_program_add_constant (p, 0, 0x00000000, "c7");
+ orc_program_add_constant (p, 0, 0x00000000, "c8");
+ orc_program_add_parameter_float (p, 4, "p1");
+ orc_program_add_temporary (p, 4, "t1");
+
+ orc_program_append_2 (p, "mulf", 0, ORC_VAR_T1, ORC_VAR_P1, ORC_VAR_S1, ORC_VAR_D1);
+ orc_program_append_2 (p, "addf", 0, ORC_VAR_D1, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_D1);
+
+ result = orc_program_compile (p);
+ }
+ p_inited = TRUE;
+ orc_once_mutex_unlock ();
+ }
+ ex->program = p;
+
+ ex->n = n;
+ ex->arrays[ORC_VAR_D1] = d1;
+ ex->arrays[ORC_VAR_S1] = (void *)s1;
+ {
+ orc_union32 tmp;
+ tmp.f = p1;
+ ex->params[ORC_VAR_P1] = tmp.i;
+ }
+
+ func = p->code_exec;
+ func (ex);
+}
+#endif
diff --git a/src/modules/echo-cancel/adrian-aec-orc-dist.h b/src/modules/echo-cancel/adrian-aec-orc-dist.h
new file mode 100644
index 0000000..00228c6
--- /dev/null
+++ b/src/modules/echo-cancel/adrian-aec-orc-dist.h
@@ -0,0 +1,61 @@
+
+/* autogenerated from adrian-aec-orc.orc */
+
+#ifndef ___MODULES_ECHO_CANCEL_ADRIAN_AEC_ORC_H_
+#define ___MODULES_ECHO_CANCEL_ADRIAN_AEC_ORC_H_
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+#ifndef _ORC_INTEGER_TYPEDEFS_
+#define _ORC_INTEGER_TYPEDEFS_
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <stdint.h>
+typedef int8_t orc_int8;
+typedef int16_t orc_int16;
+typedef int32_t orc_int32;
+typedef int64_t orc_int64;
+typedef uint8_t orc_uint8;
+typedef uint16_t orc_uint16;
+typedef uint32_t orc_uint32;
+typedef uint64_t orc_uint64;
+#elif defined(_MSC_VER)
+typedef signed __int8 orc_int8;
+typedef signed __int16 orc_int16;
+typedef signed __int32 orc_int32;
+typedef signed __int64 orc_int64;
+typedef unsigned __int8 orc_uint8;
+typedef unsigned __int16 orc_uint16;
+typedef unsigned __int32 orc_uint32;
+typedef unsigned __int64 orc_uint64;
+#else
+#include <limits.h>
+typedef signed char orc_int8;
+typedef short orc_int16;
+typedef int orc_int32;
+typedef unsigned char orc_uint8;
+typedef unsigned short orc_uint16;
+typedef unsigned int orc_uint32;
+#if INT_MAX == LONG_MAX
+typedef long long orc_int64;
+typedef unsigned long long orc_uint64;
+#else
+typedef long orc_int64;
+typedef unsigned long orc_uint64;
+#endif
+#endif
+typedef union { orc_int16 i; orc_int8 x2[2]; } orc_union16;
+typedef union { orc_int32 i; float f; orc_int16 x2[2]; orc_int8 x4[4]; } orc_union32;
+typedef union { orc_int64 i; double f; orc_int32 x2[2]; orc_int16 x4[4]; } orc_union64;
+#endif
+void update_tap_weights (float * d1, const float * s1, float p1, int n);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/modules/echo-cancel/adrian-aec-orc.orc b/src/modules/echo-cancel/adrian-aec-orc.orc
new file mode 100644
index 0000000..8054772
--- /dev/null
+++ b/src/modules/echo-cancel/adrian-aec-orc.orc
@@ -0,0 +1,8 @@
+.function update_tap_weights
+.dest 4 w float
+.source 4 xf float
+.floatparam 4 mikro_ef
+.temp 4 tmp float
+
+mulf tmp, mikro_ef, xf
+addf w, w, tmp
diff --git a/src/modules/echo-cancel/adrian-aec.c b/src/modules/echo-cancel/adrian-aec.c
index 39c2d63..269bd61 100644
--- a/src/modules/echo-cancel/adrian-aec.c
+++ b/src/modules/echo-cancel/adrian-aec.c
@@ -17,6 +17,10 @@
#include "adrian-aec.h"
+#ifndef DISABLE_ORC
+#include "adrian-aec-orc.h"
+#endif
+
#ifdef __SSE__
#include <xmmintrin.h>
#endif
@@ -190,6 +194,7 @@ static REAL AEC_nlms_pw(AEC *a, REAL d, REAL x_, float stepsize)
// calculate variable step size
REAL mikro_ef = stepsize * ef / a->dotp_xf_xf;
+#ifdef DISABLE_ORC
// update tap weights (filter learning)
int i;
for (i = 0; i < NLMS_LEN; i += 2) {
@@ -197,6 +202,9 @@ static REAL AEC_nlms_pw(AEC *a, REAL d, REAL x_, float stepsize)
a->w[i] += mikro_ef * a->xf[i + a->j];
a->w[i + 1] += mikro_ef * a->xf[i + a->j + 1];
}
+#else
+ update_tap_weights(a->w, &a->xf[a->j], mikro_ef, NLMS_LEN);
+#endif
}
if (--(a->j) < 0) {
diff --git a/src/modules/echo-cancel/adrian-aec.h b/src/modules/echo-cancel/adrian-aec.h
index df9f3e6..235984b 100644
--- a/src/modules/echo-cancel/adrian-aec.h
+++ b/src/modules/echo-cancel/adrian-aec.h
@@ -23,7 +23,7 @@
#define WIDEB 2
// use double if your CPU does software-emulation of float
-typedef float REAL;
+#define REAL float
/* dB Values */
#define M0dB 1.0f
@@ -306,7 +306,7 @@ struct AEC {
// NLMS-pw
REAL x[NLMS_LEN + NLMS_EXT]; // tap delayed loudspeaker signal
REAL xf[NLMS_LEN + NLMS_EXT]; // pre-whitening tap delayed signal
- REAL w[NLMS_LEN]; // tap weights
+ PA_DECLARE_ALIGNED(16, REAL, w[NLMS_LEN]); // tap weights
int j; // optimize: less memory copies
double dotp_xf_xf; // double to avoid loss of precision
float delta; // noise floor to stabilize NLMS
commit 6897217d26066353492b6b906ddbaa58c2dae054
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date: Thu Sep 23 17:46:00 2010 +0530
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.
diff --git a/src/modules/echo-cancel/adrian.c b/src/modules/echo-cancel/adrian.c
index c8acaa8..bf1918d 100644
--- a/src/modules/echo-cancel/adrian.c
+++ b/src/modules/echo-cancel/adrian.c
@@ -30,6 +30,7 @@
#endif
#include <pulsecore/modargs.h>
+#include <pulsecore/endianmacros.h>
#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);
diff --git a/src/modules/echo-cancel/speex.c b/src/modules/echo-cancel/speex.c
index 4351d23..7851510 100644
--- a/src/modules/echo-cancel/speex.c
+++ b/src/modules/echo-cancel/speex.c
@@ -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,
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_map = *source_map;
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list