echo-cancel: orc-ify some bits for optimisation

[pulseaudio] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 1e488bd765cc1f9e4228267d5fe96c9e84dd8d6b..4061b3c591dce455a7a06aed52ce62d93d6d1336 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,6 +71,8 @@ AM_CFLAGS = \
        -I$(top_builddir)/src/modules/jack \
        -I$(top_srcdir)/src/modules/dbus \
        -I$(top_builddir)/src/modules/dbus \
+       -I$(top_srcdir)/src/modules/echo-cancel \
+       -I$(top_builddir)/src/modules/echo-cancel \
        $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \
        $(LIBSAMPLERATE_CFLAGS) \
        $(LIBSNDFILE_CFLAGS) \
@@ -120,11 +122,13 @@ 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 \
                map-file \
-               daemon/pulseaudio-system.conf
+               daemon/pulseaudio-system.conf \
+               modules/echo-cancel/adrian-license.txt
 
 pulseconf_DATA = \
                default.pa \
@@ -339,6 +343,11 @@ TESTS_BINARIES += \
                alsa-time-test
 endif
 
+if !OS_IS_DARWIN
+TESTS_BINARIES += \
+               once-test
+endif
+
 if BUILD_TESTS_DEFAULT
 noinst_PROGRAMS = $(TESTS_BINARIES)
 else
@@ -385,6 +394,11 @@ thread_test_CFLAGS = $(AM_CFLAGS)
 thread_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
 thread_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
+once_test_SOURCES = tests/once-test.c
+once_test_CFLAGS = $(AM_CFLAGS)
+once_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
+once_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
+
 flist_test_SOURCES = tests/flist-test.c
 flist_test_CFLAGS = $(AM_CFLAGS)
 flist_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
@@ -838,6 +852,7 @@ libpulsecore_@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 \
@@ -1003,6 +1018,7 @@ modlibexec_LTLIBRARIES += \
                module-rescue-streams.la \
                module-intended-roles.la \
                module-suspend-on-idle.la \
+               module-echo-cancel.la \
                module-http-protocol-tcp.la \
                module-sine.la \
                module-native-protocol-tcp.la \
@@ -1017,7 +1033,9 @@ modlibexec_LTLIBRARIES += \
                module-position-event-sounds.la \
                module-augment-properties.la \
                module-cork-music-on-phone.la \
-               module-loopback.la
+               module-loopback.la \
+               module-virtual-sink.la \
+               module-virtual-source.la
 
 # See comment at librtp.la above
 if !OS_IS_WIN32
@@ -1083,8 +1101,10 @@ modlibexec_LTLIBRARIES += \
 
 dist_alsaprofilesets_DATA = \
                modules/alsa/mixer/profile-sets/default.conf \
+               modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf \
                modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
-               modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
+               modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf \
+               modules/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf
 
 if HAVE_UDEV
 dist_udevrules_DATA = \
@@ -1096,6 +1116,7 @@ dist_alsapaths_DATA = \
                modules/alsa/mixer/paths/analog-input.conf \
                modules/alsa/mixer/paths/analog-input.conf.common \
                modules/alsa/mixer/paths/analog-input-fm.conf \
+               modules/alsa/mixer/paths/analog-input-internal-mic.conf \
                modules/alsa/mixer/paths/analog-input-linein.conf \
                modules/alsa/mixer/paths/analog-input-mic.conf \
                modules/alsa/mixer/paths/analog-input-mic.conf.common \
@@ -1105,10 +1126,13 @@ dist_alsapaths_DATA = \
                modules/alsa/mixer/paths/analog-output.conf \
                modules/alsa/mixer/paths/analog-output-speaker.conf \
                modules/alsa/mixer/paths/analog-output.conf.common \
+               modules/alsa/mixer/paths/analog-output-desktop-speaker.conf \
                modules/alsa/mixer/paths/analog-output-headphones.conf \
                modules/alsa/mixer/paths/analog-output-headphones-2.conf \
                modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \
-               modules/alsa/mixer/paths/analog-output-mono.conf
+               modules/alsa/mixer/paths/analog-output-mono.conf \
+               modules/alsa/mixer/paths/iec958-stereo-output.conf \
+               modules/alsa/mixer/paths/iec958-passthrough-output.conf
 
 endif
 
@@ -1269,6 +1293,7 @@ SYMDEF_FILES = \
                modules/module-rescue-streams-symdef.h \
                modules/module-intended-roles-symdef.h \
                modules/module-suspend-on-idle-symdef.h \
+               modules/echo-cancel/module-echo-cancel-symdef.h \
                modules/module-hal-detect-symdef.h \
                modules/module-udev-detect-symdef.h \
                modules/bluetooth/module-bluetooth-proximity-symdef.h \
@@ -1282,7 +1307,9 @@ SYMDEF_FILES = \
                modules/module-cork-music-on-phone-symdef.h \
                modules/module-console-kit-symdef.h \
                modules/dbus/module-dbus-protocol-symdef.h \
-               modules/module-loopback-symdef.h
+               modules/module-loopback-symdef.h \
+               modules/module-virtual-sink-symdef.h \
+               modules/module-virtual-source-symdef.h
 
 EXTRA_DIST += $(SYMDEF_FILES)
 BUILT_SOURCES += $(SYMDEF_FILES)
@@ -1451,6 +1478,14 @@ module_loopback_la_SOURCES = modules/module-loopback.c
 module_loopback_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_loopback_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
 
+module_virtual_sink_la_SOURCES = modules/module-virtual-sink.c
+module_virtual_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
+module_virtual_sink_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
+
+module_virtual_source_la_SOURCES = modules/module-virtual-source.c
+module_virtual_source_la_LDFLAGS = $(MODULE_LDFLAGS)
+module_virtual_source_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
+
 # X11
 
 module_x11_bell_la_SOURCES = modules/x11/module-x11-bell.c
@@ -1672,6 +1707,19 @@ module_suspend_on_idle_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_suspend_on_idle_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
 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 \
+                               $(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-@PA_MAJORMINORMICRO@.la libpulsecommon-@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
 module_rtp_send_la_LDFLAGS = $(MODULE_LDFLAGS)