commit 7911d3705cd2d9edae147561b7e195197187c264
author Gustaf Ullberg <gustaf@webrtc.org> Tue Sep 24 14:31:01 2019
committer Commit Bot <commit-bot@chromium.org> Wed Sep 25 09:00:24 2019
tree cd7d3f82016d924ebad537a5269bdfa8d4391bbb
parent 01dd88505cd2360357a5c2a56998c2c71d14a647

AEC3: Simplify use of SignalTransition

Simplifying the use of signal transition and removing unused code.

Bug: webrtc:8671
Change-Id: I0b845405727936b2fa7df7c92ad2e83bea3bc823
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/154348
Reviewed-by: Per Åhgren <peah@webrtc.org>
Commit-Queue: Gustaf Ullberg <gustaf@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29298}

modules/audio_processing/aec3/echo_remover.cc

diff --git a/modules/audio_processing/aec3/echo_remover.cc b/modules/audio_processing/aec3/echo_remover.cc
index 725e33e..d1a44a3 100644
--- a/modules/audio_processing/aec3/echo_remover.cc
+++ b/modules/audio_processing/aec3/echo_remover.cc
@@ -71,20 +71,25 @@
 void SignalTransition(rtc::ArrayView<const float> from,
                       rtc::ArrayView<const float> to,
                       rtc::ArrayView<float> out) {
-  constexpr size_t kTransitionSize = 30;
-  constexpr float kOneByTransitionSizePlusOne = 1.f / (kTransitionSize + 1);
+  if (from == to) {
+    RTC_DCHECK_EQ(to.size(), out.size());
+    std::copy(to.begin(), to.end(), out.begin());
+  } else {
+    constexpr size_t kTransitionSize = 30;
+    constexpr float kOneByTransitionSizePlusOne = 1.f / (kTransitionSize + 1);
 
-  RTC_DCHECK_EQ(from.size(), to.size());
-  RTC_DCHECK_EQ(from.size(), out.size());
-  RTC_DCHECK_LE(kTransitionSize, out.size());
+    RTC_DCHECK_EQ(from.size(), to.size());
+    RTC_DCHECK_EQ(from.size(), out.size());
+    RTC_DCHECK_LE(kTransitionSize, out.size());
 
-  for (size_t k = 0; k < kTransitionSize; ++k) {
-    float a = (k + 1) * kOneByTransitionSizePlusOne;
-    out[k] = a * to[k] + (1.f - a) * from[k];
+    for (size_t k = 0; k < kTransitionSize; ++k) {
+      float a = (k + 1) * kOneByTransitionSizePlusOne;
+      out[k] = a * to[k] + (1.f - a) * from[k];
+    }
+
+    std::copy(to.begin() + kTransitionSize, to.end(),
+              out.begin() + kTransitionSize);
   }
-
-  std::copy(to.begin() + kTransitionSize, to.end(),
-            out.begin() + kTransitionSize);
 }
 
 // Computes a windowed (square root Hanning) padded FFT and updates the related
@@ -157,9 +162,6 @@
   size_t block_counter_ = 0;
   int gain_change_hangover_ = 0;
   bool main_filter_output_last_selected_ = true;
-#if WEBRTC_APM_DEBUG_DUMP
-  bool linear_filter_output_last_selected_ = true;
-#endif
 
   std::vector<std::array<float, kFftLengthBy2Plus1>> Y2_heap_;
   std::vector<std::array<float, kFftLengthBy2Plus1>> E2_heap_;
@@ -382,21 +384,6 @@
   // Choose the linear output.
   const auto& Y_fft = aec_state_.UseLinearFilterOutput() ? E : Y;
 
-#if WEBRTC_APM_DEBUG_DUMP
-  if (aec_state_.UseLinearFilterOutput()) {
-    if (!linear_filter_output_last_selected_) {
-      SignalTransition(y0, e_[0], y0);
-    } else {
-      std::copy(e_[0].begin(), e_[0].end(), y0.begin());
-    }
-  } else {
-    if (linear_filter_output_last_selected_) {
-      SignalTransition(e_[0], y0, y0);
-    }
-  }
-  linear_filter_output_last_selected_ = aec_state_.UseLinearFilterOutput();
-#endif
-
   data_dumper_->DumpWav("aec3_output_linear", kBlockSize, &y0[0], 16000, 1);
   data_dumper_->DumpWav("aec3_output_linear2", kBlockSize, &e_[0][0], 16000, 1);
 
@@ -498,23 +485,11 @@
     }
   }
 
-  if (use_main_output) {
-    if (!main_filter_output_last_selected_) {
-      SignalTransition(subtractor_output.e_shadow, subtractor_output.e_main,
-                       output);
-    } else {
-      std::copy(subtractor_output.e_main.begin(),
-                subtractor_output.e_main.end(), output.begin());
-    }
-  } else {
-    if (main_filter_output_last_selected_) {
-      SignalTransition(subtractor_output.e_main, subtractor_output.e_shadow,
-                       output);
-    } else {
-      std::copy(subtractor_output.e_shadow.begin(),
-                subtractor_output.e_shadow.end(), output.begin());
-    }
-  }
+  SignalTransition(
+      main_filter_output_last_selected_ ? subtractor_output.e_main
+                                        : subtractor_output.e_shadow,
+      use_main_output ? subtractor_output.e_main : subtractor_output.e_shadow,
+      output);
   main_filter_output_last_selected_ = use_main_output;
 }