diff options
| author | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2011-09-19 13:41:13 +0530 |
|---|---|---|
| committer | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2011-10-17 16:42:59 +0530 |
| commit | 6df6eb959edbce481329bb9e45bbfa32fc8257f1 (patch) | |
| tree | ec82f3fdce80734745a7191e3a6f369fc72cf1f0 /src/Makefile.am | |
| parent | dbe8f2e595d63ce3286679059952c17d2eeb8225 (diff) | |
| download | pulseaudio-6df6eb959edbce481329bb9e45bbfa32fc8257f1.tar.gz | |
echo-cancel: Add the WebRTC echo canceller
This adds the WebRTC echo canceller as another module-echo-cancel
backend. We're exposing both the full echo canceller as well as the
mobile echo control version as modargs.
Pending items:
1. The mobile canceller doesn't seem to work at the moment.
2. We still need to add bits to hook in drift compensation (to support
sink and source from different devices).
The most controversial part of this patch would probably be the
mandatory build-time dependency on a C++ compiler. If the optional
--enable-webrtc-aec is set, then there's also a dependency on libstdc++.
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d3fe1c3c9..5f8a9bba3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,6 +48,7 @@ AM_CFLAGS = \ $(PTHREAD_CFLAGS) \ -DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \ -DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\" +AM_CXXFLAGS = $(AM_CFLAGS) SERVER_CFLAGS = -D__INCLUDED_FROM_PULSE_AUDIO AM_LIBADD = $(PTHREAD_LIBS) $(INTLLIBS) @@ -523,6 +524,7 @@ echo_cancel_test_SOURCES = $(module_echo_cancel_la_SOURCES) nodist_echo_cancel_test_SOURCES = $(nodist_module_echo_cancel_la_SOURCES) echo_cancel_test_LDADD = $(module_echo_cancel_la_LIBADD) echo_cancel_test_CFLAGS = $(module_echo_cancel_la_CFLAGS) -DECHO_CANCEL_TEST=1 +echo_cancel_test_CXXFLAGS = $(module_echo_cancel_la_CXXFLAGS) -DECHO_CANCEL_TEST=1 echo_cancel_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) ################################### @@ -1753,6 +1755,12 @@ nodist_module_echo_cancel_la_SOURCES = \ module_echo_cancel_la_LIBADD += $(ORC_LIBS) module_echo_cancel_la_CFLAGS += $(ORC_CFLAGS) -I$(top_builddir)/src/modules/echo-cancel endif +if HAVE_WEBRTC +module_echo_cancel_la_SOURCES += modules/echo-cancel/webrtc.cc +module_echo_cancel_la_CFLAGS += -DHAVE_WEBRTC=1 +module_echo_cancel_la_CXXFLAGS = $(AM_CXXFLAGS) $(SERVER_CFLAGS) $(WEBRTC_CFLAGS) -DHAVE_WEBRTC=1 +module_echo_cancel_la_LIBADD += $(WEBRTC_LIBS) +endif # RTP modules module_rtp_send_la_SOURCES = modules/rtp/module-rtp-send.c |