jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

meson: rename the option from 'webrtc-audio-processing' to 'aec'

Browse Source 
Change-Id: I69cc9da36dfbb1258f8f84e9351a6c1c29c2a722
This commit is contained in:
Vladimir Stoiakin
2021-03-24 11:14:41 +03:00
committed by Sébastien Blin
parent 306c536b2f
commit e7537f3ac4
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -80,9 +80,6 @@ conf.set10('HAVE_PULSE', deplibpulse.found())
depjack = dependency('jack', required: get_option('jack')) depjack = dependency('jack', required: get_option('jack'))
conf.set10('HAVE_JACK', depjack.found()) conf.set10('HAVE_JACK', depjack.found())
depwebrtcap = dependency('webrtc-audio-processing', required: get_option('webrtc-audio-processing'))
conf.set10('HAVE_WEBRTC_AP', depwebrtcap.found())
depportaudio = dependency('portaudio-2.0', required: get_option('portaudio')) depportaudio = dependency('portaudio-2.0', required: get_option('portaudio'))
conf.set10('HAVE_PORTAUDIO', depportaudio.found()) conf.set10('HAVE_PORTAUDIO', depportaudio.found())
@ -107,6 +104,9 @@ conf.set10('HAVE_LIBNATPMP', depnatpmp.found())
depopenssl = dependency('openssl', required: get_option('name_service')) depopenssl = dependency('openssl', required: get_option('name_service'))
conf.set10('HAVE_RINGNS', depopenssl.found()) conf.set10('HAVE_RINGNS', depopenssl.found())
depwebrtcap = dependency('webrtc-audio-processing', required: get_option('aec'))
conf.set10('HAVE_WEBRTC_AP', depwebrtcap.found())
if get_option('video') if get_option('video')
conf.set('ENABLE_VIDEO', true) conf.set('ENABLE_VIDEO', true)
if host_machine.system() == 'linux' and meson.get_compiler('cpp').get_define('__ANDROID__') != '1' if host_machine.system() == 'linux' and meson.get_compiler('cpp').get_define('__ANDROID__') != '1'

2
meson_options.txt
View File

@ -11,7 +11,7 @@ option('jack', type: 'feature', value: 'auto', description: 'Enable support for
option('portaudio', type: 'feature', value: 'auto', description: 'Enable support for PortAudio') option('portaudio', type: 'feature', value: 'auto', description: 'Enable support for PortAudio')
option('upnp', type: 'feature', value: 'auto', description: 'Enable support for UPnP') option('upnp', type: 'feature', value: 'auto', description: 'Enable support for UPnP')
option('natpmp', type: 'feature', value: 'auto', description: 'Enable support for NAT-PMP') option('natpmp', type: 'feature', value: 'auto', description: 'Enable support for NAT-PMP')
option('webrtc-audio-processing', type: 'feature', value: 'auto', description: 'Enable support for WebRtc audio processing') option('aec', type: 'feature', value: 'auto', description: 'Enable Acoustic Echo Cancellation')
option('natpmp_prefix', type: 'string', value: '', description: 'Override a system directory to search for the library "natpmp"') option('natpmp_prefix', type: 'string', value: '', description: 'Override a system directory to search for the library "natpmp"')
option('tests', type: 'boolean', value: false, description: 'Build tests') option('tests', type: 'boolean', value: false, description: 'Build tests')

19
src/meson.build
View File

@ -32,6 +32,7 @@ libjami_sources = files(
'jamidht/p2p.cpp', 'jamidht/p2p.cpp',
'jamidht/server_account_manager.cpp', 'jamidht/server_account_manager.cpp',
'jamidht/sips_transport_ice.cpp', 'jamidht/sips_transport_ice.cpp',
'media/audio/echo-cancel/null_echo_canceller.cpp',
'media/audio/sound/audiofile.cpp', 'media/audio/sound/audiofile.cpp',
'media/audio/sound/dtmf.cpp', 'media/audio/sound/dtmf.cpp',
'media/audio/sound/dtmfgenerator.cpp', 'media/audio/sound/dtmfgenerator.cpp',
@ -45,9 +46,6 @@ libjami_sources = files(
'media/audio/audio_receive_thread.cpp', 'media/audio/audio_receive_thread.cpp',
'media/audio/audio_rtp_session.cpp', 'media/audio/audio_rtp_session.cpp',
'media/audio/audio_sender.cpp', 'media/audio/audio_sender.cpp',
'media/audio/echo-cancel/echo_canceller.h',
'media/audio/echo-cancel/null_echo_canceller.h',
'media/audio/echo-cancel/null_echo_canceller.cpp',
'media/audio/dcblocker.cpp', 'media/audio/dcblocker.cpp',
'media/audio/dsp.cpp', 'media/audio/dsp.cpp',
'media/audio/resampler.cpp', 'media/audio/resampler.cpp',
@ -162,14 +160,6 @@ if conf.get('HAVE_PULSE') == 1
libjami_dependencies += deplibpulse libjami_dependencies += deplibpulse
endif endif
if conf.get('HAVE_WEBRTC_AP') == 1
libjami_sources += files(
'media/audio/echo-cancel/webrtc_echo_canceller.h',
'media/audio/echo-cancel/webrtc_echo_canceller.cpp'
)
libjami_dependencies += depwebrtcap
endif
if conf.get('HAVE_JACK') == 1 if conf.get('HAVE_JACK') == 1
libjami_sources += files( libjami_sources += files(
'media/audio/jack/jacklayer.cpp' 'media/audio/jack/jacklayer.cpp'
@ -220,6 +210,13 @@ if conf.get('HAVE_RINGNS') == 1
libjami_dependencies += depopenssl libjami_dependencies += depopenssl
endif endif
if conf.get('HAVE_WEBRTC_AP') == 1
libjami_sources += files(
'media/audio/echo-cancel/webrtc_echo_canceller.cpp'
)
libjami_dependencies += depwebrtcap
endif
if conf.get('ENABLE_VIDEO') if conf.get('ENABLE_VIDEO')
libjami_sources += files( libjami_sources += files(
'client/videomanager.cpp', 'client/videomanager.cpp',