Finalization of the first version of EchoCanceller 3

webrtc/modules/audio_processing/BUILD.gn

 # Copyright (c) 2014 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.
 
 import("//build/config/arm.gni")
 import("//third_party/protobuf/proto_library.gni")
 import("../../webrtc.gni")
 
 declare_args() {
   # 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 = false
 }
 
 rtc_static_library("audio_processing") {
   sources = [
     "aec/aec_core.cc",
     "aec/aec_core.h",
     "aec/aec_core_optimized_methods.h",
     "aec/aec_resampler.cc",
     "aec/aec_resampler.h",
     "aec/echo_cancellation.cc",
     "aec/echo_cancellation.h",
-    "aec3/aec3_constants.h",
+    "aec3/adaptive_fir_filter.cc",
+    "aec3/adaptive_fir_filter.h",
+    "aec3/aec3_common.cc",
+    "aec3/aec3_common.h",
+    "aec3/aec3_fft.cc",
+    "aec3/aec3_fft.h",
+    "aec3/aec_state.cc",
+    "aec3/aec_state.h",
     "aec3/block_framer.cc",
     "aec3/block_framer.h",
     "aec3/block_processor.cc",
     "aec3/block_processor.h",
     "aec3/cascaded_biquad_filter.cc",
     "aec3/cascaded_biquad_filter.h",
+    "aec3/comfort_noise_generator.cc",
+    "aec3/comfort_noise_generator.h",
     "aec3/decimator_by_4.cc",
     "aec3/decimator_by_4.h",
     "aec3/echo_canceller3.cc",
     "aec3/echo_canceller3.h",
     "aec3/echo_path_delay_estimator.cc",
     "aec3/echo_path_delay_estimator.h",
+    "aec3/echo_path_variability.cc",
     "aec3/echo_path_variability.h",
     "aec3/echo_remover.cc",
     "aec3/echo_remover.h",
+    "aec3/erl_estimator.cc",
+    "aec3/erl_estimator.h",
+    "aec3/erle_estimator.cc",
+    "aec3/erle_estimator.h",
+    "aec3/fft_buffer.cc",
+    "aec3/fft_buffer.h",
+    "aec3/fft_data.h",
     "aec3/frame_blocker.cc",
     "aec3/frame_blocker.h",
+    "aec3/main_filter_update_gain.cc",
+    "aec3/main_filter_update_gain.h",
     "aec3/matched_filter.cc",
     "aec3/matched_filter.h",
     "aec3/matched_filter_lag_aggregator.cc",
     "aec3/matched_filter_lag_aggregator.h",
+    "aec3/output_selector.cc",
+    "aec3/output_selector.h",
+    "aec3/power_echo_model.cc",
+    "aec3/power_echo_model.h",
     "aec3/render_delay_buffer.cc",
     "aec3/render_delay_buffer.h",
     "aec3/render_delay_controller.cc",
     "aec3/render_delay_controller.h",
+    "aec3/render_signal_analyzer.cc",
+    "aec3/render_signal_analyzer.h",
+    "aec3/residual_echo_estimator.cc",
+    "aec3/residual_echo_estimator.h",
+    "aec3/shadow_filter_update_gain.cc",
+    "aec3/shadow_filter_update_gain.h",
+    "aec3/subtractor.cc",
+    "aec3/subtractor.h",
+    "aec3/subtractor_output.h",
+    "aec3/suppression_filter.cc",
+    "aec3/suppression_filter.h",
+    "aec3/suppression_gain.cc",
+    "aec3/suppression_gain.h",

[aleloi, 2017/02/22 16:20:31]

I guess this feedback comes a bit late in the review process, but it would
really make sense for aec3 to be its own build target. Or even consist of
several targets all defined in a new BUILD.gn file in its sub-directory. It
would take some work to decouple it from the rest (I'm volunteering :D). But in
reward, we will have faster compilation time, and protection from some kinds of
undesirable changes in the future.

Currently aec3 is an pretty nicely designed independent component that consists
of rather independent cooperating sub-components. To make it stay that way in
the future, the logical component division should be reflected in the build
system.

TLDR: it's fine as is, but cutting off pieces of the monolith some day would be
nice.

[peah-webrtc, 2017/02/22 23:51:36]

I agree that that makes sense.  However, I think we should postpone that until
another CL. Currently all other submodules to APM are also included in the BUILD
file in the same monolithic manner, and I think it makes sense to break out
those as well at the same time.

     "aecm/aecm_core.cc",
     "aecm/aecm_core.h",
     "aecm/echo_control_mobile.cc",
     "aecm/echo_control_mobile.h",
     "agc/agc.cc",
     "agc/agc.h",
     "agc/agc_manager_direct.cc",
     "agc/agc_manager_direct.h",
     "agc/gain_map_internal.h",
     "agc/loudness_histogram.cc",
@@ skipping 450 matching lines @@
     }
 
     if (rtc_enable_protobuf) {
       defines += [ "WEBRTC_AUDIOPROC_DEBUG_DUMP" ]
       deps += [
         ":audioproc_debug_proto",
         ":audioproc_protobuf_utils",
         ":audioproc_unittest_proto",
       ]
       sources += [
+        "aec3/adaptive_fir_filter_unittest.cc",
+        "aec3/aec3_fft_unittest.cc",
+        "aec3/aec_state_unittest.cc",
         "aec3/block_framer_unittest.cc",
         "aec3/block_processor_unittest.cc",
         "aec3/cascaded_biquad_filter_unittest.cc",
+        "aec3/comfort_noise_generator_unittest.cc",
         "aec3/decimator_by_4_unittest.cc",
         "aec3/echo_canceller3_unittest.cc",
         "aec3/echo_path_delay_estimator_unittest.cc",
+        "aec3/echo_path_variability_unittest.cc",
         "aec3/echo_remover_unittest.cc",
+        "aec3/erl_estimator_unittest.cc",
+        "aec3/erle_estimator_unittest.cc",
+        "aec3/fft_buffer_unittest.cc",
+        "aec3/fft_data_unittest.cc",
         "aec3/frame_blocker_unittest.cc",
+        "aec3/main_filter_update_gain_unittest.cc",
         "aec3/matched_filter_lag_aggregator_unittest.cc",
         "aec3/matched_filter_unittest.cc",
-        "aec3/mock/mock_block_processor.h",
-        "aec3/mock/mock_echo_remover.h",
-        "aec3/mock/mock_render_delay_buffer.h",
-        "aec3/mock/mock_render_delay_controller.h",
+        "aec3/output_selector_unittest.cc",
+        "aec3/power_echo_model_unittest.cc",
         "aec3/render_delay_buffer_unittest.cc",
         "aec3/render_delay_controller_unittest.cc",
+        "aec3/render_signal_analyzer_unittest.cc",
+        "aec3/residual_echo_estimator_unittest.cc",
+        "aec3/shadow_filter_update_gain_unittest.cc",
+        "aec3/subtractor_unittest.cc",
+        "aec3/suppression_filter_unittest.cc",
+        "aec3/suppression_gain_unittest.cc",
         "audio_processing_impl_locking_unittest.cc",
         "audio_processing_impl_unittest.cc",
         "audio_processing_unittest.cc",
         "beamformer/nonlinear_beamformer_unittest.cc",
         "echo_cancellation_bit_exact_unittest.cc",
         "echo_control_mobile_unittest.cc",
         "echo_detector/circular_buffer_unittest.cc",
         "echo_detector/mean_variance_estimator_unittest.cc",
         "echo_detector/moving_max_unittest.cc",
         "echo_detector/normalized_covariance_estimator_unittest.cc",
@@ skipping 202 matching lines @@
       ]
 
       deps = [
         ":audioproc_debug_proto",
         "../..:webrtc_common",
         "../../base:rtc_base_approved",
       ]
     }
   }
 }