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 149 matching lines @@
         options.tx_agc_limiter.value_or(default_agc_config_.limiterEnable);
     if (voe_wrapper_->processing()->SetAgcConfig(default_agc_config_) == -1) {
       LOG_RTCERR3(SetAgcConfig,
                   default_agc_config_.targetLeveldBOv,
                   default_agc_config_.digitalCompressionGaindB,
                   default_agc_config_.limiterEnable);
       return false;
     }
   }
 
+  if (options.intelligibility_enhancer) {

[henrika_webrtc, 2016/05/12 06:58:32]

Please add logs here as well and verify that you never accidentally turn off the
HW NS even if IE is off.
Will also allow others to see if the IE is on or off in logs. 

[aluebs-webrtc, 2016/05/13 02:04:38]

Good point! The log of "IE enabled" is below where it actually sets the config,
but now I added an additional log to make the dependency clear.

+    intelligibility_enhancer_ = options.intelligibility_enhancer;
+    if (intelligibility_enhancer_ && *intelligibility_enhancer_) {

[the sun, 2016/05/12 11:50:01]

why do you need the first half of this condition? Did you mean for this to be:

if (options.intelligibility_enhancer) {
  intelligibility_enhancer_ = options.intelligibility_enhancer;
}
if (intelligibility_enhancer_ && *intelligibility_enhancer_) {
  options.noise_suppression = intelligibility_enhancer_;
}

?

[aluebs-webrtc, 2016/05/13 02:04:38]

That is exactly what I meant it to be, thank you :)

+      options.noise_suppression = intelligibility_enhancer_;
+    }
+  }
+
   if (options.noise_suppression) {
     const bool built_in_ns = adm()->BuiltInNSIsAvailable();
     if (built_in_ns) {
-      if (adm()->EnableBuiltInNS(*options.noise_suppression) == 0 &&
-          *options.noise_suppression) {
+      bool builtin_ns =

[the sun, 2016/05/12 11:50:01]

You have one variable named "built_in_ns" and one named "builtin_ns" in the same
scope. Perhaps remove the first one by putting the function call directly in the
conditional?

[aluebs-webrtc, 2016/05/13 02:04:38]

Great suggestion! Done.

+          *options.noise_suppression &&
+          !(intelligibility_enhancer_ && * intelligibility_enhancer_);

[the sun, 2016/05/12 11:50:01]

nit: no space after *

[aluebs-webrtc, 2016/05/13 02:04:38]

Done.

+      if (adm()->EnableBuiltInNS(builtin_ns) == 0 && builtin_ns) {
         // Disable internal software NS if built-in NS is enabled,
         // i.e., replace the software NS with the built-in NS.
         options.noise_suppression = rtc::Optional<bool>(false);
         LOG(LS_INFO) << "Disabling NS since built-in NS will be used instead";
       }
     }
     if (voep->SetNsStatus(*options.noise_suppression, ns_mode) == -1) {
       LOG_RTCERR2(SetNsStatus, *options.noise_suppression, ns_mode);
       return false;
     } else {
@@ skipping 72 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 (intelligibility_enhancer_) {
+    LOG(LS_INFO) << "Intelligibility Enhancer is enabled? "
+                 << *intelligibility_enhancer_;
+    config.Set<webrtc::Intelligibility>(
+        new webrtc::Intelligibility(*intelligibility_enhancer_));
+  }
+
   // 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