[pulseaudio-commits] [Git][pulseaudio/webrtc-audio-processing][master] 3 commits: remove autotools
Arun Raghavan
gitlab at gitlab.freedesktop.org
Mon Oct 12 15:19:22 UTC 2020
Arun Raghavan pushed to branch master at PulseAudio / webrtc-audio-processing
Commits:
301110c6 by Guillaume Desmottes at 2020-03-24T14:10:59+01:00
remove autotools
In Meson we trust.
- - - - -
f2003f80 by Guillaume Desmottes at 2020-03-24T15:00:53+01:00
meson: fix pkgconfig generation
The bug preventing us to pass the library object to
pkgconfig.generate() has been fixed in meson 0.52.
By doing so the generated pc file has the right -L linker flag, making
it easier to test the lib from non standard location.
We also no longer have to pass libraries_private, it will handle it
automatically.
- - - - -
f13529b5 by Guillaume Desmottes at 2020-03-24T15:00:53+01:00
UPDATING: update with meson instructions
- - - - -
13 changed files:
- − Makefile.am
- UPDATING.md
- − autogen.sh
- − configure.ac
- meson.build
- − webrtc-audio-processing.pc.in
- − webrtc/Makefile.am
- − webrtc/base/Makefile.am
- − webrtc/common_audio/Makefile.am
- − webrtc/modules/Makefile.am
- − webrtc/modules/audio_coding/Makefile.am
- − webrtc/modules/audio_processing/Makefile.am
- − webrtc/system_wrappers/Makefile.am
Changes:
=====================================
Makefile.am deleted
=====================================
@@ -1,23 +0,0 @@
-SUBDIRS = webrtc
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = webrtc-audio-processing.pc
-
-webrtcincludedir = $(includedir)/webrtc_audio_processing
-nobase_webrtcinclude_HEADERS = webrtc/base/arraysize.h \
- webrtc/base/checks.h \
- webrtc/base/constructormagic.h \
- webrtc/base/basictypes.h \
- webrtc/base/maybe.h \
- webrtc/base/platform_file.h \
- webrtc/common.h \
- webrtc/common_types.h \
- webrtc/typedefs.h \
- webrtc/modules/audio_processing/beamformer/array_util.h \
- webrtc/modules/audio_processing/include/audio_processing.h \
- webrtc/modules/interface/module_common_types.h \
- webrtc/system_wrappers/include/trace.h
-
-EXTRA_DIST = NEWS \
- README.md \
- UPDATING.md
=====================================
UPDATING.md
=====================================
@@ -29,7 +29,7 @@ project source code.
system upstreama.
* Arch-specific files usually have special handling in the corresponding
- Makefile.am.
+ meson.build.
4. Once everything has been copied and updated, everything needs to be built.
Missing dependencies (files that were not copied, or new modules that are
@@ -43,20 +43,19 @@ project source code.
* The current policy is that we mirror upstream API as-is.
- * Update configure.ac with the appropriate version info based on how the
+ * Update soversion in meson.build with the appropriate version info based on how the
code has changed. Details on how to do this are included in the
[libtool documentation][libtool-version-info].
5. Build PulseAudio (and/or any other dependent projects) against the new code.
The easy way to do this is via a prefixed install.
- * Run ```configure``` webrtc-audio-processing with
- ```--prefix=/some/local/path```, then do a ```make``` and
- ```make install```.
+ * Configure webrtc-audio-processing with
+ ```meson build -D prefix=$(pwd)/install```, then do a ```ninja -C build/ install```
- * Run ```configure``` on PulseAudio with
- ```PKG_CONFIG_PATH=/some/local/path/lib/pkgconfig```, which will cause the
- build to pick up the prefixed install. Then do a ```make```, run the built
+ * Configure PulseAudio with
+ ```meson build -D pkg_config_path=/path/to/webrtc-audio-processing/install/lib64/pkgconfig/```, which will cause the
+ build to pick up the prefixed install. Then do a ```ninja -C build```, run the built
PulseAudio, and load ```module-echo-cancel``` to make sure it loads fine.
* Run some test streams through the canceller to make sure it is working
=====================================
autogen.sh deleted
=====================================
@@ -1,6 +0,0 @@
-#!/bin/sh
-libtoolize
-aclocal
-automake --add-missing --copy
-autoconf
-./configure ${@}
=====================================
configure.ac deleted
=====================================
@@ -1,152 +0,0 @@
-AC_INIT([webrtc-audio-processing], [0.3.1])
-AM_INIT_AUTOMAKE([dist-xz subdir-objects tar-ustar])
-
-AC_SUBST(LIBWEBRTC_AUDIO_PROCESSING_VERSION_INFO, [1:0:0])
-
-AM_SILENT_RULES([yes])
-
-# Set up the host_* variables
-AC_CANONICAL_HOST
-
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-AC_PROG_INSTALL
-AM_PROG_AS
-
-AC_LANG_C
-AC_LANG_CPLUSPLUS
-
-AC_ARG_WITH([ns-mode],
- AS_HELP_STRING([--with-ns-mode=float|fixed], [Noise suppresion mode to use. Default is float]))
-
-AS_CASE(["${with_ns_mode}"],
- ["fixed"], [NS_FIXED=1],
- ["float"], [NS_FIXED=0],
- [NS_FIXED=0])
-AM_CONDITIONAL(NS_FIXED, [test "x${NS_FIXED}" = "x1"])
-
-AC_ARG_WITH(
- gnustl,
- AC_HELP_STRING(
- [--with-gnustl],
- [use gnustl @<:@default=no@:>@]),
- [AS_CASE(
- [$withval], [no], [], [yes], [],
- [AC_MSG_ERROR([bad value "$withval" for --with-gnustl])])],
- [with_gnustl=no])
-if test "x$with_gnustl" != "xno"; then
- PKG_CHECK_MODULES(GNUSTL, gnustl)
-fi
-AC_SUBST(GNUSTL_LIBS)
-AC_SUBST(GNUSTL_CFLAGS)
-
-
-# Borrowed from gst-plugins-bad
-AC_CHECK_HEADER(MobileCoreServices/MobileCoreServices.h, HAVE_IOS="yes", HAVE_IOS="no", [-])
-
-# Based on gst-plugins-bad configure.ac and defines in
-# <chromium source>/build/config/BUILDCONFIG.gn and
-# webrtc/BUILD.gn
-AS_CASE(["${host}"],
- [*android*],
- [
- OS_CFLAGS="-DWEBRTC_ANDROID -DWEBRTC_LINUX -DWEBRTC_THREAD_RR -DWEBRTC_CLOCK_TYPE_REALTIME"
- OS_LDFLAGS="-llog"
- PLATFORM_CFLAGS="-DWEBRTC_POSIX"
- HAVE_POSIX=1
- ],
- [*-*linux*],
- [
- OS_CFLAGS="-DWEBRTC_LINUX -DWEBRTC_THREAD_RR"
- PLATFORM_CFLAGS="-DWEBRTC_POSIX"
- OS_LDFLAGS="-lrt -lpthread"
- HAVE_POSIX=1
- ],
- [*-k*bsd-gnu* | *-*gnu*],
- [
- OS_CFLAGS="-DWEBRTC_GNU"
- PLATFORM_CFLAGS="-DWEBRTC_POSIX"
- HAVE_POSIX=1
- ],
- [*-*darwin*],
- [
- OS_CFLAGS="-DWEBRTC_MAC -DWEBRTC_THREAD_RR -DWEBRTC_CLOCK_TYPE_REALTIME"
- AS_IF([test "$HAVE_IOS" = "yes"],
- [OS_CFLAGS+=" -DWEBRTC_IOS"])
- PLATFORM_CFLAGS="-DWEBRTC_POSIX"
- HAVE_POSIX=1
- ],
- [*-mingw32*],
- [
- OS_LDFLAGS="-lwinmm"
- PLATFORM_CFLAGS="-DWEBRTC_WIN -D_WIN32 -U__STRICT_ANSI__"
- HAVE_WIN=1
- ],
- [AC_MSG_ERROR([Unsupported host $host])]
-)
-AC_SUBST(PLATFORM_CFLAGS)
-AM_CONDITIONAL(HAVE_POSIX, [test "x${HAVE_POSIX}" = "x1"])
-AM_CONDITIONAL(HAVE_WIN, [test "x${HAVE_WIN}" = "x1"])
-
-# Testing __ARM_ARCH_ISA_ARM since the code contains ARM instructions,
-# which don't work on Thumb-2 only platforms (ARMv7-M).
-AC_CHECK_DECLS([__ARM_ARCH_ISA_ARM],
- [HAVE_ARM=1; ARCH_CFLAGS="${ARCH_CFLAGS} -DWEBRTC_ARCH_ARM"])
-AC_CHECK_DECLS([__ARM_ARCH_7A__],
- [HAVE_ARMV7=1; ARCH_CFLAGS="${ARCH_CFLAGS} -DWEBRTC_ARCH_ARM_V7"])
-AC_CHECK_DECLS([__aarch64__],
- [HAVE_NEON=1; ARCH_CFLAGS="${ARCH_CFLAGS} -DWEBRTC_HAS_NEON -DWEBRTC_ARCH_ARM64"])
-AC_CHECK_DECLS([__i386__], [HAVE_X86=1])
-AC_CHECK_DECLS([__x86_64__], [HAVE_X86=1])
-
-AM_CONDITIONAL(HAVE_X86, [test "x${HAVE_X86}" = "x1"])
-AM_CONDITIONAL(HAVE_ARM, [test "x${HAVE_ARM}" = "x1"])
-AM_CONDITIONAL(HAVE_ARMV7, [test "x${HAVE_ARMV7}" = "x1"])
-
-# Borrowed from pulseaudio's configure.ac
-AC_ARG_ENABLE([neon],
- AS_HELP_STRING([--enable-neon], [Enable NEON optimisations on ARM CPUs that support it (yes|no|auto|runtime)]))
-
-AS_IF([test "x$enable_neon" != "xno"],
- AS_IF([test "x$enable_neon" != "xruntime"],
- [
- save_CXXFLAGS="$CXXFLAGS"; CXXFLAGS="-mfpu=neon $CXXFLAGS"
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [
- #include <arm_neon.h>
- ], [])],
- [
- HAVE_NEON=1
- ARCH_CFLAGS="$ARCH_CFLAGS -DWEBRTC_HAS_NEON -mfpu=neon"
- ])
- CXXFLAGS="$save_CXXFLAGS"
- ],
- [
- HAVE_NEON=1
- ARCH_CFLAGS="$ARCH_CFLAGS -DWEBRTC_DETECT_NEON -mfpu=neon"
- ])
-)
-AM_CONDITIONAL([HAVE_NEON], [test "x$HAVE_NEON" = "x1"])
-
-COMMON_CFLAGS="-DWEBRTC_AUDIO_PROCESSING_ONLY_BUILD ${PLATFORM_CFLAGS} ${OS_CFLAGS} ${ARCH_CFLAGS} -DNDEBUG -I\$(top_srcdir)"
-COMMON_CXXFLAGS="-std=c++11 -DWEBRTC_AUDIO_PROCESSING_ONLY_BUILD ${PLATFORM_CFLAGS} ${OS_CFLAGS} ${ARCH_CFLAGS} ${GNUSTL_CFLAGS} -DNDEBUG -I\$(top_srcdir)"
-COMMON_LDFLAGS="${OS_LDFLAGS}"
-AC_SUBST([COMMON_CFLAGS])
-AC_SUBST([COMMON_CXXFLAGS])
-AC_SUBST([COMMON_LDFLAGS])
-
-AC_CONFIG_FILES([
-webrtc-audio-processing.pc
-Makefile
-webrtc/Makefile
-webrtc/base/Makefile
-webrtc/common_audio/Makefile
-webrtc/system_wrappers/Makefile
-webrtc/modules/Makefile
-webrtc/modules/audio_coding/Makefile
-webrtc/modules/audio_processing/Makefile
-])
-
-AC_OUTPUT
=====================================
meson.build
=====================================
@@ -1,6 +1,6 @@
project('webrtc-audio-processing', 'c', 'cpp',
version : '0.3.1',
- meson_version : '>= 0.47',
+ meson_version : '>= 0.52',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
@@ -109,7 +109,5 @@ pkgconfig.generate(
extra_cflags: [
'-DWEBRTC_AUDIO_PROCESSING_ONLY_BUILD',
] + platform_cflags,
- # XXX: passing the libwebrtc_audio_processing object result in adding not-installed libraries to Libs.private
- libraries: '-lwebrtc_audio_processing',
- libraries_private: common_deps,
+ libraries: libwebrtc_audio_processing,
)
=====================================
webrtc-audio-processing.pc.in deleted
=====================================
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: webrtc-audio-processing
-Description: WebRTC Audio Processing library
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lwebrtc_audio_processing
-Cflags: -DWEBRTC_AUDIO_PROCESSING_ONLY_BUILD -I${includedir}/webrtc_audio_processing @PLATFORM_CFLAGS@
=====================================
webrtc/Makefile.am deleted
=====================================
@@ -1,12 +0,0 @@
-SUBDIRS = . base common_audio system_wrappers modules
-
-noinst_HEADERS = common.h \
- common_types.h \
- typedefs.h
-
-noinst_LTLIBRARIES = libwebrtc.la
-
-libwebrtc_la_SOURCES = common_types.cc
-libwebrtc_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS)
-
-EXTRA_DIST = BUILD.gn PATENTS LICENSE_THIRD_PARTY
=====================================
webrtc/base/Makefile.am deleted
=====================================
@@ -1,31 +0,0 @@
-noinst_LTLIBRARIES = libbase.la
-
-noinst_HEADERS = arraysize.h \
- atomicops.h \
- basictypes.h \
- constructormagic.h \
- safe_conversions.h \
- safe_conversions_impl.h \
- scoped_ptr.h \
- template_util.h \
- thread_annotations.h
-
-libbase_la_SOURCES = criticalsection.cc \
- criticalsection.h \
- checks.cc \
- checks.h \
- event.cc \
- event.h \
- platform_thread.cc \
- platform_thread.h \
- platform_file.cc \
- platform_file.h \
- stringutils.cc \
- stringutils.h \
- thread_checker.h \
- thread_checker_impl.cc \
- thread_checker_impl.h
-
-libbase_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS)
-
-EXTRA_DIST = BUILD.gn
=====================================
webrtc/common_audio/Makefile.am deleted
=====================================
@@ -1,153 +0,0 @@
-noinst_LTLIBRARIES = libcommon_audio.la
-
-noinst_HEADERS = include/audio_util.h
-
-libcommon_audio_la_SOURCES = resampler/include/push_resampler.h \
- resampler/include/resampler.h \
- resampler/push_sinc_resampler.h \
- resampler/sinc_resampler.h \
- resampler/sinusoidal_linear_chirp_source.h \
- resampler/push_resampler.cc \
- resampler/push_sinc_resampler.cc \
- resampler/resampler.cc \
- resampler/sinc_resampler.cc \
- resampler/sinusoidal_linear_chirp_source.cc \
- signal_processing/include/real_fft.h \
- signal_processing/include/signal_processing_library.h \
- signal_processing/include/spl_inl.h \
- signal_processing/include/spl_inl_armv7.h \
- signal_processing/include/spl_inl_mips.h \
- signal_processing/auto_corr_to_refl_coef.c \
- signal_processing/auto_correlation.c \
- signal_processing/complex_fft.c \
- signal_processing/complex_fft_tables.h \
- signal_processing/copy_set_operations.c \
- signal_processing/cross_correlation.c \
- signal_processing/division_operations.c \
- signal_processing/dot_product_with_scale.c \
- signal_processing/downsample_fast.c \
- signal_processing/energy.c \
- signal_processing/filter_ar.c \
- signal_processing/filter_ma_fast_q12.c \
- signal_processing/get_hanning_window.c \
- signal_processing/get_scaling_square.c \
- signal_processing/ilbc_specific_functions.c \
- signal_processing/levinson_durbin.c \
- signal_processing/lpc_to_refl_coef.c \
- signal_processing/min_max_operations.c \
- signal_processing/randomization_functions.c \
- signal_processing/real_fft.c \
- signal_processing/refl_coef_to_lpc.c \
- signal_processing/resample.c \
- signal_processing/resample_48khz.c \
- signal_processing/resample_by_2.c \
- signal_processing/resample_by_2_internal.c \
- signal_processing/resample_by_2_internal.h \
- signal_processing/resample_fractional.c \
- signal_processing/spl_init.c \
- signal_processing/spl_sqrt.c \
- signal_processing/splitting_filter.c \
- signal_processing/sqrt_of_one_minus_x_squared.c \
- signal_processing/vector_scaling_operations.c \
- vad/include/vad.h \
- vad/include/webrtc_vad.h \
- vad/vad.cc \
- vad/vad_core.c \
- vad/vad_core.h \
- vad/vad_filterbank.c \
- vad/vad_filterbank.h \
- vad/vad_gmm.c \
- vad/vad_gmm.h \
- vad/vad_sp.c \
- vad/vad_sp.h \
- vad/webrtc_vad.c \
- audio_converter.cc \
- audio_converter.h \
- audio_ring_buffer.cc \
- audio_ring_buffer.h \
- audio_util.cc \
- blocker.cc \
- blocker.h \
- channel_buffer.cc \
- channel_buffer.h \
- fft4g.c \
- fft4g.h \
- fir_filter.cc \
- fir_filter.h \
- lapped_transform.cc \
- lapped_transform.h \
- real_fourier.cc \
- real_fourier.h \
- real_fourier_ooura.cc \
- real_fourier_ooura.h \
- real_fourier_openmax.h \
- ring_buffer.h \
- ring_buffer.c \
- sparse_fir_filter.cc \
- sparse_fir_filter.h \
- wav_file.h \
- wav_file.cc \
- wav_header.h \
- wav_header.cc \
- window_generator.h \
- window_generator.cc
-
-if HAVE_X86
-noinst_LTLIBRARIES += libcommon_audio_sse2.la
-libcommon_audio_sse2_la_SOURCES = \
- resampler/sinc_resampler_sse.cc \
- fir_filter_sse.cc \
- fir_filter_sse.h
-
-libcommon_audio_sse2_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS) -msse2
-libcommon_audio_sse2_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS) -msse2
-libcommon_audio_sse2_la_LDFLAGS = $(AM_LDFLAGS)
-
-libcommon_audio_la_LIBADD = libcommon_audio_sse2.la
-endif
-
-if HAVE_ARM
-libcommon_audio_la_SOURCES += \
- signal_processing/complex_bit_reverse_arm.S \
- signal_processing/spl_sqrt_floor_arm.S
-endif
-
-if HAVE_ARMV7
-libcommon_audio_la_SOURCES += \
- signal_processing/filter_ar_fast_q12_armv7.S
-endif
-
-if HAVE_NEON
-libcommon_audio_la_SOURCES += \
- resampler/sinc_resampler_neon.cc \
- signal_processing/cross_correlation_neon.c \
- signal_processing/downsample_fast_neon.c \
- signal_processing/min_max_operations_neon.c \
- fir_filter_neon.cc \
- fir_filter_neon.h
-endif
-
-if !HAVE_ARM
-# FIXME: This condition will also hold for !HAVE_MIPS
-libcommon_audio_la_SOURCES += \
- signal_processing/complex_bit_reverse.c \
- signal_processing/filter_ar_fast_q12.c \
- signal_processing/spl_sqrt_floor.c
-endif
-
-libcommon_audio_la_CCASFLAGS = $(AM_CCASFLAGS) $(COMMON_CFLAGS)
-libcommon_audio_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS)
-libcommon_audio_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS)
-
-# FIXME: The MIPS optimisations need to be hooked up once we have the
-# autotools conditionals in place
-EXTRA_DIST = BUILD.gn \
- signal_processing/complex_bit_reverse_mips.c \
- signal_processing/complex_fft_mips.c \
- signal_processing/cross_correlation_mips.c \
- signal_processing/downsample_fast_mips.c \
- signal_processing/filter_ar_fast_q12_mips.c \
- signal_processing/min_max_operations_mips.c \
- signal_processing/resample_by_2_mips.c \
- signal_processing/spl_sqrt_floor_mips.c \
- signal_processing/vector_scaling_operations_mips.c
=====================================
webrtc/modules/Makefile.am deleted
=====================================
@@ -1,4 +0,0 @@
-SUBDIRS = audio_coding audio_processing
-
-EXTRA_DIST = interface/module_common_types.h \
- utility/interface/audio_frame_operations.h
=====================================
webrtc/modules/audio_coding/Makefile.am deleted
=====================================
@@ -1,45 +0,0 @@
-noinst_LTLIBRARIES = libaudio_coding.la
-
-libaudio_coding_la_SOURCES = codecs/isac/main/include/isac.h \
- codecs/isac/main/source/arith_routines.c \
- codecs/isac/main/source/arith_routines.h \
- codecs/isac/main/source/arith_routines_hist.c \
- codecs/isac/main/source/arith_routines_logist.c \
- codecs/isac/main/source/codec.h \
- codecs/isac/main/source/encode_lpc_swb.c \
- codecs/isac/main/source/encode_lpc_swb.h \
- codecs/isac/main/source/entropy_coding.c \
- codecs/isac/main/source/entropy_coding.h \
- codecs/isac/main/source/filter_functions.c \
- codecs/isac/main/source/filterbanks.c \
- codecs/isac/main/source/filterbank_tables.c \
- codecs/isac/main/source/filterbank_tables.h \
- codecs/isac/main/source/intialize.c \
- codecs/isac/main/source/lpc_analysis.c \
- codecs/isac/main/source/lpc_analysis.h \
- codecs/isac/main/source/lpc_gain_swb_tables.c \
- codecs/isac/main/source/lpc_gain_swb_tables.h \
- codecs/isac/main/source/lpc_shape_swb12_tables.c \
- codecs/isac/main/source/lpc_shape_swb12_tables.h \
- codecs/isac/main/source/lpc_shape_swb16_tables.c \
- codecs/isac/main/source/lpc_shape_swb16_tables.h \
- codecs/isac/main/source/lpc_tables.c \
- codecs/isac/main/source/lpc_tables.h \
- codecs/isac/main/source/os_specific_inline.h \
- codecs/isac/main/source/pitch_estimator.c \
- codecs/isac/main/source/pitch_estimator.h \
- codecs/isac/main/source/pitch_filter.c \
- codecs/isac/main/source/pitch_gain_tables.c \
- codecs/isac/main/source/pitch_gain_tables.h \
- codecs/isac/main/source/pitch_lag_tables.c \
- codecs/isac/main/source/pitch_lag_tables.h \
- codecs/isac/main/source/settings.h \
- codecs/isac/main/source/spectrum_ar_model_tables.c \
- codecs/isac/main/source/spectrum_ar_model_tables.h \
- codecs/isac/main/source/structs.h \
- codecs/isac/bandwidth_info.h
-
-libaudio_coding_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS)
-libaudio_coding_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS)
-
-EXTRA_DIST = BUILD.gn
=====================================
webrtc/modules/audio_processing/Makefile.am deleted
=====================================
@@ -1,187 +0,0 @@
-lib_LTLIBRARIES = libwebrtc_audio_processing.la
-
-libwebrtc_audio_processing_la_SOURCES = include/audio_processing.h \
- aec/include/echo_cancellation.h \
- aec/aec_common.h \
- aec/aec_core.c \
- aec/aec_core.h \
- aec/aec_core_internal.h \
- aec/aec_rdft.c \
- aec/aec_rdft.h \
- aec/aec_resampler.c \
- aec/aec_resampler.h \
- aec/echo_cancellation.c \
- aec/echo_cancellation_internal.h \
- aecm/include/echo_control_mobile.h \
- aecm/echo_control_mobile.c \
- aecm/aecm_core.c \
- aecm/aecm_core.h \
- aecm/aecm_core_c.c \
- aecm/aecm_defines.h \
- agc/legacy/analog_agc.c \
- agc/legacy/analog_agc.h \
- agc/legacy/gain_control.h \
- agc/legacy/digital_agc.c \
- agc/legacy/digital_agc.h \
- agc/agc.cc \
- agc/agc.h \
- agc/agc_manager_direct.cc \
- agc/agc_manager_direct.h \
- agc/gain_map_internal.h \
- agc/histogram.cc \
- agc/histogram.h \
- agc/utility.cc \
- agc/utility.h \
- beamformer/array_util.h \
- beamformer/beamformer.h \
- beamformer/complex_matrix.h \
- beamformer/covariance_matrix_generator.h \
- beamformer/matrix.h \
- beamformer/matrix_test_helpers.h \
- beamformer/nonlinear_beamformer.h \
- beamformer/array_util.cc \
- beamformer/covariance_matrix_generator.cc \
- beamformer/nonlinear_beamformer.cc \
- intelligibility/intelligibility_enhancer.h \
- intelligibility/intelligibility_utils.h \
- intelligibility/intelligibility_enhancer.cc \
- intelligibility/intelligibility_utils.cc \
- logging/aec_logging.h \
- logging/aec_logging_file_handling.h \
- logging/aec_logging_file_handling.cc \
- transient/common.h \
- transient/daubechies_8_wavelet_coeffs.h \
- transient/dyadic_decimator.h \
- transient/file_utils.h \
- transient/moving_moments.h \
- transient/transient_detector.h \
- transient/transient_suppressor.h \
- transient/wpd_node.h \
- transient/wpd_tree.h \
- transient/click_annotate.cc \
- transient/file_utils.cc \
- transient/moving_moments.cc \
- transient/transient_detector.cc \
- transient/transient_suppressor.cc \
- transient/wpd_node.cc \
- transient/wpd_tree.cc \
- utility/delay_estimator.c \
- utility/delay_estimator.h \
- utility/delay_estimator_internal.h \
- utility/delay_estimator_wrapper.c \
- utility/delay_estimator_wrapper.h \
- vad/common.h \
- vad/gmm.h \
- vad/noise_gmm_tables.h \
- vad/pitch_based_vad.h \
- vad/pitch_internal.h \
- vad/pole_zero_filter.h \
- vad/standalone_vad.h \
- vad/vad_audio_proc.h \
- vad/vad_audio_proc_internal.h \
- vad/vad_circular_buffer.h \
- vad/voice_activity_detector.h \
- vad/voice_gmm_tables.h \
- vad/gmm.cc \
- vad/pitch_based_vad.cc \
- vad/pitch_internal.cc \
- vad/pole_zero_filter.cc \
- vad/standalone_vad.cc \
- vad/vad_audio_proc.cc \
- vad/vad_circular_buffer.cc \
- vad/voice_activity_detector.cc \
- audio_buffer.cc \
- audio_buffer.h \
- audio_processing_impl.cc \
- audio_processing_impl.h \
- common.h \
- echo_cancellation_impl.cc \
- echo_cancellation_impl.h \
- echo_control_mobile_impl.cc \
- echo_control_mobile_impl.h \
- gain_control_impl.cc \
- gain_control_impl.h \
- high_pass_filter_impl.cc \
- high_pass_filter_impl.h \
- level_estimator_impl.cc \
- level_estimator_impl.h \
- noise_suppression_impl.cc \
- noise_suppression_impl.h \
- rms_level.cc \
- rms_level.h \
- splitting_filter.cc \
- splitting_filter.h \
- processing_component.cc \
- processing_component.h \
- three_band_filter_bank.cc \
- three_band_filter_bank.h \
- typing_detection.cc \
- typing_detection.h \
- voice_detection_impl.cc \
- voice_detection_impl.h
-
-if NS_FIXED
-COMMON_CFLAGS += -DWEBRTC_NS_FIXED=1
-COMMON_CXXFLAGS += -DWEBRTC_NS_FIXED=1
-libwebrtc_audio_processing_la_SOURCES += \
- ns/include/noise_suppression_x.h \
- ns/noise_suppression_x.c \
- ns/nsx_defines.h \
- ns/nsx_core.c \
- ns/nsx_core.h \
- ns/nsx_core_c.c
-if HAVE_NEON
-libwebrtc_audio_processing_la_SOURCES += \
- ns/nsx_core_neon.c
-endif
-else
-COMMON_CFLAGS += -DWEBRTC_NS_FLOAT=1
-COMMON_CXXFLAGS += -DWEBRTC_NS_FLOAT=1
-libwebrtc_audio_processing_la_SOURCES += \
- ns/include/noise_suppression.h \
- ns/noise_suppression.c \
- ns/defines.h \
- ns/ns_core.c \
- ns/ns_core.h \
- ns/windows_private.h
-endif
-
-if HAVE_X86
-noinst_LTLIBRARIES = libwebrtc_audio_processing_privatearch.la
-LIBWEBRTC_PRIVATEARCH=libwebrtc_audio_processing_privatearch.la
-libwebrtc_audio_processing_privatearch_la_SOURCES = \
- aec/aec_core_sse2.c \
- aec/aec_rdft_sse2.c
-libwebrtc_audio_processing_privatearch_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS) -msse2
-libwebrtc_audio_processing_privatearch_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS) -msse2
-libwebrtc_audio_processing_privatearch_la_LDFLAGS = $(AM_LDFLAGS)
-endif
-
-if HAVE_NEON
-libwebrtc_audio_processing_la_SOURCES += \
- aec/aec_core_neon.c \
- aec/aec_rdft_neon.c \
- aecm/aecm_core_neon.c
-endif
-
-libwebrtc_audio_processing_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS)
-libwebrtc_audio_processing_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS)
-
-libwebrtc_audio_processing_la_LIBADD = $(top_builddir)/webrtc/libwebrtc.la \
- $(top_builddir)/webrtc/base/libbase.la \
- $(top_builddir)/webrtc/system_wrappers/libsystem_wrappers.la \
- $(top_builddir)/webrtc/common_audio/libcommon_audio.la \
- $(top_builddir)/webrtc/modules/audio_coding/libaudio_coding.la \
- $(LIBWEBRTC_PRIVATEARCH) \
- $(GNUSTL_LIBS)
-libwebrtc_audio_processing_la_LDFLAGS = $(AM_LDFLAGS) $(COMMON_LDFLAGS) \
- -no-undefined \
- -version-info $(LIBWEBRTC_AUDIO_PROCESSING_VERSION_INFO)
-
-# FIXME: The MIPS optimisations need to be hooked up once we have the
-# autotools conditionals in place
-EXTRA_DIST = BUILD.gn \
- aec/aec_core_mips.c \
- aec/aec_rdft_neon.c \
- aecm/aecm_core_mips.c \
- ns/nsx_core_mips.c
=====================================
webrtc/system_wrappers/Makefile.am deleted
=====================================
@@ -1,91 +0,0 @@
-noinst_LTLIBRARIES = libsystem_wrappers.la
-
-noinst_HEADERS = include/aligned_array.h \
- include/asm_defines.h \
- include/condition_variable_wrapper.h \
- include/compile_assert_c.h \
- include/event_wrapper.h \
- include/scoped_vector.h \
- include/static_instance.h \
- include/stl_util.h
-
-libsystem_wrappers_la_SOURCES = include/aligned_malloc.h \
- include/cpu_features_wrapper.h \
- include/critical_section_wrapper.h \
- include/file_wrapper.h \
- include/logging.h \
- include/metrics.h \
- include/rw_lock_wrapper.h \
- include/sleep.h \
- include/thread_wrapper.h \
- include/trace.h \
- source/aligned_malloc.cc \
- source/cpu_features.cc \
- source/event.cc \
- source/event_timer_posix.h \
- source/event_timer_win.h \
- source/file_impl.cc \
- source/file_impl.h \
- source/critical_section.cc \
- source/critical_section_posix.h \
- source/critical_section_win.h \
- source/logging.cc \
- source/metrics_default.cc \
- source/rw_lock.cc \
- source/rw_lock_generic.h \
- source/rw_lock_posix.h \
- source/rw_lock_win.h \
- source/sleep.cc \
- source/thread.cc \
- source/thread_posix.h \
- source/thread_win.h \
- source/trace_impl.cc \
- source/trace_impl.h \
- source/trace_posix.h \
- source/trace_win.h
-
-EXTRA_DIST = BUILD.gn
-
-if HAVE_POSIX
-libsystem_wrappers_la_SOURCES += source/critical_section_posix.cc \
- source/event_timer_posix.cc \
- source/rw_lock_posix.cc \
- source/thread_posix.cc \
- source/trace_posix.cc
-else
-EXTRA_DIST += source/critical_section_posix.cc \
- source/event_timer_posix.cc \
- source/rw_lock_posix.cc \
- source/thread_posix.cc \
- source/trace_posix.cc
-endif
-
-if HAVE_WIN
-libsystem_wrappers_la_SOURCES += include/fix_interlocked_exchange_pointer_win.h \
- source/critical_section_win.cc \
- source/condition_variable.cc \
- source/condition_variable_event_win.cc \
- source/condition_variable_event_win.h \
- source/condition_variable_native_win.cc \
- source/condition_variable_native_win.h \
- source/event_timer_win.cc \
- source/rw_lock_win.cc \
- source/rw_lock_generic.cc \
- source/thread_win.cc \
- source/trace_win.cc
-else
-EXTRA_DIST += include/fix_interlocked_exchange_pointer_win.h \
- source/critical_section_win.cc \
- source/condition_variable.cc \
- source/condition_variable_event_win.cc \
- source/condition_variable_event_win.h \
- source/condition_variable_native_win.cc \
- source/condition_variable_native_win.h \
- source/event_timer_win.cc \
- source/rw_lock_generic.cc \
- source/rw_lock_win.cc \
- source/thread_win.cc \
- source/trace_win.cc
-endif
-
-libsystem_wrappers_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS)
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/compare/9def8cf10d3c97640d32f1328535e881288f700f...f13529b5b88b106f3f0d90b516f56098d6624c35
--
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/compare/9def8cf10d3c97640d32f1328535e881288f700f...f13529b5b88b106f3f0d90b516f56098d6624c35
You're receiving this email because of your account on gitlab.freedesktop.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20201012/6d432eea/attachment-0001.htm>
More information about the pulseaudio-commits
mailing list