Disabling logging of AEC metrics for AEC version 2 when AEC3 is active.

content/renderer/media/media_stream_audio_processor.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/media_stream_audio_processor.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
@@ skipping 484 matching lines @@
   override_aec3_ = enable;
   if (!has_echo_cancellation_)
     return;
 
   auto apm_config = audio_processing_->GetConfig();
   if (apm_config.echo_canceller3.enabled == enable)
     return;
 
   apm_config.echo_canceller3.enabled = enable;
   audio_processing_->ApplyConfig(apm_config);
-  DCHECK(echo_information_);
-  echo_information_.reset(new EchoInformation());
+  if (apm_config.echo_canceller3.enabled) {
+    // Do not log any echo information when AEC3 is active, as the echo
+    // information then will not be properly updated.
+    echo_information_.reset();
+  } else {
+    echo_information_.reset(new EchoInformation());

[Guido Urdaneta, 2017/06/09 01:39:33]

prefer base::MakeUnique to raw new.
You can use assignment instead of reset in this case.

[peah, 2017/06/09 11:04:06]

Done.

+  }
 }
 
 void MediaStreamAudioProcessor::OnIpcClosing() {
   DCHECK(main_thread_runner_->BelongsToCurrentThread());
   aec_dump_message_filter_ = NULL;
 }
 
 // static
 bool MediaStreamAudioProcessor::WouldModifyAudio(
     const blink::WebMediaConstraints& constraints,
@@ skipping 172 matching lines @@
   // Enable the audio processing components.
   webrtc::AudioProcessing::Config apm_config;
 
   if (playout_data_source_) {
     playout_data_source_->AddPlayoutSink(this);
   }
 
   if (echo_cancellation) {
     EnableEchoCancellation(audio_processing_.get());
 
-    // Prepare for logging echo information. If there are data remaining in
-    // |echo_information_| we simply discard it.
-    echo_information_.reset(new EchoInformation());
-
     apm_config.echo_canceller3.enabled = override_aec3_.value_or(
         base::FeatureList::IsEnabled(features::kWebRtcUseEchoCanceller3));
+
+    if (!apm_config.echo_canceller3.enabled) {
+      // Prepare for logging echo information. If there are data remaining in
+      // |echo_information_| we simply discard it.
+      echo_information_.reset(new EchoInformation());
+    } else {
+      // Do not log any echo information when AEC3 is active, as the echo
+      // information then will not be properly updated.
+      echo_information_.reset();

[Guido Urdaneta, 2017/06/09 01:39:33]

ditto

[peah, 2017/06/09 11:04:06]

Done.

+    }
   } else {
     apm_config.echo_canceller3.enabled = false;
   }
 
   if (goog_ns) {
     // The beamforming postfilter is effective at suppressing stationary noise,
     // so reduce the single-channel NS aggressiveness when enabled.
     const NoiseSuppression::Level ns_level =
         config.Get<webrtc::Beamforming>().enabled ? NoiseSuppression::kLow
                                                   : NoiseSuppression::kHigh;
@@ skipping 176 matching lines @@
       0 : agc->stream_analog_level();
 }
 
 void MediaStreamAudioProcessor::UpdateAecStats() {
   DCHECK(main_thread_runner_->BelongsToCurrentThread());
   if (echo_information_)
     echo_information_->UpdateAecStats(audio_processing_->echo_cancellation());
 }
 
 }  // namespace content