Add IntelligibilityEnhancer support to audioproc_float

webrtc/modules/audio_processing/test/audio_file_processor.cc

 /*
  *  Copyright (c) 2015 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 24 matching lines @@
 ChannelBuffer<float> GetChannelBuffer(const WavFile& file) {
   return ChannelBuffer<float>(
       CheckedDivExact(file.sample_rate(), AudioFileProcessor::kChunksPerSecond),
       file.num_channels());
 }
 
 }  // namespace
 
 WavFileProcessor::WavFileProcessor(std::unique_ptr<AudioProcessing> ap,
                                    std::unique_ptr<WavReader> in_file,
-                                   std::unique_ptr<WavWriter> out_file)
+                                   std::unique_ptr<WavWriter> out_file,
+                                   std::unique_ptr<WavReader> reverse_in_file,
+                                   std::unique_ptr<WavWriter> reverse_out_file)
     : ap_(std::move(ap)),
       in_buf_(GetChannelBuffer(*in_file)),
       out_buf_(GetChannelBuffer(*out_file)),
       input_config_(GetStreamConfig(*in_file)),
       output_config_(GetStreamConfig(*out_file)),
       buffer_reader_(std::move(in_file)),
-      buffer_writer_(std::move(out_file)) {}
+      buffer_writer_(std::move(out_file)),
+      process_reverse_stream_(reverse_in_file && reverse_out_file) {

[peah-webrtc, 2016/03/18 09:38:02]

Why is this true only if both reverse_in_file reverse_out_file are specified?
For both the AGC, AEC amd AECM  the ProcessReverseStream (or
AnalyzeReverseStream) calls are needed to ensure proper operation.

[aluebs-webrtc, 2016/03/18 18:36:54]

In practice, the reverse_out_file is always specified (has a default value) and
I guess I was trying to keep the code as simple as possible. But you have a
great point here. Changed to a finer grained control.

+  if (process_reverse_stream_) {
+    reverse_in_buf_.reset(
+        new ChannelBuffer<float>(GetChannelBuffer(*reverse_in_file)));
+    reverse_out_buf_.reset(
+        new ChannelBuffer<float>(GetChannelBuffer(*reverse_out_file)));
+    reverse_input_config_.reset(
+        new StreamConfig(GetStreamConfig(*reverse_in_file)));
+    reverse_output_config_.reset(
+        new StreamConfig(GetStreamConfig(*reverse_out_file)));
+    reverse_buffer_reader_.reset(
+        new ChannelBufferWavReader(std::move(reverse_in_file)));
+    reverse_buffer_writer_.reset(
+        new ChannelBufferWavWriter(std::move(reverse_out_file)));
+  }
+}
 
 bool WavFileProcessor::ProcessChunk() {
   if (!buffer_reader_.Read(&in_buf_)) {
     return false;
   }
   {
     const auto st = ScopedTimer(mutable_proc_time());
     RTC_CHECK_EQ(kNoErr,
                  ap_->ProcessStream(in_buf_.channels(), input_config_,
                                     output_config_, out_buf_.channels()));
   }
   buffer_writer_.Write(out_buf_);
+  if (process_reverse_stream_) {

[peah-webrtc, 2016/03/18 09:38:02]

This bool is a bit redundant: you should be able to do the check on the
reverse_buffer_writer_ and reverse_buffer_reader_ variables.

[aluebs-webrtc, 2016/03/18 18:36:53]

I just though it was less bug prone to have one central flag for it, since there
are many pointers that are only set when there is a reverse_in_file. But agreed.
Done.

+    if (!reverse_buffer_reader_->Read(reverse_in_buf_.get())) {
+      return false;
+    }
+    {
+      const auto st = ScopedTimer(mutable_proc_time());
+      RTC_CHECK_EQ(kNoErr,
+                   ap_->ProcessReverseStream(reverse_in_buf_->channels(),
+                                             *reverse_input_config_.get(),
+                                             *reverse_output_config_.get(),
+                                             reverse_out_buf_->channels()));
+    }
+    reverse_buffer_writer_->Write(*reverse_out_buf_.get());
+  }
   return true;
 }
 
 AecDumpFileProcessor::AecDumpFileProcessor(std::unique_ptr<AudioProcessing> ap,
                                            FILE* dump_file,
                                            std::unique_ptr<WavWriter> out_file)
     : ap_(std::move(ap)),
       dump_file_(dump_file),
       out_buf_(GetChannelBuffer(*out_file)),
       output_config_(GetStreamConfig(*out_file)),
@@ skipping 95 matching lines @@
     const auto st = ScopedTimer(mutable_proc_time());
     // TODO(ajm): This currently discards the processed output, which is needed
     // for e.g. intelligibility enhancement.
     RTC_CHECK_EQ(kNoErr, ap_->ProcessReverseStream(
                              reverse_buf_->channels(), reverse_config_,
                              reverse_config_, reverse_buf_->channels()));
   }
 }
 
 }  // namespace webrtc