diff --git a/api/test/pclf/BUILD.gn b/api/test/pclf/BUILD.gn index f3d78370ed..f94150f36b 100644 --- a/api/test/pclf/BUILD.gn +++ b/api/test/pclf/BUILD.gn @@ -99,18 +99,28 @@ rtc_library("peer_configurer") { "../../../api:callfactory_api", "../../../api:create_peer_connection_quality_test_frame_generator", "../../../api:fec_controller_api", - "../../../api:packet_socket_factory", + "../../../api:field_trials_view", + "../../../api:frame_generator_api", + "../../../api:ice_transport_interface", + "../../../api:libjingle_peerconnection_api", "../../../api:peer_network_dependencies", + "../../../api:scoped_refptr", "../../../api/audio:audio_mixer_api", + "../../../api/audio_codecs:audio_codecs_api", + "../../../api/neteq:neteq_api", "../../../api/rtc_event_log", "../../../api/task_queue", + "../../../api/transport:bitrate_settings", "../../../api/transport:network_control", "../../../api/video_codecs:video_codecs_api", "../../../modules/audio_processing:api", - "../../../rtc_base:network", + "../../../rtc_base:checks", "../../../rtc_base:rtc_certificate_generator", "../../../rtc_base:ssl", - "../../../rtc_base:threading", ] - absl_deps = [ "//third_party/abseil-cpp/absl/strings" ] + absl_deps = [ + "//third_party/abseil-cpp/absl/strings", + "//third_party/abseil-cpp/absl/types:optional", + "//third_party/abseil-cpp/absl/types:variant", + ] } diff --git a/api/test/pclf/peer_configurer.cc b/api/test/pclf/peer_configurer.cc index b614940c99..949dbd347c 100644 --- a/api/test/pclf/peer_configurer.cc +++ b/api/test/pclf/peer_configurer.cc @@ -10,12 +10,40 @@ #include "api/test/pclf/peer_configurer.h" -#include +#include +#include +#include +#include +#include #include "absl/strings/string_view.h" +#include "absl/types/optional.h" +#include "api/async_dns_resolver.h" +#include "api/audio/audio_mixer.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "api/audio_codecs/audio_encoder_factory.h" +#include "api/call/call_factory_interface.h" +#include "api/fec_controller.h" +#include "api/field_trials_view.h" +#include "api/ice_transport_interface.h" +#include "api/neteq/neteq_factory.h" +#include "api/peer_connection_interface.h" +#include "api/rtc_event_log/rtc_event_log_factory_interface.h" +#include "api/scoped_refptr.h" +#include "api/task_queue/task_queue_factory.h" +#include "api/test/create_peer_connection_quality_test_frame_generator.h" +#include "api/test/frame_generator_interface.h" #include "api/test/pclf/media_configuration.h" #include "api/test/pclf/media_quality_test_params.h" #include "api/test/peer_network_dependencies.h" +#include "api/transport/bitrate_settings.h" +#include "api/transport/network_control.h" +#include "api/video_codecs/video_decoder_factory.h" +#include "api/video_codecs/video_encoder_factory.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/checks.h" +#include "rtc_base/rtc_certificate_generator.h" +#include "rtc_base/ssl_certificate.h" namespace webrtc { namespace webrtc_pc_e2e { @@ -212,6 +240,12 @@ PeerConfigurer* PeerConfigurer::SetIceTransportFactory( return this; } +PeerConfigurer* PeerConfigurer::SetFieldTrials( + std::unique_ptr field_trials) { + components_->pcf_dependencies->trials = std::move(field_trials); + return this; +} + PeerConfigurer* PeerConfigurer::SetPortAllocatorExtraFlags( uint32_t extra_flags) { params_->port_allocator_extra_flags = extra_flags; diff --git a/api/test/pclf/peer_configurer.h b/api/test/pclf/peer_configurer.h index d10b53fa3d..2012ebc28c 100644 --- a/api/test/pclf/peer_configurer.h +++ b/api/test/pclf/peer_configurer.h @@ -10,30 +10,37 @@ #ifndef API_TEST_PCLF_PEER_CONFIGURER_H_ #define API_TEST_PCLF_PEER_CONFIGURER_H_ +#include #include #include -#include #include #include "absl/strings/string_view.h" +#include "absl/types/variant.h" #include "api/async_dns_resolver.h" #include "api/audio/audio_mixer.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "api/audio_codecs/audio_encoder_factory.h" #include "api/call/call_factory_interface.h" #include "api/fec_controller.h" +#include "api/field_trials_view.h" +#include "api/ice_transport_interface.h" +#include "api/neteq/neteq_factory.h" +#include "api/peer_connection_interface.h" #include "api/rtc_event_log/rtc_event_log_factory_interface.h" +#include "api/scoped_refptr.h" #include "api/task_queue/task_queue_factory.h" -#include "api/test/create_peer_connection_quality_test_frame_generator.h" +#include "api/test/frame_generator_interface.h" #include "api/test/pclf/media_configuration.h" #include "api/test/pclf/media_quality_test_params.h" #include "api/test/peer_network_dependencies.h" +#include "api/transport/bitrate_settings.h" #include "api/transport/network_control.h" #include "api/video_codecs/video_decoder_factory.h" #include "api/video_codecs/video_encoder_factory.h" #include "modules/audio_processing/include/audio_processing.h" -#include "rtc_base/network.h" #include "rtc_base/rtc_certificate_generator.h" #include "rtc_base/ssl_certificate.h" -#include "rtc_base/thread.h" namespace webrtc { namespace webrtc_pc_e2e { @@ -90,7 +97,7 @@ class PeerConfigurer { // peer. PeerConfigurer* SetAsyncDnsResolverFactory( std::unique_ptr - async_resolver_factory); + async_dns_resolver_factory); PeerConfigurer* SetRTCCertificateGenerator( std::unique_ptr cert_generator); PeerConfigurer* SetSSLCertificateVerifier( @@ -164,6 +171,8 @@ class PeerConfigurer { // Set bitrate parameters on PeerConnection. This constraints will be // applied to all summed RTP streams for this peer. PeerConfigurer* SetBitrateSettings(BitrateSettings bitrate_settings); + // Set field trials used for this PeerConnection. + PeerConfigurer* SetFieldTrials(std::unique_ptr field_trials); // Returns InjectableComponents and transfer ownership to the caller. // Can be called once.