AnotherFoxGuy/webrtc-audio-processing
1
0
Fork 0
Code Pull Requests Activity

build: Split out iSAC VAD sources into a separate dependency

Browse Source 
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>
This commit is contained in:
Arun Raghavan 2021-06-18 23:16:46 -04:00
parent b8ad0dfc22
commit 6e37f37c4e
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
webrtc/modules/audio_coding/meson.build
View File

@ -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 = [ webrtc_audio_coding_sources = [
'codecs/isac/main/source/arith_routines.c', 'codecs/isac/main/source/arith_routines.c',
'codecs/isac/main/source/arith_routines_hist.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/encode_lpc_swb.c',
'codecs/isac/main/source/entropy_coding.c', 'codecs/isac/main/source/entropy_coding.c',
'codecs/isac/main/source/filterbanks.c', 'codecs/isac/main/source/filterbanks.c',
'codecs/isac/main/source/filter_functions.c',
'codecs/isac/main/source/intialize.c', 'codecs/isac/main/source/intialize.c',
'codecs/isac/main/source/isac.c', 'codecs/isac/main/source/isac.c',
'codecs/isac/main/source/isac_vad.c',
'codecs/isac/main/source/lattice.c', 'codecs/isac/main/source/lattice.c',
'codecs/isac/main/source/lpc_analysis.c', 'codecs/isac/main/source/lpc_analysis.c',
'codecs/isac/main/source/lpc_gain_swb_tables.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_swb12_tables.c',
'codecs/isac/main/source/lpc_shape_swb16_tables.c', 'codecs/isac/main/source/lpc_shape_swb16_tables.c',
'codecs/isac/main/source/lpc_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_gain_tables.c',
'codecs/isac/main/source/pitch_lag_tables.c', 'codecs/isac/main/source/pitch_lag_tables.c',
'codecs/isac/main/source/spectrum_ar_model_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, libwebrtc_audio_coding = library(ac_project_name,
webrtc_audio_coding_sources, 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, include_directories: webrtc_inc,
c_args: common_cflags, c_args: common_cflags,
cpp_args: common_cxxflags, cpp_args: common_cxxflags,

2
webrtc/modules/audio_processing/meson.build
View File

@ -199,7 +199,7 @@ libwebrtc_audio_processing = library(apm_project_name,
dependencies: [ dependencies: [
base_dep, base_dep,
api_dep, api_dep,
webrtc_audio_coding_dep, isac_vad_dep,
system_wrappers_dep, system_wrappers_dep,
common_audio_dep, common_audio_dep,
pffft_dep, pffft_dep,