Index: webrtc/modules/audio_processing/audio_processing.gypi |
diff --git a/webrtc/modules/audio_processing/audio_processing.gypi b/webrtc/modules/audio_processing/audio_processing.gypi |
index fd41eea48c77fab35c6d64ea7c7616d6b4655bb7..7b96a0fdf89ee2feda38e956f4b6653d7e4d3265 100644 |
--- a/webrtc/modules/audio_processing/audio_processing.gypi |
+++ b/webrtc/modules/audio_processing/audio_processing.gypi |
@@ -91,9 +91,8 @@ |
'intelligibility/intelligibility_utils.h', |
'level_estimator_impl.cc', |
'level_estimator_impl.h', |
- 'logging/aec_logging.h', |
- 'logging/aec_logging_file_handling.cc', |
- 'logging/aec_logging_file_handling.h', |
+ 'logging/apm_data_dumper.cc', |
+ 'logging/apm_data_dumper.h', |
'noise_suppression_impl.cc', |
'noise_suppression_impl.h', |
'render_queue_item_verifier.h', |
@@ -150,7 +149,10 @@ |
], |
'conditions': [ |
['aec_debug_dump==1', { |
- 'defines': ['WEBRTC_AEC_DEBUG_DUMP',], |
+ 'defines': ['WEBRTC_AEC_DEBUG_DUMP=1',], |
+ }], |
+ ['aec_debug_dump==0', { |
+ 'defines': ['WEBRTC_AEC_DEBUG_DUMP=0',], |
}], |
['aec_untrusted_delay_for_testing==1', { |
'defines': ['WEBRTC_UNTRUSTED_DELAY',], |
@@ -244,11 +246,21 @@ |
{ |
'target_name': 'audio_processing_sse2', |
'type': 'static_library', |
+ 'variables': { |
+ # Outputs some low-level debug files. |
+ 'aec_debug_dump%': 0, |
kjellander_webrtc
2016/04/25 05:46:40
Can you try to move the declaration of 'aec_debug_
peah-webrtc
2016/04/25 10:58:27
Good suggestion!
It worked!
Done.
|
+ }, |
'sources': [ |
'aec/aec_core_sse2.cc', |
'aec/aec_rdft_sse2.cc', |
], |
'conditions': [ |
+ ['aec_debug_dump==1', { |
+ 'defines': ['WEBRTC_AEC_DEBUG_DUMP=1',], |
kjellander_webrtc
2016/04/25 05:46:40
+2 spaces indent (applies to rest of file as well)
peah-webrtc
2016/04/25 10:58:27
Done.
|
+ }], |
+ ['aec_debug_dump==0', { |
kjellander_webrtc
2016/04/25 05:46:39
You can write this as:
['aec_debug_dump==1', {
'
peah-webrtc
2016/04/25 10:58:27
Great! It became much nicer with that way of doing
|
+ 'defines': ['WEBRTC_AEC_DEBUG_DUMP=0',], |
+ }], |
['os_posix==1', { |
'cflags': [ '-msse2', ], |
'xcode_settings': { |
@@ -267,12 +279,24 @@ |
'dependencies': [ |
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio', |
], |
+ 'variables': { |
+ # Outputs some low-level debug files. |
+ 'aec_debug_dump%': 0, |
+ }, |
'sources': [ |
'aec/aec_core_neon.cc', |
'aec/aec_rdft_neon.cc', |
'aecm/aecm_core_neon.cc', |
'ns/nsx_core_neon.c', |
], |
+ 'conditions': [ |
+ ['aec_debug_dump==1', { |
+ 'defines': ['WEBRTC_AEC_DEBUG_DUMP=1',], |
+ }], |
kjellander_webrtc
2016/04/25 05:46:40
Use 'else' clause instead.
peah-webrtc
2016/04/25 10:58:27
Done.
|
+ ['aec_debug_dump==0', { |
+ 'defines': ['WEBRTC_AEC_DEBUG_DUMP=0',], |
+ }], |
+ ], |
}], |
}], |
], |