Surface the IntelligibilityEnhancer on MediaConstraints

webrtc/media/engine/webrtcvoiceengine.cc

 /*
  *  Copyright (c) 2004 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.
  */
 
@@ skipping 559 matching lines @@
     options.highpass_filter = rtc::Optional<bool>(true);
     options.stereo_swapping = rtc::Optional<bool>(false);
     options.audio_jitter_buffer_max_packets = rtc::Optional<int>(50);
     options.audio_jitter_buffer_fast_accelerate = rtc::Optional<bool>(false);
     options.typing_detection = rtc::Optional<bool>(true);
     options.adjust_agc_delta = rtc::Optional<int>(0);
     options.experimental_agc = rtc::Optional<bool>(false);
     options.extended_filter_aec = rtc::Optional<bool>(false);
     options.delay_agnostic_aec = rtc::Optional<bool>(false);
     options.experimental_ns = rtc::Optional<bool>(false);
+    options.intelligibility_enhancer = rtc::Optional<bool>(false);
     bool error = ApplyOptions(options);
     RTC_DCHECK(error);
   }
 
   SetDefaultDevices();
 }
 
 WebRtcVoiceEngine::~WebRtcVoiceEngine() {
   RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
   LOG(LS_INFO) << "WebRtcVoiceEngine::~WebRtcVoiceEngine";
@@ skipping 246 matching lines @@
 
   if (options.experimental_ns) {
     experimental_ns_ = options.experimental_ns;
   }
   if (experimental_ns_) {
     LOG(LS_INFO) << "Experimental ns is enabled? " << *experimental_ns_;
     config.Set<webrtc::ExperimentalNs>(
         new webrtc::ExperimentalNs(*experimental_ns_));
   }
 
+  if (options.intelligibility_enhancer) {

[henrika_webrtc, 2016/05/11 08:50:36]

You have access to the ADM here. Why can't you use it to disable the HW NS.
Like so: adm()->EnableBuiltInNS()

[aluebs-webrtc, 2016/05/11 21:22:05]

Great point! I didn't realize there was a 2 way communication of these flags
with the Java layer. Done.

+    intelligibility_enhancer_ = options.intelligibility_enhancer;
+  }
+  if (intelligibility_enhancer_) {
+    LOG(LS_INFO) << "Intelligibility Enhancer is enabled? "
+                 << *intelligibility_enhancer_;
+    config.Set<webrtc::Intelligibility>(
+        new webrtc::Intelligibility(*intelligibility_enhancer_));

[the sun, 2016/05/11 11:23:41]

nit: the call to
adm()->EnableBuiltInNS(false)
should be here.

Also, note that on Android, the hardware effects settings are only applied when
adm()->InitRecord() is called, which will happen as soon as we know there is a
stream to be sent. I believe you should be fine though, since constraints are
passed when creating and audio source and applied when a send stream is added,
but you may want to keep an eye on the hardware NS and verify it isn't left
enabled for some reason.

[aluebs-webrtc, 2016/05/11 21:22:05]

Actually I think the best thing is to do it above together with the NS, so that
we don't disable the SWNS when IE is enabled.

+  }
+
   // We check audioproc for the benefit of tests, since FakeWebRtcVoiceEngine
   // returns NULL on audio_processing().
   webrtc::AudioProcessing* audioproc = voe_wrapper_->base()->audio_processing();
   if (audioproc) {
     audioproc->SetExtraOptions(config);
   }
 
   if (options.recording_sample_rate) {
     LOG(LS_INFO) << "Recording sample rate is "
                  << *options.recording_sample_rate;
@@ skipping 1700 matching lines @@
     }
   } else {
     LOG(LS_INFO) << "Stopping playout for channel #" << channel;
     engine()->voe()->base()->StopPlayout(channel);
   }
   return true;
 }
 }  // namespace cricket
 
 #endif  // HAVE_WEBRTC_VOICE