c555b99c13
Reason for revert:
Breaking the build bots: http://build.chromium.org/p/client.webrtc/builders/Mac32%20Release%20%5Blarge%20tests%5D/builds/4544
Fails to compile with this error:
../../webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc:218:25: error: no member named 'accumulate' in namespace 'std'
power_target = std::accumulate(clear_variance_.variance(),
Original issue's description:
> Allow intelligibility to compile in apm
>
> - Added files to gyp and BUILD
> - Made minor fixes to get everything to compile
> and intelligibility_proc to run
> - Added comments
> - Auto-reformatting
>
> Original cl is at: https://webrtc-codereview.appspot.com/57579004/
>
> TBR=aluebs@webrtc.org
>
> Committed: b7553dfdbb
TBR=ekmeyerson@webrtc.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.webrtc.org/1187033005
Cr-Commit-Position: refs/heads/master@{#9455}
275 lines
8.8 KiB
Python
275 lines
8.8 KiB
Python
# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license
|
|
# that can be found in the LICENSE file in the root of the source
|
|
# tree. An additional intellectual property rights grant can be found
|
|
# in the file PATENTS. All contributing project authors may
|
|
# be found in the AUTHORS file in the root of the source tree.
|
|
|
|
{
|
|
'variables': {
|
|
'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/audio_processing/asm_offsets',
|
|
},
|
|
'targets': [
|
|
{
|
|
'target_name': 'audio_processing',
|
|
'type': 'static_library',
|
|
'variables': {
|
|
# Outputs some low-level debug files.
|
|
'aec_debug_dump%': 0,
|
|
'agc_debug_dump%': 0,
|
|
|
|
# Disables the usual mode where we trust the reported system delay
|
|
# values the AEC receives. The corresponding define is set appropriately
|
|
# in the code, but it can be force-enabled here for testing.
|
|
'aec_untrusted_delay_for_testing%': 0,
|
|
},
|
|
'dependencies': [
|
|
'<(webrtc_root)/base/base.gyp:rtc_base_approved',
|
|
'<(webrtc_root)/common.gyp:webrtc_common',
|
|
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
|
|
'<(webrtc_root)/modules/modules.gyp:isac',
|
|
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
|
|
],
|
|
'sources': [
|
|
'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',
|
|
'aec/include/echo_cancellation.h',
|
|
'aecm/aecm_core.c',
|
|
'aecm/aecm_core.h',
|
|
'aecm/echo_control_mobile.c',
|
|
'aecm/include/echo_control_mobile.h',
|
|
'agc/agc.cc',
|
|
'agc/agc.h',
|
|
'agc/agc_audio_proc.cc',
|
|
'agc/agc_audio_proc.h',
|
|
'agc/agc_audio_proc_internal.h',
|
|
'agc/agc_manager_direct.cc',
|
|
'agc/agc_manager_direct.h',
|
|
'agc/circular_buffer.cc',
|
|
'agc/circular_buffer.h',
|
|
'agc/common.h',
|
|
'agc/gain_map_internal.h',
|
|
'agc/gmm.cc',
|
|
'agc/gmm.h',
|
|
'agc/histogram.cc',
|
|
'agc/histogram.h',
|
|
'agc/legacy/analog_agc.c',
|
|
'agc/legacy/analog_agc.h',
|
|
'agc/legacy/digital_agc.c',
|
|
'agc/legacy/digital_agc.h',
|
|
'agc/legacy/gain_control.h',
|
|
'agc/noise_gmm_tables.h',
|
|
'agc/pitch_based_vad.cc',
|
|
'agc/pitch_based_vad.h',
|
|
'agc/pitch_internal.cc',
|
|
'agc/pitch_internal.h',
|
|
'agc/pole_zero_filter.cc',
|
|
'agc/pole_zero_filter.h',
|
|
'agc/standalone_vad.cc',
|
|
'agc/standalone_vad.h',
|
|
'agc/utility.cc',
|
|
'agc/utility.h',
|
|
'agc/voice_gmm_tables.h',
|
|
'audio_buffer.cc',
|
|
'audio_buffer.h',
|
|
'audio_processing_impl.cc',
|
|
'audio_processing_impl.h',
|
|
'beamformer/beamformer.h',
|
|
'beamformer/complex_matrix.h',
|
|
'beamformer/covariance_matrix_generator.cc',
|
|
'beamformer/covariance_matrix_generator.h',
|
|
'beamformer/matrix.h',
|
|
'beamformer/nonlinear_beamformer.cc',
|
|
'beamformer/nonlinear_beamformer.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',
|
|
'include/audio_processing.h',
|
|
'level_estimator_impl.cc',
|
|
'level_estimator_impl.h',
|
|
'noise_suppression_impl.cc',
|
|
'noise_suppression_impl.h',
|
|
'processing_component.cc',
|
|
'processing_component.h',
|
|
'rms_level.cc',
|
|
'rms_level.h',
|
|
'splitting_filter.cc',
|
|
'splitting_filter.h',
|
|
'three_band_filter_bank.cc',
|
|
'three_band_filter_bank.h',
|
|
'transient/common.h',
|
|
'transient/daubechies_8_wavelet_coeffs.h',
|
|
'transient/dyadic_decimator.h',
|
|
'transient/moving_moments.cc',
|
|
'transient/moving_moments.h',
|
|
'transient/transient_detector.cc',
|
|
'transient/transient_detector.h',
|
|
'transient/transient_suppressor.cc',
|
|
'transient/transient_suppressor.h',
|
|
'transient/wpd_node.cc',
|
|
'transient/wpd_node.h',
|
|
'transient/wpd_tree.cc',
|
|
'transient/wpd_tree.h',
|
|
'typing_detection.cc',
|
|
'typing_detection.h',
|
|
'utility/delay_estimator.c',
|
|
'utility/delay_estimator.h',
|
|
'utility/delay_estimator_internal.h',
|
|
'utility/delay_estimator_wrapper.c',
|
|
'utility/delay_estimator_wrapper.h',
|
|
'voice_detection_impl.cc',
|
|
'voice_detection_impl.h',
|
|
],
|
|
'conditions': [
|
|
['aec_debug_dump==1', {
|
|
'defines': ['WEBRTC_AEC_DEBUG_DUMP',],
|
|
}],
|
|
['aec_untrusted_delay_for_testing==1', {
|
|
'defines': ['WEBRTC_UNTRUSTED_DELAY',],
|
|
}],
|
|
['agc_debug_dump==1', {
|
|
'defines': ['WEBRTC_AGC_DEBUG_DUMP',],
|
|
}],
|
|
['enable_protobuf==1', {
|
|
'dependencies': ['audioproc_debug_proto'],
|
|
'defines': ['WEBRTC_AUDIOPROC_DEBUG_DUMP'],
|
|
}],
|
|
['prefer_fixed_point==1', {
|
|
'defines': ['WEBRTC_NS_FIXED'],
|
|
'sources': [
|
|
'ns/include/noise_suppression_x.h',
|
|
'ns/noise_suppression_x.c',
|
|
'ns/nsx_core.c',
|
|
'ns/nsx_core.h',
|
|
'ns/nsx_defines.h',
|
|
],
|
|
'conditions': [
|
|
['target_arch=="mipsel" and mips_arch_variant!="r6"', {
|
|
'sources': [
|
|
'ns/nsx_core_mips.c',
|
|
],
|
|
}, {
|
|
'sources': [
|
|
'ns/nsx_core_c.c',
|
|
],
|
|
}],
|
|
],
|
|
}, {
|
|
'defines': ['WEBRTC_NS_FLOAT'],
|
|
'sources': [
|
|
'ns/defines.h',
|
|
'ns/include/noise_suppression.h',
|
|
'ns/noise_suppression.c',
|
|
'ns/ns_core.c',
|
|
'ns/ns_core.h',
|
|
'ns/windows_private.h',
|
|
],
|
|
}],
|
|
['target_arch=="ia32" or target_arch=="x64"', {
|
|
'dependencies': ['audio_processing_sse2',],
|
|
}],
|
|
['(target_arch=="arm" and arm_version>=7) or target_arch=="arm64"', {
|
|
'dependencies': ['audio_processing_neon',],
|
|
}],
|
|
['target_arch=="mipsel" and mips_arch_variant!="r6"', {
|
|
'sources': [
|
|
'aecm/aecm_core_mips.c',
|
|
],
|
|
'conditions': [
|
|
['mips_float_abi=="hard"', {
|
|
'sources': [
|
|
'aec/aec_core_mips.c',
|
|
'aec/aec_rdft_mips.c',
|
|
],
|
|
}],
|
|
],
|
|
}, {
|
|
'sources': [
|
|
'aecm/aecm_core_c.c',
|
|
],
|
|
}],
|
|
],
|
|
# TODO(jschuh): Bug 1348: fix size_t to int truncations.
|
|
'msvs_disabled_warnings': [ 4267, ],
|
|
},
|
|
],
|
|
'conditions': [
|
|
['enable_protobuf==1', {
|
|
'targets': [
|
|
{
|
|
'target_name': 'audioproc_debug_proto',
|
|
'type': 'static_library',
|
|
'sources': ['debug.proto',],
|
|
'variables': {
|
|
'proto_in_dir': '.',
|
|
# Workaround to protect against gyp's pathname relativization when
|
|
# this file is included by modules.gyp.
|
|
'proto_out_protected': 'webrtc/audio_processing',
|
|
'proto_out_dir': '<(proto_out_protected)',
|
|
},
|
|
'includes': ['../../build/protoc.gypi',],
|
|
},
|
|
],
|
|
}],
|
|
['target_arch=="ia32" or target_arch=="x64"', {
|
|
'targets': [
|
|
{
|
|
'target_name': 'audio_processing_sse2',
|
|
'type': 'static_library',
|
|
'sources': [
|
|
'aec/aec_core_sse2.c',
|
|
'aec/aec_rdft_sse2.c',
|
|
],
|
|
'conditions': [
|
|
['os_posix==1', {
|
|
'cflags': [ '-msse2', ],
|
|
'xcode_settings': {
|
|
'OTHER_CFLAGS': [ '-msse2', ],
|
|
},
|
|
}],
|
|
],
|
|
},
|
|
],
|
|
}],
|
|
['(target_arch=="arm" and arm_version>=7) or target_arch=="arm64"', {
|
|
'targets': [{
|
|
'target_name': 'audio_processing_neon',
|
|
'type': 'static_library',
|
|
'includes': ['../../build/arm_neon.gypi',],
|
|
'dependencies': [
|
|
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
|
|
],
|
|
'sources': [
|
|
'aec/aec_core_neon.c',
|
|
'aec/aec_rdft_neon.c',
|
|
'aecm/aecm_core_neon.c',
|
|
'ns/nsx_core_neon.c',
|
|
],
|
|
'conditions': [
|
|
# Disable LTO in audio_processing_neon target due to compiler bug
|
|
['use_lto==1', {
|
|
'cflags!': [
|
|
'-flto',
|
|
'-ffat-lto-objects',
|
|
],
|
|
}],
|
|
],
|
|
}],
|
|
}],
|
|
],
|
|
}
|