Commit 693d686b authored by Arun Raghavan's avatar Arun Raghavan
Browse files

Update code to upstream revision r767

Just reorganisation of the audio_processing code.
parent 7e71fffb
# Revision changelog (version - date, svn rev. from upstream that was merged)
# 0.1 - 19 Oct 2011, r766
# 0.1 - 19 Oct 2011, r767
AC_INIT([webrtc-audio-processing], [0.1])
AM_INIT_AUTOMAKE([tar-ustar])
......@@ -24,8 +24,8 @@ AS_CASE(["x${with_ns_mode}"],
[NS_FIXED=0])
AM_CONDITIONAL(NS_FIXED, [test "x${NS_FIXED}" = "x1"])
COMMON_CFLAGS="-DNDEBUG -I\$(srcdir)/main/interface -I\$(top_srcdir)/src -I\$(top_srcdir)/src/modules/interface"
COMMON_CXXFLAGS="-DNDEBUG -I\$(srcdir)/main/interface -I\$(top_srcdir)/src -I\$(top_srcdir)/src/modules/interface"
COMMON_CFLAGS="-DNDEBUG -I\$(srcdir)/interface -I\$(srcdir)/main/interface -I\$(top_srcdir)/src -I\$(top_srcdir)/src/modules/interface"
COMMON_CXXFLAGS="-DNDEBUG -I\$(srcdir)/interface -I\$(srcdir)/main/interface -I\$(top_srcdir)/src -I\$(top_srcdir)/src/modules/interface"
AC_SUBST([COMMON_CFLAGS])
AC_SUBST([COMMON_CXXFLAGS])
......
......@@ -12,42 +12,42 @@ endif
webrtcincludedir = $(includedir)/webrtc_audio_processing
webrtcinclude_HEADERS = $(top_srcdir)/src/typedefs.h \
$(top_srcdir)/src/modules/interface/module.h \
main/interface/audio_processing.h \
interface/audio_processing.h \
$(top_srcdir)/src/common_types.h \
$(top_srcdir)/src/modules/interface/module_common_types.h
libwebrtc_audio_processing_la_SOURCES = main/interface/audio_processing.h \
main/source/audio_buffer.cc \
main/source/audio_buffer.h \
main/source/audio_processing_impl.cc \
main/source/audio_processing_impl.h \
main/source/echo_cancellation_impl.cc \
main/source/echo_cancellation_impl.h \
main/source/echo_control_mobile_impl.cc \
main/source/echo_control_mobile_impl.h \
main/source/gain_control_impl.cc \
main/source/gain_control_impl.h \
main/source/high_pass_filter_impl.cc \
main/source/high_pass_filter_impl.h \
main/source/level_estimator_impl.cc \
main/source/level_estimator_impl.h \
main/source/noise_suppression_impl.cc \
main/source/noise_suppression_impl.h \
main/source/splitting_filter.cc \
main/source/splitting_filter.h \
main/source/processing_component.cc \
main/source/processing_component.h \
main/source/voice_detection_impl.cc \
main/source/voice_detection_impl.h
libwebrtc_audio_processing_la_SOURCES = interface/audio_processing.h \
audio_buffer.cc \
audio_buffer.h \
audio_processing_impl.cc \
audio_processing_impl.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 \
splitting_filter.cc \
splitting_filter.h \
processing_component.cc \
processing_component.h \
voice_detection_impl.cc \
voice_detection_impl.h
libwebrtc_audio_processing_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS) \
-I$(top_srcdir)/src/common_audio/signal_processing_library/main/interface \
-I$(top_srcdir)/src/common_audio/vad/main/interface \
-I$(top_srcdir)/src/system_wrappers/interface \
-I$(top_srcdir)/src/modules/audio_processing/utility \
-I$(top_srcdir)/src/modules/audio_processing/ns/main/interface \
-I$(top_srcdir)/src/modules/audio_processing/aec/main/interface \
-I$(top_srcdir)/src/modules/audio_processing/aecm/main/interface \
-I$(top_srcdir)/src/modules/audio_processing/agc/main/interface
-I$(top_srcdir)/src/modules/audio_processing/ns/interface \
-I$(top_srcdir)/src/modules/audio_processing/aec/interface \
-I$(top_srcdir)/src/modules/audio_processing/aecm/interface \
-I$(top_srcdir)/src/modules/audio_processing/agc/interface
libwebrtc_audio_processing_la_LIBADD = $(top_builddir)/src/system_wrappers/libsystem_wrappers.la \
$(top_builddir)/src/common_audio/signal_processing_library/libspl.la \
$(top_builddir)/src/common_audio/vad/libvad.la \
......
noinst_LTLIBRARIES = libaec.la
libaec_la_SOURCES = main/interface/echo_cancellation.h \
main/source/echo_cancellation.c \
main/source/aec_core.h \
main/source/aec_core.c \
main/source/aec_core_sse2.c \
main/source/aec_rdft.h \
main/source/aec_rdft.c \
main/source/aec_rdft_sse2.c \
main/source/resampler.h \
main/source/resampler.c
libaec_la_SOURCES = interface/echo_cancellation.h \
echo_cancellation.c \
aec_core.h \
aec_core.c \
aec_core_sse2.c \
aec_rdft.h \
aec_rdft.c \
aec_rdft_sse2.c \
resampler.h \
resampler.c
libaec_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS) \
-I$(top_srcdir)/src/common_audio/signal_processing_library/main/interface \
-I$(top_srcdir)/src/system_wrappers/interface \
......
......@@ -16,15 +16,15 @@
'apm_util'
],
'include_dirs': [
'../interface',
'interface',
],
'direct_dependent_settings': {
'include_dirs': [
'../interface',
'interface',
],
},
'sources': [
'../interface/echo_cancellation.h',
'interface/echo_cancellation.h',
'echo_cancellation.c',
'aec_core.h',
'aec_core.c',
......@@ -38,9 +38,3 @@
},
],
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:
noinst_LTLIBRARIES = libaecm.la
libaecm_la_SOURCES = main/interface/echo_control_mobile.h \
main/source/echo_control_mobile.c \
main/source/aecm_core.c \
main/source/aecm_core.h
libaecm_la_SOURCES = interface/echo_control_mobile.h \
echo_control_mobile.c \
aecm_core.c \
aecm_core.h
libaecm_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS) \
-I$(top_srcdir)/src/common_audio/signal_processing_library/main/interface \
-I$(top_srcdir)/src/modules/audio_processing/utility
......@@ -16,15 +16,15 @@
'apm_util'
],
'include_dirs': [
'../interface',
'interface',
],
'direct_dependent_settings': {
'include_dirs': [
'../interface',
'interface',
],
},
'sources': [
'../interface/echo_control_mobile.h',
'interface/echo_control_mobile.h',
'echo_control_mobile.c',
'aecm_core.c',
'aecm_core.h',
......@@ -32,9 +32,3 @@
},
],
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment