commit 4842c78e9306f00d9ef081f6a0070ec227603d09
author Alex Loiko <aleloi@webrtc.org> Tue Oct 23 11:43:28 2018
committer Commit Bot <commit-bot@chromium.org> Tue Oct 23 15:11:02 2018
tree bf3ba892779cf9b0294a3d21c2ebfb5e7a254e40
parent c6de47ec8c9fba49e94646390a5d6e52c2d47164

Increasing APM fuzzer coverage.

Add AecDump to the list of fuzzed stuff. Attaches an AecDump to the
Audio Processing Module in the APM-fuzzer. The AecDump writes to
/dev/null.

Bug: webrtc:7820
Change-Id: I03916ce4d1c69906ca8bb7e6fbe29c11e4ea55e5
Reviewed-on: https://webrtc-review.googlesource.com/c/107622
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Commit-Queue: Alex Loiko <aleloi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25321}

test/fuzzers/BUILD.gn

diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index 57b8bf9..dc1acc7 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -502,9 +502,11 @@
     "../../api/audio:aec3_factory",
     "../../modules/audio_processing",
     "../../modules/audio_processing/aec3",
-    "../../modules/audio_processing/aec_dump:mock_aec_dump",
+    "../../modules/audio_processing/aec_dump",
+    "../../modules/audio_processing/aec_dump:aec_dump_impl",
     "../../rtc_base:ptr_util",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:rtc_task_queue",
     "../../rtc_base:safe_minmax",
     "../../system_wrappers:field_trial",
     "//third_party/abseil-cpp/absl/memory",

test/fuzzers/audio_processing_configs_fuzzer.cc

diff --git a/test/fuzzers/audio_processing_configs_fuzzer.cc b/test/fuzzers/audio_processing_configs_fuzzer.cc
index 053e4c0..5b00209 100644
--- a/test/fuzzers/audio_processing_configs_fuzzer.cc
+++ b/test/fuzzers/audio_processing_configs_fuzzer.cc
@@ -13,10 +13,11 @@
 
 #include "absl/memory/memory.h"
 #include "api/audio/echo_canceller3_factory.h"
-#include "modules/audio_processing/aec_dump/mock_aec_dump.h"
+#include "modules/audio_processing/aec_dump/aec_dump_factory.h"
 #include "modules/audio_processing/include/audio_processing.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/numerics/safe_minmax.h"
+#include "rtc_base/task_queue.h"
 #include "system_wrappers/include/field_trial.h"
 #include "test/fuzzers/audio_processing_fuzzer_helper.h"
 #include "test/fuzzers/fuzz_data_helper.h"
@@ -61,7 +62,8 @@
 };
 
 std::unique_ptr<AudioProcessing> CreateApm(test::FuzzDataHelper* fuzz_data,
-                                           std::string* field_trial_string) {
+                                           std::string* field_trial_string,
+                                           rtc::TaskQueue* worker_queue) {
   // Parse boolean values for optionally enabling different
   // configurable public components of APM.
   bool exp_agc = fuzz_data->ReadOrDefaultValue(true);
@@ -136,8 +138,9 @@
           .SetEchoControlFactory(std::move(echo_control_factory))
           .Create(config));
 
-  apm->AttachAecDump(
-      absl::make_unique<testing::NiceMock<webrtc::test::MockAecDump>>());
+#ifdef WEBRTC_LINUX
+  apm->AttachAecDump(AecDumpFactory::Create("/dev/null", -1, worker_queue));
+#endif
 
   webrtc::AudioProcessing::Config apm_config;
   apm_config.echo_canceller.enabled = use_aec || use_aecm;
@@ -165,7 +168,10 @@
   // This string must be in scope during execution, according to documentation
   // for field_trial.h. Hence it's created here and not in CreateApm.
   std::string field_trial_string = "";
-  auto apm = CreateApm(&fuzz_data, &field_trial_string);
+
+  std::unique_ptr<rtc::TaskQueue> worker_queue(
+      new rtc::TaskQueue("rtc-low-prio", rtc::TaskQueue::Priority::LOW));
+  auto apm = CreateApm(&fuzz_data, &field_trial_string, worker_queue.get());
 
   if (apm) {
     FuzzAudioProcessing(&fuzz_data, std::move(apm));