Move default_neteq_factory to api/neteq and make it publicly visible

Bug: webrtc:14867
Change-Id: I30eefba754a3aae28ffa761f706f5655a2de657d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/363860
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43092}

api/neteq/BUILD.gn

@@ -28,6 +28,22 @@ rtc_source_set("neteq_api") {
   ]
 }
 
+rtc_source_set("default_neteq_factory") {
+  visibility = [ "*" ]
+  sources = [
+    "default_neteq_factory.cc",
+    "default_neteq_factory.h",
+  ]
+  deps = [
+    ":default_neteq_controller_factory",
+    ":neteq_api",
+    "..:scoped_refptr",
+    "../../modules/audio_coding:neteq",
+    "../audio_codecs:audio_codecs_api",
+    "../environment",
+  ]
+}
+
 rtc_source_set("custom_neteq_factory") {
   visibility = [ "*" ]
   sources = [

api/neteq/default_neteq_factory.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
+#include "api/neteq/default_neteq_factory.h"
 
 #include <utility>
 

api/neteq/default_neteq_factory.h

@@ -0,0 +1,41 @@
+/*
+ *  Copyright (c) 2019 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.
+ */
+
+#ifndef API_NETEQ_DEFAULT_NETEQ_FACTORY_H_
+#define API_NETEQ_DEFAULT_NETEQ_FACTORY_H_
+
+#include <memory>
+
+#include "api/audio_codecs/audio_decoder_factory.h"
+#include "api/environment/environment.h"
+#include "api/neteq/default_neteq_controller_factory.h"
+#include "api/neteq/neteq_factory.h"
+#include "api/scoped_refptr.h"
+
+namespace webrtc {
+
+class DefaultNetEqFactory : public NetEqFactory {
+ public:
+  DefaultNetEqFactory();
+  ~DefaultNetEqFactory() override;
+  DefaultNetEqFactory(const DefaultNetEqFactory&) = delete;
+  DefaultNetEqFactory& operator=(const DefaultNetEqFactory&) = delete;
+
+  std::unique_ptr<NetEq> Create(
+      const Environment& env,
+      const NetEq::Config& config,
+      scoped_refptr<AudioDecoderFactory> decoder_factory) const override;
+
+ private:
+  const DefaultNetEqControllerFactory controller_factory_;
+};
+
+}  // namespace webrtc
+#endif  // API_NETEQ_DEFAULT_NETEQ_FACTORY_H_

audio/BUILD.gn

@@ -59,6 +59,7 @@ rtc_library("audio") {
     "../api/crypto:frame_encryptor_interface",
     "../api/crypto:options",
     "../api/environment",
+    "../api/neteq:default_neteq_factory",
     "../api/neteq:neteq_api",
     "../api/rtc_event_log",
     "../api/task_queue",
@@ -81,7 +82,6 @@ rtc_library("audio") {
     "../modules/audio_coding:audio_coding_module_typedefs",
     "../modules/audio_coding:audio_encoder_cng",
     "../modules/audio_coding:audio_network_adaptor_config",
-    "../modules/audio_coding:default_neteq_factory",
     "../modules/audio_coding:red",
     "../modules/audio_device",
     "../modules/audio_processing",

audio/channel_receive.cc

@@ -20,6 +20,7 @@
 #include "api/audio/audio_device.h"
 #include "api/crypto/frame_decryptor_interface.h"
 #include "api/frame_transformer_interface.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "api/neteq/neteq.h"
 #include "api/rtc_event_log/rtc_event_log.h"
 #include "api/sequence_checker.h"
@@ -36,7 +37,6 @@
 #include "modules/audio_coding/acm2/acm_resampler.h"
 #include "modules/audio_coding/acm2/call_statistics.h"
 #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "modules/pacing/packet_router.h"
 #include "modules/rtp_rtcp/include/receive_statistics.h"
 #include "modules/rtp_rtcp/include/remote_ntp_time_estimator.h"

audio/voip/BUILD.gn

@@ -64,10 +64,10 @@ rtc_library("audio_ingress") {
     "../../api/audio:audio_mixer_api",
     "../../api/audio_codecs:audio_codecs_api",
     "../../api/environment",
+    "../../api/neteq:default_neteq_factory",
     "../../api/neteq:neteq_api",
     "../../api/voip:voip_api",
     "../../modules/audio_coding",
-    "../../modules/audio_coding:default_neteq_factory",
     "../../modules/rtp_rtcp",
     "../../modules/rtp_rtcp:rtp_rtcp_format",
     "../../rtc_base:criticalsection",

audio/voip/audio_ingress.cc

@@ -16,9 +16,9 @@
 #include <vector>
 
 #include "api/audio_codecs/audio_format.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "audio/utility/audio_frame_operations.h"
 #include "modules/audio_coding/include/audio_coding_module.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/common_header.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"

modules/audio_coding/BUILD.gn

@@ -38,7 +38,6 @@ rtc_library("audio_coding") {
 
   deps = [
     ":audio_coding_module_typedefs",
-    ":default_neteq_factory",
     ":neteq",
     "..:module_api",
     "..:module_api_public",
@@ -47,6 +46,7 @@ rtc_library("audio_coding") {
     "../../api/audio:audio_frame_api",
     "../../api/audio_codecs:audio_codecs_api",
     "../../api/environment",
+    "../../api/neteq:default_neteq_factory",
     "../../api/neteq:neteq_api",
     "../../api/units:timestamp",
     "../../common_audio",
@@ -733,18 +733,8 @@ rtc_library("neteq") {
 
 rtc_source_set("default_neteq_factory") {
   visibility += webrtc_default_visibility
-  sources = [
+  sources = [ "neteq/default_neteq_factory.h" ]
-    "neteq/default_neteq_factory.cc",
+  deps = [ "../../api/neteq:default_neteq_factory" ]
-    "neteq/default_neteq_factory.h",
-  ]
-  deps = [
-    ":neteq",
-    "../../api:scoped_refptr",
-    "../../api/audio_codecs:audio_codecs_api",
-    "../../api/environment",
-    "../../api/neteq:default_neteq_controller_factory",
-    "../../api/neteq:neteq_api",
-  ]
 }
 
 # Although providing only test support, this target must be outside of the
@@ -769,7 +759,6 @@ rtc_library("neteq_tools_minimal") {
   ]
 
   deps = [
-    ":default_neteq_factory",
     ":neteq",
     "../../api:array_view",
     "../../api:field_trials",
@@ -781,6 +770,7 @@ rtc_library("neteq_tools_minimal") {
     "../../api/environment:environment_factory",
     "../../api/neteq:custom_neteq_factory",
     "../../api/neteq:default_neteq_controller_factory",
+    "../../api/neteq:default_neteq_factory",
     "../../api/neteq:neteq_api",
     "../../api/units:timestamp",
     "../../rtc_base:buffer",
@@ -925,7 +915,6 @@ rtc_library("audio_coding_modules_tests_shared") {
   deps = [
     ":audio_coding",
     ":audio_coding_module_typedefs",
-    ":default_neteq_factory",
     ":neteq_test_tools",
     ":neteq_tools_minimal",
     ":webrtc_opus_wrapper",
@@ -936,6 +925,7 @@ rtc_library("audio_coding_modules_tests_shared") {
     "../../api/audio_codecs:builtin_audio_encoder_factory",
     "../../api/environment",
     "../../api/environment:environment_factory",
+    "../../api/neteq:default_neteq_factory",
     "../../api/neteq:neteq_api",
     "../../api/units:timestamp",
     "../../rtc_base:checks",
@@ -1068,10 +1058,10 @@ if (rtc_include_tests) {
       "../../api/audio_codecs/opus:audio_encoder_opus",
       "../../api/environment",
       "../../api/environment:environment_factory",
+      "../../api/neteq:default_neteq_factory",
       "../../api/neteq:neteq_api",
       "../../api/units:timestamp",
       "../../common_audio",
-      "../../modules/audio_coding:default_neteq_factory",
       "../../rtc_base:checks",
       "../../rtc_base:logging",
       "../../rtc_base:macromagic",
@@ -1129,8 +1119,8 @@ if (rtc_include_tests) {
       "../../api/audio_codecs:audio_codecs_api",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
       "../../api/environment:environment_factory",
+      "../../api/neteq:default_neteq_factory",
       "../../api/neteq:neteq_api",
-      "../../modules/audio_coding:default_neteq_factory",
       "../../test:test_support",
       "//testing/gtest",
     ]
@@ -1334,7 +1324,6 @@ if (rtc_include_tests) {
     ]
 
     deps = [
-      ":default_neteq_factory",
       ":neteq",
       ":neteq_test_tools",
       ":pcm16b",
@@ -1343,6 +1332,7 @@ if (rtc_include_tests) {
       "../../api/audio_codecs:builtin_audio_decoder_factory",
       "../../api/environment",
       "../../api/environment:environment_factory",
+      "../../api/neteq:default_neteq_factory",
       "../../api/neteq:neteq_api",
       "../../rtc_base:checks",
       "../../system_wrappers",
@@ -1361,13 +1351,13 @@ if (rtc_include_tests) {
       ]
 
       deps = [
-        ":default_neteq_factory",
         ":neteq",
         ":neteq_input_audio_tools",
         ":neteq_test_tools",
         ":neteq_tools_minimal",
         "../../api/audio_codecs:builtin_audio_decoder_factory",
         "../../api/environment:environment_factory",
+        "../../api/neteq:default_neteq_factory",
         "../../api/neteq:neteq_api",
         "../../api/units:timestamp",
         "../../rtc_base:checks",
@@ -1669,7 +1659,6 @@ if (rtc_include_tests) {
         ":audio_coding_opus_common",
         ":audio_encoder_cng",
         ":audio_network_adaptor",
-        ":default_neteq_factory",
         ":g711",
         ":ilbc",
         ":legacy_encoded_audio_frame",
@@ -1698,6 +1687,7 @@ if (rtc_include_tests) {
         "../../api/environment",
         "../../api/environment:environment_factory",
         "../../api/neteq:default_neteq_controller_factory",
+        "../../api/neteq:default_neteq_factory",
         "../../api/neteq:neteq_api",
         "../../api/neteq:neteq_controller_api",
         "../../api/neteq:tick_timer",

modules/audio_coding/acm2/acm_receive_test.cc

@@ -16,8 +16,8 @@
 
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/environment/environment_factory.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "modules/audio_coding/include/audio_coding_module.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "modules/audio_coding/neteq/tools/audio_sink.h"
 #include "modules/audio_coding/neteq/tools/packet.h"
 #include "modules/audio_coding/neteq/tools/packet_source.h"

modules/audio_coding/acm2/acm_receiver.cc

@@ -19,11 +19,11 @@
 #include "absl/strings/match.h"
 #include "api/audio/audio_frame.h"
 #include "api/audio_codecs/audio_decoder.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "api/neteq/neteq.h"
 #include "api/units/timestamp.h"
 #include "modules/audio_coding/acm2/acm_resampler.h"
 #include "modules/audio_coding/acm2/call_statistics.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"

modules/audio_coding/acm2/audio_coding_module_unittest.cc

@@ -27,6 +27,7 @@
 #include "api/audio_codecs/opus/audio_encoder_opus.h"
 #include "api/environment/environment.h"
 #include "api/environment/environment_factory.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "api/units/timestamp.h"
 #include "modules/audio_coding/acm2/acm_receive_test.h"
 #include "modules/audio_coding/acm2/acm_send_test.h"
@@ -34,7 +35,6 @@
 #include "modules/audio_coding/codecs/g711/audio_decoder_pcm.h"
 #include "modules/audio_coding/codecs/g711/audio_encoder_pcm.h"
 #include "modules/audio_coding/include/audio_coding_module_typedefs.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "modules/audio_coding/neteq/tools/audio_checksum.h"
 #include "modules/audio_coding/neteq/tools/audio_loop.h"
 #include "modules/audio_coding/neteq/tools/constant_pcm_packet_source.h"

modules/audio_coding/neteq/default_neteq_factory.h

@@ -11,31 +11,6 @@
 #ifndef MODULES_AUDIO_CODING_NETEQ_DEFAULT_NETEQ_FACTORY_H_
 #define MODULES_AUDIO_CODING_NETEQ_DEFAULT_NETEQ_FACTORY_H_
 
-#include <memory>
+#include "api/neteq/default_neteq_factory.h"
 
-#include "api/audio_codecs/audio_decoder_factory.h"
-#include "api/environment/environment.h"
-#include "api/neteq/default_neteq_controller_factory.h"
-#include "api/neteq/neteq_factory.h"
-#include "api/scoped_refptr.h"
-
-namespace webrtc {
-
-class DefaultNetEqFactory : public NetEqFactory {
- public:
-  DefaultNetEqFactory();
-  ~DefaultNetEqFactory() override;
-  DefaultNetEqFactory(const DefaultNetEqFactory&) = delete;
-  DefaultNetEqFactory& operator=(const DefaultNetEqFactory&) = delete;
-
-  std::unique_ptr<NetEq> Create(
-      const Environment& env,
-      const NetEq::Config& config,
-      scoped_refptr<AudioDecoderFactory> decoder_factory) const override;
-
- private:
-  const DefaultNetEqControllerFactory controller_factory_;
-};
-
-}  // namespace webrtc
 #endif  // MODULES_AUDIO_CODING_NETEQ_DEFAULT_NETEQ_FACTORY_H_

modules/audio_coding/neteq/neteq_impl_unittest.cc

@@ -17,12 +17,12 @@
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/environment/environment_factory.h"
 #include "api/neteq/default_neteq_controller_factory.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "api/neteq/neteq.h"
 #include "api/neteq/neteq_controller.h"
 #include "modules/audio_coding/codecs/g711/audio_decoder_pcm.h"
 #include "modules/audio_coding/neteq/accelerate.h"
 #include "modules/audio_coding/neteq/decision_logic.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "modules/audio_coding/neteq/expand.h"
 #include "modules/audio_coding/neteq/histogram.h"
 #include "modules/audio_coding/neteq/mock/mock_decoder_database.h"

modules/audio_coding/neteq/neteq_network_stats_unittest.cc

@@ -15,8 +15,8 @@
 #include "api/audio_codecs/audio_decoder.h"
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/environment/environment_factory.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "api/neteq/neteq.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "modules/audio_coding/neteq/tools/rtp_generator.h"
 #include "test/audio_decoder_proxy_factory.h"
 #include "test/gmock.h"

modules/audio_coding/neteq/neteq_stereo_unittest.cc

@@ -19,10 +19,10 @@
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/environment/environment.h"
 #include "api/environment/environment_factory.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "api/neteq/neteq.h"
 #include "api/units/timestamp.h"
 #include "modules/audio_coding/codecs/pcm16b/pcm16b.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "modules/audio_coding/neteq/tools/input_audio_file.h"
 #include "modules/audio_coding/neteq/tools/rtp_generator.h"
 #include "rtc_base/strings/string_builder.h"

modules/audio_coding/neteq/test/neteq_decoding_test.cc

@@ -13,9 +13,9 @@
 #include "absl/strings/string_view.h"
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/environment/environment_factory.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "api/rtp_headers.h"
 #include "api/units/timestamp.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "modules/audio_coding/neteq/test/result_sink.h"
 #include "rtc_base/strings/string_builder.h"
 #include "test/testsupport/file_utils.h"

modules/audio_coding/neteq/tools/neteq_performance_test.cc

@@ -14,9 +14,9 @@
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/environment/environment.h"
 #include "api/environment/environment_factory.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "api/neteq/neteq.h"
 #include "modules/audio_coding/codecs/pcm16b/pcm16b.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "modules/audio_coding/neteq/tools/audio_loop.h"
 #include "modules/audio_coding/neteq/tools/rtp_generator.h"
 #include "rtc_base/checks.h"

modules/audio_coding/neteq/tools/neteq_quality_test.cc

@@ -17,8 +17,8 @@
 #include "absl/flags/flag.h"
 #include "absl/strings/string_view.h"
 #include "api/environment/environment_factory.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "api/units/timestamp.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "modules/audio_coding/neteq/tools/neteq_quality_test.h"
 #include "modules/audio_coding/neteq/tools/output_audio_file.h"
 #include "modules/audio_coding/neteq/tools/output_wav_file.h"

modules/audio_coding/neteq/tools/neteq_test.cc

@@ -16,8 +16,8 @@
 #include "api/environment/environment.h"
 #include "api/environment/environment_factory.h"
 #include "api/field_trials.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "api/units/timestamp.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "system_wrappers/include/clock.h"
 

modules/audio_coding/test/EncodeDecodeTest.cc

@@ -20,8 +20,8 @@
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "api/environment/environment.h"
 #include "api/environment/environment_factory.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "modules/audio_coding/include/audio_coding_module.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "rtc_base/strings/string_builder.h"
 #include "test/gtest.h"
 #include "test/testsupport/file_utils.h"

modules/audio_coding/test/PacketLossTest.cc

@@ -16,8 +16,8 @@
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/environment/environment.h"
 #include "api/environment/environment_factory.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "api/units/timestamp.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "rtc_base/strings/string_builder.h"
 #include "test/gtest.h"
 #include "test/testsupport/file_utils.h"

modules/audio_coding/test/TestAllCodecs.cc

@@ -18,10 +18,10 @@
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "api/environment/environment_factory.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "api/neteq/neteq.h"
 #include "modules/audio_coding/acm2/acm_resampler.h"
 #include "modules/audio_coding/include/audio_coding_module_typedefs.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "modules/include/module_common_types.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/string_encode.h"

modules/audio_coding/test/TestRedFec.cc

@@ -25,10 +25,10 @@
 #include "api/audio_codecs/opus/audio_decoder_opus.h"
 #include "api/audio_codecs/opus/audio_encoder_opus.h"
 #include "api/environment/environment_factory.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "modules/audio_coding/codecs/cng/audio_encoder_cng.h"
 #include "modules/audio_coding/codecs/red/audio_encoder_copy_red.h"
 #include "modules/audio_coding/include/audio_coding_module_typedefs.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "rtc_base/strings/string_builder.h"
 #include "test/gtest.h"
 #include "test/testsupport/file_utils.h"

modules/audio_coding/test/TestStereo.cc

@@ -16,8 +16,8 @@
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "api/environment/environment_factory.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "modules/audio_coding/include/audio_coding_module_typedefs.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "modules/include/module_common_types.h"
 #include "rtc_base/strings/string_builder.h"
 #include "test/gtest.h"

modules/audio_coding/test/TestVADDTX.cc

@@ -21,8 +21,8 @@
 #include "api/audio_codecs/opus/audio_decoder_opus.h"
 #include "api/audio_codecs/opus/audio_encoder_opus.h"
 #include "api/environment/environment_factory.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "modules/audio_coding/codecs/cng/audio_encoder_cng.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "modules/audio_coding/test/PCMFile.h"
 #include "rtc_base/strings/string_builder.h"
 #include "test/gtest.h"

modules/audio_coding/test/opus_test.cc

@@ -14,9 +14,9 @@
 
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/environment/environment_factory.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "modules/audio_coding/codecs/opus/opus_interface.h"
 #include "modules/audio_coding/include/audio_coding_module_typedefs.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "modules/audio_coding/test/TestStereo.h"
 #include "test/gtest.h"
 #include "test/testsupport/file_utils.h"

modules/audio_coding/test/target_delay_unittest.cc

@@ -13,11 +13,11 @@
 #include "api/audio/audio_frame.h"
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/environment/environment_factory.h"
+#include "api/neteq/default_neteq_factory.h"
 #include "api/rtp_headers.h"
 #include "api/units/timestamp.h"
 #include "modules/audio_coding/codecs/pcm16b/pcm16b.h"
 #include "modules/audio_coding/include/audio_coding_module.h"
-#include "modules/audio_coding/neteq/default_neteq_factory.h"
 #include "test/gtest.h"
 #include "test/testsupport/file_utils.h"