diff --git a/api/neteq/BUILD.gn b/api/neteq/BUILD.gn index cdc44fc912..9e79a877fd 100644 --- a/api/neteq/BUILD.gn +++ b/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 = [ diff --git a/modules/audio_coding/neteq/default_neteq_factory.cc b/api/neteq/default_neteq_factory.cc similarity index 94% rename from modules/audio_coding/neteq/default_neteq_factory.cc rename to api/neteq/default_neteq_factory.cc index 6c04a8a127..90e4c14aa4 100644 --- a/modules/audio_coding/neteq/default_neteq_factory.cc +++ b/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 diff --git a/api/neteq/default_neteq_factory.h b/api/neteq/default_neteq_factory.h new file mode 100644 index 0000000000..91e14b137f --- /dev/null +++ b/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 + +#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 Create( + const Environment& env, + const NetEq::Config& config, + scoped_refptr decoder_factory) const override; + + private: + const DefaultNetEqControllerFactory controller_factory_; +}; + +} // namespace webrtc +#endif // API_NETEQ_DEFAULT_NETEQ_FACTORY_H_ diff --git a/audio/BUILD.gn b/audio/BUILD.gn index 2580c48d56..9f3889a34b 100644 --- a/audio/BUILD.gn +++ b/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", diff --git a/audio/channel_receive.cc b/audio/channel_receive.cc index c40244010d..37bafaf94e 100644 --- a/audio/channel_receive.cc +++ b/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" diff --git a/audio/voip/BUILD.gn b/audio/voip/BUILD.gn index 2ae743a460..3754bbd266 100644 --- a/audio/voip/BUILD.gn +++ b/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", diff --git a/audio/voip/audio_ingress.cc b/audio/voip/audio_ingress.cc index 82b4012ae2..62dd4cba80 100644 --- a/audio/voip/audio_ingress.cc +++ b/audio/voip/audio_ingress.cc @@ -16,9 +16,9 @@ #include #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" diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn index 24cc3f9808..8a882debaf 100644 --- a/modules/audio_coding/BUILD.gn +++ b/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 = [ - "neteq/default_neteq_factory.cc", - "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", - ] + sources = [ "neteq/default_neteq_factory.h" ] + deps = [ "../../api/neteq:default_neteq_factory" ] } # 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", diff --git a/modules/audio_coding/acm2/acm_receive_test.cc b/modules/audio_coding/acm2/acm_receive_test.cc index e23dfc7fdf..5cc62f2de2 100644 --- a/modules/audio_coding/acm2/acm_receive_test.cc +++ b/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" diff --git a/modules/audio_coding/acm2/acm_receiver.cc b/modules/audio_coding/acm2/acm_receiver.cc index bf968f3bca..674ed868c9 100644 --- a/modules/audio_coding/acm2/acm_receiver.cc +++ b/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" diff --git a/modules/audio_coding/acm2/audio_coding_module_unittest.cc b/modules/audio_coding/acm2/audio_coding_module_unittest.cc index 62c3c3959f..aa7dbb532c 100644 --- a/modules/audio_coding/acm2/audio_coding_module_unittest.cc +++ b/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" diff --git a/modules/audio_coding/neteq/default_neteq_factory.h b/modules/audio_coding/neteq/default_neteq_factory.h index a0c44d1d9d..103361dab1 100644 --- a/modules/audio_coding/neteq/default_neteq_factory.h +++ b/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 +#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 Create( - const Environment& env, - const NetEq::Config& config, - scoped_refptr decoder_factory) const override; - - private: - const DefaultNetEqControllerFactory controller_factory_; -}; - -} // namespace webrtc #endif // MODULES_AUDIO_CODING_NETEQ_DEFAULT_NETEQ_FACTORY_H_ diff --git a/modules/audio_coding/neteq/neteq_impl_unittest.cc b/modules/audio_coding/neteq/neteq_impl_unittest.cc index 740d969007..021d122a40 100644 --- a/modules/audio_coding/neteq/neteq_impl_unittest.cc +++ b/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" diff --git a/modules/audio_coding/neteq/neteq_network_stats_unittest.cc b/modules/audio_coding/neteq/neteq_network_stats_unittest.cc index a145bbbe03..b2e1338102 100644 --- a/modules/audio_coding/neteq/neteq_network_stats_unittest.cc +++ b/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" diff --git a/modules/audio_coding/neteq/neteq_stereo_unittest.cc b/modules/audio_coding/neteq/neteq_stereo_unittest.cc index 9a00beffab..a7c9d99c6f 100644 --- a/modules/audio_coding/neteq/neteq_stereo_unittest.cc +++ b/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" diff --git a/modules/audio_coding/neteq/test/neteq_decoding_test.cc b/modules/audio_coding/neteq/test/neteq_decoding_test.cc index a817276016..56d2895c7e 100644 --- a/modules/audio_coding/neteq/test/neteq_decoding_test.cc +++ b/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" diff --git a/modules/audio_coding/neteq/tools/neteq_performance_test.cc b/modules/audio_coding/neteq/tools/neteq_performance_test.cc index a263aa6606..c3205ded1c 100644 --- a/modules/audio_coding/neteq/tools/neteq_performance_test.cc +++ b/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" diff --git a/modules/audio_coding/neteq/tools/neteq_quality_test.cc b/modules/audio_coding/neteq/tools/neteq_quality_test.cc index 22ee1c17cf..341d1f9e78 100644 --- a/modules/audio_coding/neteq/tools/neteq_quality_test.cc +++ b/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" diff --git a/modules/audio_coding/neteq/tools/neteq_test.cc b/modules/audio_coding/neteq/tools/neteq_test.cc index 76ab5449b3..7c496b4699 100644 --- a/modules/audio_coding/neteq/tools/neteq_test.cc +++ b/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" diff --git a/modules/audio_coding/test/EncodeDecodeTest.cc b/modules/audio_coding/test/EncodeDecodeTest.cc index 665d0d93f7..048029e665 100644 --- a/modules/audio_coding/test/EncodeDecodeTest.cc +++ b/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" diff --git a/modules/audio_coding/test/PacketLossTest.cc b/modules/audio_coding/test/PacketLossTest.cc index 24bca73a71..de29ce5f01 100644 --- a/modules/audio_coding/test/PacketLossTest.cc +++ b/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" diff --git a/modules/audio_coding/test/TestAllCodecs.cc b/modules/audio_coding/test/TestAllCodecs.cc index 1a9887be6d..ca5cdf9257 100644 --- a/modules/audio_coding/test/TestAllCodecs.cc +++ b/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" diff --git a/modules/audio_coding/test/TestRedFec.cc b/modules/audio_coding/test/TestRedFec.cc index c1d28e85b3..9a5b543a0f 100644 --- a/modules/audio_coding/test/TestRedFec.cc +++ b/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" diff --git a/modules/audio_coding/test/TestStereo.cc b/modules/audio_coding/test/TestStereo.cc index 4561d4c91b..3308cb0430 100644 --- a/modules/audio_coding/test/TestStereo.cc +++ b/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" diff --git a/modules/audio_coding/test/TestVADDTX.cc b/modules/audio_coding/test/TestVADDTX.cc index ce3247ccb7..9d3d72ca65 100644 --- a/modules/audio_coding/test/TestVADDTX.cc +++ b/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" diff --git a/modules/audio_coding/test/opus_test.cc b/modules/audio_coding/test/opus_test.cc index 637730455a..0438514e7d 100644 --- a/modules/audio_coding/test/opus_test.cc +++ b/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" diff --git a/modules/audio_coding/test/target_delay_unittest.cc b/modules/audio_coding/test/target_delay_unittest.cc index 3d62aabd40..5b7091b880 100644 --- a/modules/audio_coding/test/target_delay_unittest.cc +++ b/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"