audioproc_f with simulated mic analog gain

webrtc/modules/audio_processing/test/audio_processing_simulator.cc

 /*
  *  Copyright (c) 2016 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.
  */
 
 #include "webrtc/modules/audio_processing/test/audio_processing_simulator.h"
 
 #include <algorithm>
 #include <iostream>
 #include <sstream>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/common_audio/include/audio_util.h"
 #include "webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/modules/audio_processing/test/fake_recording_device.h"
 
 namespace webrtc {
 namespace test {
 namespace {
 
 void CopyFromAudioFrame(const AudioFrame& src, ChannelBuffer<float>* dest) {
   RTC_CHECK_EQ(src.num_channels_, dest->num_channels());
   RTC_CHECK_EQ(src.samples_per_channel_, dest->num_frames());
   // Copy the data from the input buffer.
   std::vector<float> tmp(src.samples_per_channel_ * src.num_channels_);
@@ skipping 39 matching lines @@
   for (size_t ch = 0; ch < dest->num_channels_; ++ch) {
     for (size_t sample = 0; sample < dest->samples_per_channel_; ++sample) {
       dest_data[sample * dest->num_channels_ + ch] =
           src.channels()[ch][sample] * 32767;
     }
   }
 }
 
 AudioProcessingSimulator::AudioProcessingSimulator(
     const SimulationSettings& settings)
-    : settings_(settings), worker_queue_("file_writer_task_queue") {
+    : settings_(settings),
+      fake_recording_device_(
+          settings.initial_mic_level,
+          settings_.simulate_mic_gain ? *settings.simulated_mic_kind : 0),
+      worker_queue_("file_writer_task_queue") {
   if (settings_.ed_graph_output_filename &&
       settings_.ed_graph_output_filename->size() > 0) {
     residual_echo_likelihood_graph_writer_.open(
         *settings_.ed_graph_output_filename);
     RTC_CHECK(residual_echo_likelihood_graph_writer_.is_open());
     WriteEchoLikelihoodGraphFileHeader(&residual_echo_likelihood_graph_writer_);
   }
 }
 
 AudioProcessingSimulator::~AudioProcessingSimulator() {
   if (residual_echo_likelihood_graph_writer_.is_open()) {
     WriteEchoLikelihoodGraphFileFooter(&residual_echo_likelihood_graph_writer_);
     residual_echo_likelihood_graph_writer_.close();
   }
 }
 
 AudioProcessingSimulator::ScopedTimer::~ScopedTimer() {
   int64_t interval = rtc::TimeNanos() - start_time_;
   proc_time_->sum += interval;
   proc_time_->max = std::max(proc_time_->max, interval);
   proc_time_->min = std::min(proc_time_->min, interval);
 }
 
 void AudioProcessingSimulator::ProcessStream(bool fixed_interface) {
+  // Optionally use the fake recording device to simulate analog gain.
+  if (settings_.simulate_mic_gain) {
+    if (settings_.aec_dump_input_filename) {
+      // When the analog gain is sumulated and an AEC dump is used as input, set

[peah-webrtc, 2017/08/18 04:27:00]

typo: sumulated

[AleBzk, 2017/08/18 07:49:46]

Done.

+      // the undo level to |aec_dump_mic_level_| to virtually restore the
+      // unmodified microphone signal level.
+      RTC_DCHECK(aec_dump_mic_level_);
+      fake_recording_device_.set_undo_mic_level(aec_dump_mic_level_);
+    }
+
+    if (fixed_interface) {
+      fake_recording_device_.SimulateAnalogGain(&fwd_frame_);
+    } else {
+      fake_recording_device_.SimulateAnalogGain(in_buf_.get());
+    }
+
+    // Notify the current mic level to AGC.
+    RTC_CHECK_EQ(AudioProcessing::kNoError,
+                 ap_->gain_control()->set_stream_analog_level(

[peah-webrtc, 2017/08/18 04:27:00]

As discussed offline, set_stream_analog_level must be called even when the mic
gain is not simulated. The same goes for stream_analog_level

[AleBzk, 2017/08/18 07:49:46]

Done.

+                     fake_recording_device_.mic_level()));
+  }
+
+  // Process the current audio frame.
   if (fixed_interface) {
     {
       const auto st = ScopedTimer(mutable_proc_time());
       RTC_CHECK_EQ(AudioProcessing::kNoError, ap_->ProcessStream(&fwd_frame_));
     }
     CopyFromAudioFrame(fwd_frame_, out_buf_.get());
   } else {
     const auto st = ScopedTimer(mutable_proc_time());
     RTC_CHECK_EQ(AudioProcessing::kNoError,
                  ap_->ProcessStream(in_buf_->channels(), in_config_,
                                     out_config_, out_buf_->channels()));
   }
 
+  if (settings_.simulate_mic_gain) {
+    // Store the mic level suggested by AGC.
+    fake_recording_device_.set_mic_level(
+        ap_->gain_control()->stream_analog_level());
+  }

[AleBzk, 2017/07/26 13:42:31]

As you pointed out, fake_recording_device should only be used when the mic gain
is simulated.

+
   if (buffer_writer_) {
     buffer_writer_->Write(*out_buf_);
   }
 
   if (residual_echo_likelihood_graph_writer_.is_open()) {
     auto stats = ap_->GetStatistics();
     residual_echo_likelihood_graph_writer_ << stats.residual_echo_likelihood
                                            << ", ";
   }
 
@@ skipping 57 matching lines @@
   fwd_frame_.samples_per_channel_ =
       rtc::CheckedDivExact(fwd_frame_.sample_rate_hz_, kChunksPerSecond);
   fwd_frame_.num_channels_ = input_num_channels;
 
   rev_frame_.sample_rate_hz_ = reverse_input_sample_rate_hz;
   rev_frame_.samples_per_channel_ =
       rtc::CheckedDivExact(rev_frame_.sample_rate_hz_, kChunksPerSecond);
   rev_frame_.num_channels_ = reverse_input_num_channels;
 
   if (settings_.use_verbose_logging) {
+    rtc::LogMessage::LogToDebug(rtc::LS_VERBOSE);
+
     std::cout << "Sample rates:" << std::endl;
     std::cout << " Forward input: " << input_sample_rate_hz << std::endl;
     std::cout << " Forward output: " << output_sample_rate_hz << std::endl;
     std::cout << " Reverse input: " << reverse_input_sample_rate_hz
               << std::endl;
     std::cout << " Reverse output: " << reverse_output_sample_rate_hz
               << std::endl;
     std::cout << "Number of channels: " << std::endl;
     std::cout << " Forward input: " << input_num_channels << std::endl;
     std::cout << " Forward output: " << output_num_channels << std::endl;
@@ skipping 182 matching lines @@
   }
 
   if (settings_.aec_dump_output_filename) {
     ap_->AttachAecDump(AecDumpFactory::Create(
         *settings_.aec_dump_output_filename, -1, &worker_queue_));
   }
 }
 
 }  // namespace test
 }  // namespace webrtc