Using the NS noise estimate for the IE

webrtc/modules/audio_processing/audio_processing_impl.cc

 /*
  *  Copyright (c) 2012 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 753 matching lines @@
     private_submodules_->agc_manager->AnalyzePreProcess(
         ca->channels()[0], ca->num_channels(),
         capture_nonlocked_.fwd_proc_format.num_frames());
   }
 
   bool data_processed = is_data_processed();
   if (analysis_needed(data_processed)) {
     ca->SplitIntoFrequencyBands();
   }
 
-  if (constants_.intelligibility_enabled) {
-    public_submodules_->intelligibility_enhancer->AnalyzeCaptureAudio(
-        ca->split_channels_f(kBand0To8kHz), capture_nonlocked_.split_rate,
-        ca->num_channels());
-  }
-
   if (capture_nonlocked_.beamformer_enabled) {
     private_submodules_->beamformer->ProcessChunk(*ca->split_data_f(),
                                                   ca->split_data_f());
     ca->set_num_channels(1);
   }
 
   public_submodules_->high_pass_filter->ProcessCaptureAudio(ca);
   RETURN_ON_ERR(public_submodules_->gain_control->AnalyzeCaptureAudio(ca));
   public_submodules_->noise_suppression->AnalyzeCaptureAudio(ca);
   RETURN_ON_ERR(public_submodules_->echo_cancellation->ProcessCaptureAudio(ca));
 
   if (public_submodules_->echo_control_mobile->is_enabled() &&
       public_submodules_->noise_suppression->is_enabled()) {
     ca->CopyLowPassToReference();
   }
   public_submodules_->noise_suppression->ProcessCaptureAudio(ca);
+  if (constants_.intelligibility_enabled &&
+      public_submodules_->noise_suppression->is_enabled()) {

[turaj, 2016/02/09 16:40:33]

Can we have noise estimation part of NS to be auto-enabled when IE is enabled?
Otherwise one has to know about details that how sub-modules depend on one
another.

[aluebs-webrtc, 2016/02/09 19:13:35]

I thought about pulling out the noise-estimation from the NS as a stand-alone
component, but the truth is that this is a ton of work, mainly because it is old
legacy C-code and is implemented radically different on the float and fixed
versions. To give you an idea, the float version calculates the noise-estimate
on the analysis stage, while the fixed version does it in the process stage. But
I don't think it makes sense to have yet another separate noise-estimation (AEC
has its own already), since the one in the NS gives a good estimate and runs in
most cases anyway.
I agree that these dependencies between components are sub-optimal, but we
already have some, for example the TS depends on the AGC. I think it is safe to
assume that a noisy environment that would benefit from IE would also do so from
NS.
The only solution that I see, without going into a huge refactoring project of
the NS, is to enable the NS when the IE is enabled. WDYT?
If you have another idea of how we could deal with this, please let me know.

[hlundin-webrtc, 2016/02/09 19:25:03]

You could add a (D)CHECK in a strategic position to verify that the relevant
sub-components are enabled.

[aluebs-webrtc, 2016/02/09 23:09:09]

Done.

+    public_submodules_->intelligibility_enhancer->SetCaptureNoiseEstimate(
+        public_submodules_->noise_suppression->noise_estimate());
+  }
   RETURN_ON_ERR(
       public_submodules_->echo_control_mobile->ProcessCaptureAudio(ca));
   public_submodules_->voice_detection->ProcessCaptureAudio(ca);
 
   if (constants_.use_new_agc &&
       public_submodules_->gain_control->is_enabled() &&
       (!capture_nonlocked_.beamformer_enabled ||
        private_submodules_->beamformer->is_target_present())) {
     private_submodules_->agc_manager->Process(
         ca->split_bands_const(0)[kBand0To8kHz], ca->num_frames_per_band(),
@@ skipping 737 matching lines @@
   debug_dump_.capture.event_msg->mutable_config()->CopyFrom(config);
 
   RETURN_ON_ERR(WriteMessageToDebugFile(debug_dump_.debug_file.get(),
                                         &debug_dump_.num_bytes_left_for_log_,
                                         &crit_debug_, &debug_dump_.capture));
   return kNoError;
 }
 #endif  // WEBRTC_AUDIOPROC_DEBUG_DUMP
 
 }  // namespace webrtc