Added build flag around the Intelligibility enhancer performance test code

webrtc/modules/audio_processing/audio_processing_performance_unittest.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.
  */
 #include "webrtc/modules/audio_processing/audio_processing_impl.h"
@@ skipping 11 matching lines @@
 #include "webrtc/base/random.h"
 #include "webrtc/base/safe_conversions.h"
 #include "webrtc/config.h"
 #include "webrtc/modules/audio_processing/test/test_utils.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 #include "webrtc/system_wrappers/include/sleep.h"
 #include "webrtc/test/testsupport/perf_test.h"
 
+// Check to verify that the define for the intelligibility enhancer is properly
+// set.
+#if !defined(WEBRTC_INTELLIGIBILITY_ENHANCER) || \
+    (WEBRTC_INTELLIGIBILITY_ENHANCER != 0 &&     \
+     WEBRTC_INTELLIGIBILITY_ENHANCER != 1)
+#error "Set WEBRTC_INTELLIGIBILITY_ENHANCER to either 0 or 1"
+#endif
+
 namespace webrtc {
 
 namespace {
 
 static const bool kPrintAllDurations = false;
 
 class CallSimulator;
 
 // Type of the render thread APM API call to use in the test.
 enum class ProcessorType { kRender, kCapture };
@@ skipping 47 matching lines @@
         SettingsType::kDefaultApmDesktopWithoutExtendedFilter};
 
     const int desktop_sample_rates[] = {8000, 16000, 32000, 48000};
 
     for (auto sample_rate : desktop_sample_rates) {
       for (auto settings : desktop_settings) {
         simulation_configs.push_back(SimulationConfig(sample_rate, settings));
       }
     }
 
+#if (WEBRTC_INTELLIGIBILITY_ENHANCER == 1)

[kwiberg-webrtc, 2016/09/13 10:09:43]

No parentheses needed.

[peah-webrtc, 2016/09/13 12:46:49]

Done.

     const SettingsType intelligibility_enhancer_settings[] = {
         SettingsType::kDefaultApmDesktopAndIntelligibilityEnhancer};
 
     const int intelligibility_enhancer_sample_rates[] = {8000, 16000, 32000,
                                                          48000};
 
     for (auto sample_rate : intelligibility_enhancer_sample_rates) {
       for (auto settings : intelligibility_enhancer_settings) {
         simulation_configs.push_back(SimulationConfig(sample_rate, settings));
       }
     }
+#endif
 
     const SettingsType beamformer_settings[] = {
         SettingsType::kDefaultApmDesktopAndBeamformer};
 
     const int beamformer_sample_rates[] = {8000, 16000, 32000, 48000};
 
     for (auto sample_rate : beamformer_sample_rates) {
       for (auto settings : beamformer_settings) {
         simulation_configs.push_back(SimulationConfig(sample_rate, settings));
       }
@@ skipping 588 matching lines @@
   // Run test and verify that it did not time out.
   EXPECT_EQ(kEventSignaled, Run());
 }
 
 INSTANTIATE_TEST_CASE_P(
     AudioProcessingPerformanceTest,
     CallSimulator,
     ::testing::ValuesIn(SimulationConfig::GenerateSimulationConfigs()));
 
 }  // namespace webrtc