mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: Enable echo-cancel module, add libwebrtc_util lib, add speex and webrtc dependencies

Browse source 
Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
This commit is contained in:
Arnaud Rebillout 2018-10-01 11:01:47 +07:00 • committed by Arun Raghavan
parent 31fd820702
commit 88d77ff852
4 changed files with 80 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/modules/echo-cancel/meson.build Normal file
View file

@ -0,0 +1,18 @@
# The webrtc code is split off into a helper library to avoid having automake
# link module-echo-cancel with C++ (which it does if there are any C++ deps,
# even conditional ones).
# Defining this library as shared fails, as it actually requires a symbol
# from module-echo-cancel.c. Setting it to static solves that.
libwebrtc_util_sources = [
'webrtc.cc'
]
libwebrtc_util = static_library('libwebrtc_util',
libwebrtc_util_sources,
cpp_args : [pa_c_args, server_c_args],
include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, webrtc_dep],
install : true
)

48
src/modules/meson.build
View file

@ -22,7 +22,6 @@ all_modules = [
[ 'module-detect', 'module-detect.c' ],
[ 'module-device-manager', 'module-device-manager.c', [], [], [], libprotocol_native ],
[ 'module-device-restore', 'module-device-restore.c', [], [], [dbus_dep], libprotocol_native ],
# [ 'module-echo-cancel', 'module-echo-cancel.c' ],
[ 'module-esound-compat-spawnfd', 'module-esound-compat-spawnfd.c' ],
[ 'module-esound-compat-spawnpid', 'module-esound-compat-spawnpid.c' ],
# [ 'module-esound-protocol-tcp', 'module-protocol-stub.c' ],
@ -197,6 +196,53 @@ if x11_dep.found()
endif
endif
# Module echo-cancel is quite modular itself and requires a section of its own
module_echo_cancel_sources = [
'echo-cancel/echo-cancel.h',
'echo-cancel/module-echo-cancel.c',
'echo-cancel/null.c',
]
module_echo_cancel_flags = []
module_echo_cancel_deps = []
module_echo_cancel_libs = []
# FIXME: Adrian support should be optional
module_echo_cancel_sources += [
'echo-cancel/adrian.c', 'echo-cancel/adrian.h',
'echo-cancel/adrian-aec.c', 'echo-cancel/adrian-aec.h',
]
module_echo_cancel_flags += ['-DHAVE_ADRIAN_EC=1']
# FIXME: support ORC (depends on Adrian)
#ORC_SOURCE += modules/echo-cancel/adrian-aec
#module_echo_cancel_sources += [
# 'echo-cancel/adrian-aec-orc-gen.c', 'echo-cancel/adrian-aec-orc-gen.h'
#]
#module_echo_cancel_deps += [orc_dep]
if speex_dep.found()
module_echo_cancel_sources += ['echo-cancel/speex.c']
module_echo_cancel_deps += [speex_dep]
endif
if webrtc_dep.found()
subdir('echo-cancel')
module_echo_cancel_libs += [libwebrtc_util]
endif
all_modules += [
[ 'module-echo-cancel',
module_echo_cancel_sources,
[],
module_echo_cancel_flags,
module_echo_cancel_deps,
module_echo_cancel_libs,
]
]
# Generate a shared module object for each modules
foreach m : all_modules
name = m[0]
sources = m[1]