commit f005a000943f4f708662080c122c9c421793224d
author peah <peah@webrtc.org> Fri Oct 28 12:02:34 2016
committer Commit bot <commit-bot@chromium.org> Fri Oct 28 12:02:39 2016
tree 2ba2dac579057d053d5acb284b3b1239113ebe07
parent 6d6762cb0e236acd3231d1fba8ad590b43156d51

Added calling of the stream_analog_level api in audioproc_f

The test program audioproc_f does not call the stream_analog_level
method. This should be done do
1) Ensure that proper log output is produced when reproducing a call.
2) Ensure that this method is properly tested.
3) Ensure that the correct side-effects are triggered (this method
   is not const).

BUG=webrtc:6564

Review-Url: https://codereview.webrtc.org/2449043008
Cr-Commit-Position: refs/heads/master@{#14817}

webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc

diff --git a/webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc b/webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc
index c2983fc..266e649 100644
--- a/webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc
+++ b/webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc
@@ -63,7 +63,8 @@
 }  // namespace
 
 void AecDumpBasedSimulator::PrepareProcessStreamCall(
-    const webrtc::audioproc::Stream& msg) {
+    const webrtc::audioproc::Stream& msg,
+    bool* set_stream_analog_level_called) {
   if (msg.has_input_data()) {
     // Fixed interface processing.
     // Verify interface invariance.
@@ -127,6 +128,9 @@
   if (msg.has_level()) {
     RTC_CHECK_EQ(AudioProcessing::kNoError,
                  ap_->gain_control()->set_stream_analog_level(msg.level()));
+    *set_stream_analog_level_called = true;
+  } else {
+    *set_stream_analog_level_called = false;
   }
 }
 
@@ -507,8 +511,14 @@
 
 void AecDumpBasedSimulator::HandleMessage(
     const webrtc::audioproc::Stream& msg) {
-  PrepareProcessStreamCall(msg);
+  bool set_stream_analog_level_called = false;
+  PrepareProcessStreamCall(msg, &set_stream_analog_level_called);
   ProcessStream(interface_used_ == InterfaceType::kFixedInterface);
+  if (set_stream_analog_level_called) {
+    // Call stream analog level to ensure that any side-effects are triggered.
+    (void)ap_->gain_control()->stream_analog_level();
+  }
+
   VerifyProcessStreamBitExactness(msg);
 }
 

webrtc/modules/audio_processing/test/aec_dump_based_simulator.h

diff --git a/webrtc/modules/audio_processing/test/aec_dump_based_simulator.h b/webrtc/modules/audio_processing/test/aec_dump_based_simulator.h
index c3d273c..7f98f43 100644
--- a/webrtc/modules/audio_processing/test/aec_dump_based_simulator.h
+++ b/webrtc/modules/audio_processing/test/aec_dump_based_simulator.h
@@ -42,7 +42,8 @@
   void HandleMessage(const webrtc::audioproc::Stream& msg);
   void HandleMessage(const webrtc::audioproc::ReverseStream& msg);
   void HandleMessage(const webrtc::audioproc::Config& msg);
-  void PrepareProcessStreamCall(const webrtc::audioproc::Stream& msg);
+  void PrepareProcessStreamCall(const webrtc::audioproc::Stream& msg,
+                                bool* set_stream_analog_level_called);
   void PrepareReverseProcessStreamCall(
       const webrtc::audioproc::ReverseStream& msg);
   void VerifyProcessStreamBitExactness(const webrtc::audioproc::Stream& msg);

webrtc/modules/audio_processing/test/wav_based_simulator.cc

diff --git a/webrtc/modules/audio_processing/test/wav_based_simulator.cc b/webrtc/modules/audio_processing/test/wav_based_simulator.cc
index 673b274..dd680df 100644
--- a/webrtc/modules/audio_processing/test/wav_based_simulator.cc
+++ b/webrtc/modules/audio_processing/test/wav_based_simulator.cc
@@ -100,6 +100,8 @@
   if (samples_left_to_process) {
     PrepareProcessStreamCall();
     ProcessStream(settings_.fixed_interface);
+    // Call stream analog level to ensure that any side-effects are triggered.
+    (void)ap_->gain_control()->stream_analog_level();
     last_specified_microphone_level_ =
         ap_->gain_control()->stream_analog_level();
   }