Hook up the experimental ns to APM in chrome.

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 "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "content/public/common/content_switches.h"
 #include "content/renderer/media/media_stream_audio_processor_options.h"
@@ skipping 234 matching lines @@
 #else
   const bool enable_experimental_aec = GetPropertyFromConstraints(
       &native_constraints,
       MediaConstraintsInterface::kExperimentalEchoCancellation);
   const bool enable_typing_detection = GetPropertyFromConstraints(
       &native_constraints, MediaConstraintsInterface::kTypingNoiseDetection);
 #endif
 
   const bool enable_ns = GetPropertyFromConstraints(
       &native_constraints, MediaConstraintsInterface::kNoiseSuppression);
+  const bool enable_experimental_ns = GetPropertyFromConstraints(
+        &native_constraints,
+        MediaConstraintsInterface::kExperimentalNoiseSuppression);
   const bool enable_high_pass_filter = GetPropertyFromConstraints(
       &native_constraints, MediaConstraintsInterface::kHighpassFilter);
 
   audio_mirroring_ = GetPropertyFromConstraints(
       &native_constraints, webrtc::MediaConstraintsInterface::kAudioMirroring);
 
   // Return immediately if no audio processing component is enabled.
   if (!enable_aec && !enable_experimental_aec && !enable_ns &&
       !enable_high_pass_filter && !enable_typing_detection && !enable_agc &&
-      !audio_mirroring_) {
+      !audio_mirroring_ && !enable_experimental_ns) {
     return;
   }
 
   // Create and configure the webrtc::AudioProcessing.
   audio_processing_.reset(webrtc::AudioProcessing::Create(0));
 
   // Enable the audio processing components.
   if (enable_aec) {
     EnableEchoCancellation(audio_processing_.get());
     if (enable_experimental_aec)
       EnableExperimentalEchoCancellation(audio_processing_.get());
 
     if (playout_data_source_)
       playout_data_source_->AddPlayoutSink(this);
   }
 
   if (enable_ns)
     EnableNoiseSuppression(audio_processing_.get());
 
+  if (enable_experimental_ns)
+    EnableExperimentalNoiseSuppression(audio_processing_.get());
+
   if (enable_high_pass_filter)
     EnableHighPassFilter(audio_processing_.get());
 
   if (enable_typing_detection) {
     // TODO(xians): Remove this |typing_detector_| after the typing suppression
     // is enabled by default.
     typing_detector_.reset(new webrtc::TypingDetection());
     EnableTypingDetection(audio_processing_.get(), typing_detector_.get());
   }
 
@@ skipping 89 matching lines @@
   int64 capture_delay_ms = capture_delay.InMilliseconds();
   DCHECK_LT(capture_delay_ms,
             std::numeric_limits<base::subtle::Atomic32>::max());
   int total_delay_ms =  capture_delay_ms + render_delay_ms;
   if (total_delay_ms > 300) {
     LOG(WARNING) << "Large audio delay, capture delay: " << capture_delay_ms
                  << "ms; render delay: " << render_delay_ms << "ms";
   }
 
   audio_processing_->set_stream_delay_ms(total_delay_ms);
+
   webrtc::GainControl* agc = audio_processing_->gain_control();
   int err = agc->set_stream_analog_level(volume);
   DCHECK_EQ(err, 0) << "set_stream_analog_level() error: " << err;
+
+  audio_processing_->set_stream_key_pressed(key_pressed);
+
   err = audio_processing_->ProcessStream(audio_frame);
   DCHECK_EQ(err, 0) << "ProcessStream() error: " << err;
 
   // TODO(xians): Add support for typing detection, audio level calculation.
 
   if (audio_mirroring_ && audio_frame->num_channels_ == 2) {
     // TODO(xians): Swap the stereo channels after switching to media::AudioBus.
   }
 
   if (typing_detector_ &&
@@ skipping 14 matching lines @@
   if (!audio_processing_.get())
     return;
 
   if (playout_data_source_)
     playout_data_source_->RemovePlayoutSink(this);
 
   audio_processing_.reset();
 }
 
 }  // namespace content