Update code to upstream revision r767
Just reorganisation of the audio_processing code.
This commit is contained in:
Arun Raghavan
parent
7e71fffb59
commit
693d686b0f
@ -1,5 +1,5 @@
|
||||
# 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 \
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
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:
|
||||
@ -1,9 +1,9 @@
|
||||
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:
|
||||
@ -1,10 +1,10 @@
|
||||
noinst_LTLIBRARIES = libagc.la
|
||||
|
||||
libagc_la_SOURCES = main/interface/gain_control.h \
|
||||
main/source/analog_agc.c \
|
||||
main/source/analog_agc.h \
|
||||
main/source/digital_agc.c \
|
||||
main/source/digital_agc.h
|
||||
libagc_la_SOURCES = interface/gain_control.h \
|
||||
analog_agc.c \
|
||||
analog_agc.h \
|
||||
digital_agc.c \
|
||||
digital_agc.h
|
||||
libagc_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
|
||||
|
||||
@ -15,15 +15,15 @@
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:spl',
|
||||
],
|
||||
'include_dirs': [
|
||||
'../interface',
|
||||
'interface',
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
'include_dirs': [
|
||||
'../interface',
|
||||
'interface',
|
||||
],
|
||||
},
|
||||
'sources': [
|
||||
'../interface/gain_control.h',
|
||||
'interface/gain_control.h',
|
||||
'analog_agc.c',
|
||||
'analog_agc.h',
|
||||
'digital_agc.c',
|
||||
@ -32,9 +32,3 @@
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
# Local Variables:
|
||||
# tab-width:2
|
||||
# indent-tabs-mode:nil
|
||||
# End:
|
||||
# vim: set expandtab tabstop=2 shiftwidth=2:
|
||||
@ -29,15 +29,14 @@
|
||||
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
|
||||
'<(webrtc_root)/../test/test.gyp:test_support',
|
||||
'<(webrtc_root)/../testing/gtest.gyp:gtest',
|
||||
'<(webrtc_root)/../testing/gtest.gyp:gtest_main',
|
||||
'<(webrtc_root)/../third_party/protobuf/protobuf.gyp:protobuf_lite',
|
||||
],
|
||||
'include_dirs': [
|
||||
'../../../../testing/gtest/include',
|
||||
'<(webrtc_root)/../testing/gtest/include',
|
||||
'<(protoc_out_dir)',
|
||||
],
|
||||
'sources': [
|
||||
'test/unit_test/unit_test.cc',
|
||||
'test/unit_test.cc',
|
||||
'<(protoc_out_dir)/<(protoc_out_relpath)/unittest.pb.cc',
|
||||
'<(protoc_out_dir)/<(protoc_out_relpath)/unittest.pb.h',
|
||||
],
|
||||
@ -48,7 +47,7 @@
|
||||
'type': 'none',
|
||||
'variables': {
|
||||
'proto_relpath':
|
||||
'<(webrtc_root)/modules/audio_processing/main/test/unit_test',
|
||||
'<(webrtc_root)/modules/audio_processing/test',
|
||||
},
|
||||
'sources': [
|
||||
'<(proto_relpath)/unittest.proto',
|
||||
@ -74,7 +73,7 @@
|
||||
},
|
||||
],
|
||||
'dependencies': [
|
||||
'../../third_party/protobuf/protobuf.gyp:protoc#host',
|
||||
'<(webrtc_root)/../third_party/protobuf/protobuf.gyp:protoc#host',
|
||||
],
|
||||
# This target exports a hard dependency because it generates header
|
||||
# files.
|
||||
@ -87,22 +86,15 @@
|
||||
'audio_processing',
|
||||
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
|
||||
'<(webrtc_root)/../testing/gtest.gyp:gtest',
|
||||
'<(webrtc_root)/../testing/gtest.gyp:gtest_main',
|
||||
'<(webrtc_root)/../third_party/protobuf/protobuf.gyp:protobuf_lite',
|
||||
],
|
||||
'include_dirs': [
|
||||
'../../../../testing/gtest/include',
|
||||
'<(webrtc_root)/../testing/gtest/include',
|
||||
'<(protoc_out_dir)',
|
||||
],
|
||||
'sources': [
|
||||
'test/process_test/process_test.cc',
|
||||
'test/process_test.cc',
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
# Local Variables:
|
||||
# tab-width:2
|
||||
# indent-tabs-mode:nil
|
||||
# End:
|
||||
# vim: set expandtab tabstop=2 shiftwidth=2:
|
||||
@ -25,11 +25,11 @@
|
||||
}],
|
||||
['build_with_chromium==1', {
|
||||
'dependencies': [
|
||||
'../../protobuf/protobuf.gyp:protobuf_lite',
|
||||
'<(webrtc_root)/../protobuf/protobuf.gyp:protobuf_lite',
|
||||
],
|
||||
}, {
|
||||
'dependencies': [
|
||||
'../../third_party/protobuf/protobuf.gyp:protobuf_lite',
|
||||
'<(webrtc_root)/../third_party/protobuf/protobuf.gyp:protobuf_lite',
|
||||
],
|
||||
}],
|
||||
],
|
||||
@ -43,18 +43,18 @@
|
||||
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
|
||||
],
|
||||
'include_dirs': [
|
||||
'interface',
|
||||
'../interface',
|
||||
'../../../interface',
|
||||
'<(protoc_out_dir)',
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
'include_dirs': [
|
||||
'interface',
|
||||
'../interface',
|
||||
'../../../interface',
|
||||
],
|
||||
},
|
||||
'sources': [
|
||||
'../interface/audio_processing.h',
|
||||
'interface/audio_processing.h',
|
||||
'audio_buffer.cc',
|
||||
'audio_buffer.h',
|
||||
'audio_processing_impl.cc',
|
||||
@ -86,7 +86,7 @@
|
||||
'target_name': 'debug_proto',
|
||||
'type': 'none',
|
||||
'variables': {
|
||||
'proto_relpath': 'audio_processing/main/source/',
|
||||
'proto_relpath': '<(webrtc_root)/modules/audio_processing',
|
||||
},
|
||||
'sources': [
|
||||
'<(proto_relpath)/debug.proto',
|
||||
@ -114,11 +114,11 @@
|
||||
'conditions': [
|
||||
['build_with_chromium==1', {
|
||||
'dependencies': [
|
||||
'../../protobuf/protobuf.gyp:protoc#host',
|
||||
'<(webrtc_root)/../protobuf/protobuf.gyp:protoc#host',
|
||||
],
|
||||
}, {
|
||||
'dependencies': [
|
||||
'../../third_party/protobuf/protobuf.gyp:protoc#host',
|
||||
'<(webrtc_root)/../third_party/protobuf/protobuf.gyp:protoc#host',
|
||||
],
|
||||
}],
|
||||
],
|
||||
@ -128,9 +128,3 @@
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
# Local Variables:
|
||||
# tab-width:2
|
||||
# indent-tabs-mode:nil
|
||||
# End:
|
||||
# vim: set expandtab tabstop=2 shiftwidth=2:
|
||||
@ -1,20 +1,20 @@
|
||||
noinst_LTLIBRARIES = libns.la libns_fix.la
|
||||
|
||||
libns_la_SOURCES = main/interface/noise_suppression.h \
|
||||
main/source/noise_suppression.c \
|
||||
main/source/windows_private.h \
|
||||
main/source/defines.h \
|
||||
main/source/ns_core.c \
|
||||
main/source/ns_core.h
|
||||
libns_la_SOURCES = interface/noise_suppression.h \
|
||||
noise_suppression.c \
|
||||
windows_private.h \
|
||||
defines.h \
|
||||
ns_core.c \
|
||||
ns_core.h
|
||||
libns_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
|
||||
|
||||
libns_fix_la_SOURCES = main/interface/noise_suppression_x.h \
|
||||
main/source/noise_suppression_x.c \
|
||||
main/source/nsx_defines.h \
|
||||
main/source/nsx_core.c \
|
||||
main/source/nsx_core.h
|
||||
libns_fix_la_SOURCES = interface/noise_suppression_x.h \
|
||||
noise_suppression_x.c \
|
||||
nsx_defines.h \
|
||||
nsx_core.c \
|
||||
nsx_core.h
|
||||
libns_fix_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/noise_suppression.h',
|
||||
'interface/noise_suppression.h',
|
||||
'noise_suppression.c',
|
||||
'windows_private.h',
|
||||
'defines.h',
|
||||
@ -39,15 +39,15 @@
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:spl',
|
||||
],
|
||||
'include_dirs': [
|
||||
'../interface',
|
||||
'interface',
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
'include_dirs': [
|
||||
'../interface',
|
||||
'interface',
|
||||
],
|
||||
},
|
||||
'sources': [
|
||||
'../interface/noise_suppression_x.h',
|
||||
'interface/noise_suppression_x.h',
|
||||
'noise_suppression_x.c',
|
||||
'nsx_defines.h',
|
||||
'nsx_core.c',
|
||||
@ -56,9 +56,3 @@
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
# Local Variables:
|
||||
# tab-width:2
|
||||
# indent-tabs-mode:nil
|
||||
# End:
|
||||
# vim: set expandtab tabstop=2 shiftwidth=2:
|
||||
@ -21,7 +21,7 @@
|
||||
#include "module_common_types.h"
|
||||
#include "tick_util.h"
|
||||
#ifdef WEBRTC_ANDROID
|
||||
#include "external/webrtc/src/modules/audio_processing/main/source/debug.pb.h"
|
||||
#include "external/webrtc/src/modules/audio_processing/debug.pb.h"
|
||||
#else
|
||||
#include "webrtc/audio_processing/debug.pb.h"
|
||||
#endif
|
||||
@ -20,7 +20,7 @@
|
||||
#include "thread_wrapper.h"
|
||||
#include "trace.h"
|
||||
#ifdef WEBRTC_ANDROID
|
||||
#include "external/webrtc/src/modules/audio_processing/main/test/unit_test/unittest.pb.h"
|
||||
#include "external/webrtc/src/modules/audio_processing/test/unittest.pb.h"
|
||||
#else
|
||||
#include "webrtc/audio_processing/unittest.pb.h"
|
||||
#endif
|
||||
Loading…
x
Reference in New Issue
Block a user