diff options
| author | Arun Raghavan <arun@asymptotic.io> | 2021-06-18 23:16:46 -0400 |
|---|---|---|
| committer | Arun Raghavan <arun@asymptotic.io> | 2021-06-19 13:06:12 -0400 |
| commit | 6e37f37c4ea8790760b4c55d9ce9024a7e7bf260 (patch) | |
| tree | 837f052fba71a88a34f2ebe3aedfc4f079cb3b6a | |
| parent | b8ad0dfc224b33fe8b2d9e9807d5c41912d49a58 (diff) | |
| download | webrtc-audio-processing-6e37f37c4ea8790760b4c55d9ce9024a7e7bf260.tar.gz | |
build: Split out iSAC VAD sources into a separate dependency
Avoid having to link webrtc-audio-processing with webrtc-audio-coding,
and makes the required symbols directly available.
Part-of: <https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/merge_requests/22>
| -rw-r--r-- | webrtc/modules/audio_coding/meson.build | 15 | ||||
| -rw-r--r-- | webrtc/modules/audio_processing/meson.build | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/webrtc/modules/audio_coding/meson.build b/webrtc/modules/audio_coding/meson.build index 00e503d..2c3f29d 100644 --- a/webrtc/modules/audio_coding/meson.build +++ b/webrtc/modules/audio_coding/meson.build @@ -1,3 +1,12 @@ +isac_vad_sources = [ + 'codecs/isac/main/source/filter_functions.c', + 'codecs/isac/main/source/isac_vad.c', + 'codecs/isac/main/source/pitch_estimator.c', + 'codecs/isac/main/source/pitch_filter.c', +] + +isac_vad_dep = declare_dependency(sources: isac_vad_sources) + webrtc_audio_coding_sources = [ 'codecs/isac/main/source/arith_routines.c', 'codecs/isac/main/source/arith_routines_hist.c', @@ -12,18 +21,14 @@ webrtc_audio_coding_sources = [ 'codecs/isac/main/source/encode_lpc_swb.c', 'codecs/isac/main/source/entropy_coding.c', 'codecs/isac/main/source/filterbanks.c', - 'codecs/isac/main/source/filter_functions.c', 'codecs/isac/main/source/intialize.c', 'codecs/isac/main/source/isac.c', - 'codecs/isac/main/source/isac_vad.c', 'codecs/isac/main/source/lattice.c', 'codecs/isac/main/source/lpc_analysis.c', 'codecs/isac/main/source/lpc_gain_swb_tables.c', 'codecs/isac/main/source/lpc_shape_swb12_tables.c', 'codecs/isac/main/source/lpc_shape_swb16_tables.c', 'codecs/isac/main/source/lpc_tables.c', - 'codecs/isac/main/source/pitch_estimator.c', - 'codecs/isac/main/source/pitch_filter.c', 'codecs/isac/main/source/pitch_gain_tables.c', 'codecs/isac/main/source/pitch_lag_tables.c', 'codecs/isac/main/source/spectrum_ar_model_tables.c', @@ -32,7 +37,7 @@ webrtc_audio_coding_sources = [ libwebrtc_audio_coding = library(ac_project_name, webrtc_audio_coding_sources, - dependencies: [base_dep, api_dep, common_audio_dep, system_wrappers_dep, fft_dep] + common_deps, + dependencies: [base_dep, api_dep, common_audio_dep, system_wrappers_dep, fft_dep, isac_vad_dep] + common_deps, include_directories: webrtc_inc, c_args: common_cflags, cpp_args: common_cxxflags, diff --git a/webrtc/modules/audio_processing/meson.build b/webrtc/modules/audio_processing/meson.build index 7e450d7..8fad79c 100644 --- a/webrtc/modules/audio_processing/meson.build +++ b/webrtc/modules/audio_processing/meson.build @@ -199,7 +199,7 @@ libwebrtc_audio_processing = library(apm_project_name, dependencies: [ base_dep, api_dep, - webrtc_audio_coding_dep, + isac_vad_dep, system_wrappers_dep, common_audio_dep, pffft_dep, |