diff --git a/webrtc/modules/audio_processing/BUILD.gn b/webrtc/modules/audio_processing/BUILD.gn index 6730fd597f..2626b7ebff 100644 --- a/webrtc/modules/audio_processing/BUILD.gn +++ b/webrtc/modules/audio_processing/BUILD.gn @@ -329,12 +329,6 @@ if (rtc_include_tests) { configs += [ "../..:common_config" ] public_configs = [ "../..:common_inherited_config" ] - if (is_clang) { - # Suppress warnings from Chrome's Clang plugins. - # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. - configs -= [ "//build/config/clang:find_bad_constructs" ] - } - deps = [ ":audio_processing", ":audioproc_debug_proto", @@ -358,12 +352,6 @@ if (rtc_include_tests) { configs += [ "../..:common_config" ] public_configs = [ "../..:common_inherited_config" ] - if (is_clang) { - # Suppress warnings from Chrome's Clang plugins. - # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. - configs -= [ "//build/config/clang:find_bad_constructs" ] - } - deps = [ ":audio_processing", ":audioproc_debug_proto", @@ -391,12 +379,6 @@ if (rtc_include_tests) { configs += [ "../..:common_config" ] public_configs = [ "../..:common_inherited_config" ] - if (is_clang) { - # Suppress warnings from Chrome's Clang plugins. - # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. - configs -= [ "//build/config/clang:find_bad_constructs" ] - } - deps = [ ":audio_processing", ":audioproc_debug_proto", 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 7c9bebcd1b..cefc21bccc 100644 --- a/webrtc/modules/audio_processing/test/aec_dump_based_simulator.h +++ b/webrtc/modules/audio_processing/test/aec_dump_based_simulator.h @@ -29,7 +29,7 @@ class AecDumpBasedSimulator final : public AudioProcessingSimulator { public: explicit AecDumpBasedSimulator(const SimulationSettings& settings) : AudioProcessingSimulator(settings) {} - virtual ~AecDumpBasedSimulator() {} + ~AecDumpBasedSimulator() override {} // Processes the messages in the aecdump file. void Process() override; diff --git a/webrtc/modules/audio_processing/test/audio_processing_simulator.cc b/webrtc/modules/audio_processing/test/audio_processing_simulator.cc index 57b03ed4b2..a34c3ca78e 100644 --- a/webrtc/modules/audio_processing/test/audio_processing_simulator.cc +++ b/webrtc/modules/audio_processing/test/audio_processing_simulator.cc @@ -44,6 +44,10 @@ std::string GetIndexedOutputWavFilename(const std::string& wav_name, } // namespace +SimulationSettings::SimulationSettings() = default; +SimulationSettings::SimulationSettings(const SimulationSettings&) = default; +SimulationSettings::~SimulationSettings() = default; + void CopyToAudioFrame(const ChannelBuffer& src, AudioFrame* dest) { RTC_CHECK_EQ(src.num_channels(), dest->num_channels_); RTC_CHECK_EQ(src.num_frames(), dest->samples_per_channel_); @@ -55,6 +59,12 @@ void CopyToAudioFrame(const ChannelBuffer& src, AudioFrame* dest) { } } +AudioProcessingSimulator::AudioProcessingSimulator( + const SimulationSettings& settings) + : settings_(settings) {} + +AudioProcessingSimulator::~AudioProcessingSimulator() = default; + AudioProcessingSimulator::ScopedTimer::~ScopedTimer() { int64_t interval = rtc::TimeNanos() - start_time_; proc_time_->sum += interval; diff --git a/webrtc/modules/audio_processing/test/audio_processing_simulator.h b/webrtc/modules/audio_processing/test/audio_processing_simulator.h index 367e30f1f7..d1def43b35 100644 --- a/webrtc/modules/audio_processing/test/audio_processing_simulator.h +++ b/webrtc/modules/audio_processing/test/audio_processing_simulator.h @@ -28,6 +28,9 @@ namespace test { // Holds all the parameters available for controlling the simulation. struct SimulationSettings { + SimulationSettings(); + SimulationSettings(const SimulationSettings&); + ~SimulationSettings(); rtc::Optional stream_delay; rtc::Optional stream_drift_samples; rtc::Optional output_sample_rate_hz; @@ -92,9 +95,8 @@ class AudioProcessingSimulator { public: static const int kChunksPerSecond = 1000 / AudioProcessing::kChunkSizeMs; - explicit AudioProcessingSimulator(const SimulationSettings& settings) - : settings_(settings) {} - virtual ~AudioProcessingSimulator() {} + explicit AudioProcessingSimulator(const SimulationSettings& settings); + virtual ~AudioProcessingSimulator(); // Processes the data in the input. virtual void Process() = 0; diff --git a/webrtc/modules/audio_processing/test/wav_based_simulator.cc b/webrtc/modules/audio_processing/test/wav_based_simulator.cc index 3fbca92434..673b274f72 100644 --- a/webrtc/modules/audio_processing/test/wav_based_simulator.cc +++ b/webrtc/modules/audio_processing/test/wav_based_simulator.cc @@ -16,6 +16,11 @@ namespace webrtc { namespace test { +WavBasedSimulator::WavBasedSimulator(const SimulationSettings& settings) + : AudioProcessingSimulator(settings) {} + +WavBasedSimulator::~WavBasedSimulator() = default; + std::vector WavBasedSimulator::GetDefaultEventChain() const { std::vector call_chain(2); diff --git a/webrtc/modules/audio_processing/test/wav_based_simulator.h b/webrtc/modules/audio_processing/test/wav_based_simulator.h index aeb9331221..5bf93d16d1 100644 --- a/webrtc/modules/audio_processing/test/wav_based_simulator.h +++ b/webrtc/modules/audio_processing/test/wav_based_simulator.h @@ -23,9 +23,8 @@ namespace test { // Used to perform an audio processing simulation from wav files. class WavBasedSimulator final : public AudioProcessingSimulator { public: - explicit WavBasedSimulator(const SimulationSettings& settings) - : AudioProcessingSimulator(settings) {} - virtual ~WavBasedSimulator() {} + explicit WavBasedSimulator(const SimulationSettings& settings); + ~WavBasedSimulator() override; // Processes the WAV input. void Process() override;