Move Params, InjectableComponents and classes around on the top level
Bug: webrtc:10138
Change-Id: I3ee489c5558f9acad30587dc774ed240e115640e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128608
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27210}diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn
index 0be2e4e..3c3a664 100644
--- a/test/pc/e2e/BUILD.gn
+++ b/test/pc/e2e/BUILD.gn
@@ -41,6 +41,25 @@
}
}
+rtc_source_set("peer_connection_quality_test_params") {
+ visibility = [ "*" ]
+ sources = [
+ "peer_connection_quality_test_params.h",
+ ]
+
+ deps = [
+ "../../../api:callfactory_api",
+ "../../../api:fec_controller_api",
+ "../../../api:libjingle_peerconnection_api",
+ "../../../api/transport:network_control",
+ "../../../api/video_codecs:video_codecs_api",
+ "../../../logging:rtc_event_log_api",
+ "../../../rtc_base:rtc_base",
+ "api:peer_connection_quality_test_fixture_api",
+ "//third_party/abseil-cpp/absl/memory:memory",
+ ]
+}
+
rtc_source_set("encoded_image_data_injector_api") {
visibility = [ "*" ]
sources = [
@@ -167,6 +186,7 @@
"test_peer.h",
]
deps = [
+ ":peer_connection_quality_test_params",
":video_quality_analyzer_injection_helper",
"../../../api:array_view",
"../../../api:scoped_refptr",
@@ -203,6 +223,7 @@
deps = [
":default_audio_quality_analyzer",
":default_video_quality_analyzer",
+ ":peer_connection_quality_test_params",
":single_process_encoded_image_data_injector",
":stats_poller",
":test_peer",
diff --git a/test/pc/e2e/api/peerconnection_quality_test_fixture.h b/test/pc/e2e/api/peerconnection_quality_test_fixture.h
index 8638151..6afaf09 100644
--- a/test/pc/e2e/api/peerconnection_quality_test_fixture.h
+++ b/test/pc/e2e/api/peerconnection_quality_test_fixture.h
@@ -41,69 +41,6 @@
// TODO(titovartem) move to API when it will be stabilized.
class PeerConnectionE2EQualityTestFixture {
public:
- // Contains most part from PeerConnectionFactoryDependencies. Also all fields
- // are optional and defaults will be provided by fixture implementation if
- // any will be omitted.
- //
- // Separate class was introduced to clarify which components can be
- // overridden. For example worker and signaling threads will be provided by
- // fixture implementation. The same is applicable to the media engine. So user
- // can override only some parts of media engine like video encoder/decoder
- // factories.
- struct PeerConnectionFactoryComponents {
- std::unique_ptr<CallFactoryInterface> call_factory;
- std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory;
- std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory;
- std::unique_ptr<NetworkControllerFactoryInterface>
- network_controller_factory;
- std::unique_ptr<MediaTransportFactory> media_transport_factory;
-
- // Will be passed to MediaEngineInterface, that will be used in
- // PeerConnectionFactory.
- std::unique_ptr<VideoEncoderFactory> video_encoder_factory;
- std::unique_ptr<VideoDecoderFactory> video_decoder_factory;
- };
-
- // Contains most parts from PeerConnectionDependencies. Also all fields are
- // optional and defaults will be provided by fixture implementation if any
- // will be omitted.
- //
- // Separate class was introduced to clarify which components can be
- // overridden. For example observer, which is required to
- // PeerConnectionDependencies, will be provided by fixture implementation,
- // so client can't inject its own. Also only network manager can be overridden
- // inside port allocator.
- struct PeerConnectionComponents {
- PeerConnectionComponents(rtc::NetworkManager* network_manager)
- : network_manager(network_manager) {
- RTC_CHECK(network_manager);
- }
-
- rtc::NetworkManager* const network_manager;
- std::unique_ptr<webrtc::AsyncResolverFactory> async_resolver_factory;
- std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator;
- std::unique_ptr<rtc::SSLCertificateVerifier> tls_cert_verifier;
- };
-
- // Contains all components, that can be overridden in peer connection. Also
- // has a network thread, that will be used to communicate with another peers.
- struct InjectableComponents {
- explicit InjectableComponents(rtc::Thread* network_thread,
- rtc::NetworkManager* network_manager)
- : network_thread(network_thread),
- pcf_dependencies(
- absl::make_unique<PeerConnectionFactoryComponents>()),
- pc_dependencies(
- absl::make_unique<PeerConnectionComponents>(network_manager)) {
- RTC_CHECK(network_thread);
- }
-
- rtc::Thread* const network_thread;
-
- std::unique_ptr<PeerConnectionFactoryComponents> pcf_dependencies;
- std::unique_ptr<PeerConnectionComponents> pc_dependencies;
- };
-
// Contains screen share video stream properties.
struct ScreenShareConfig {
// If true, slides will be generated programmatically.
@@ -185,21 +122,6 @@
cricket::AudioOptions audio_options;
};
- // Contains information about call media streams (up to 1 audio stream and
- // unlimited amount of video streams) and rtc configuration, that will be used
- // to set up peer connection.
- struct Params {
- // If |video_configs| is empty - no video should be added to the test call.
- std::vector<VideoConfig> video_configs;
- // If |audio_config| is set audio stream will be configured
- absl::optional<AudioConfig> audio_config;
- // If |rtc_event_log_path| is set, an RTCEventLog will be saved in that
- // location and it will be available for further analysis.
- absl::optional<std::string> rtc_event_log_path;
-
- PeerConnectionInterface::RTCConfiguration rtc_configuration;
- };
-
// This class is used to fully configure one peer inside the call.
class PeerConfigurer {
public:
diff --git a/test/pc/e2e/peer_connection_quality_test.h b/test/pc/e2e/peer_connection_quality_test.h
index ea20fa2..54cdea5 100644
--- a/test/pc/e2e/peer_connection_quality_test.h
+++ b/test/pc/e2e/peer_connection_quality_test.h
@@ -28,6 +28,7 @@
#include "test/pc/e2e/analyzer/video/video_quality_analyzer_injection_helper.h"
#include "test/pc/e2e/api/audio_quality_analyzer_interface.h"
#include "test/pc/e2e/api/peerconnection_quality_test_fixture.h"
+#include "test/pc/e2e/peer_connection_quality_test_params.h"
#include "test/pc/e2e/test_peer.h"
#include "test/testsupport/video_frame_writer.h"
@@ -37,10 +38,6 @@
class PeerConfigurerImpl final
: public PeerConnectionE2EQualityTestFixture::PeerConfigurer {
public:
- using Params = PeerConnectionE2EQualityTestFixture::Params;
- using InjectableComponents =
- PeerConnectionE2EQualityTestFixture::InjectableComponents;
-
PeerConfigurerImpl(rtc::Thread* network_thread,
rtc::NetworkManager* network_manager)
: components_(absl::make_unique<InjectableComponents>(network_thread,
@@ -147,9 +144,6 @@
class PeerConnectionE2EQualityTest
: public PeerConnectionE2EQualityTestFixture {
public:
- using Params = PeerConnectionE2EQualityTestFixture::Params;
- using InjectableComponents =
- PeerConnectionE2EQualityTestFixture::InjectableComponents;
using VideoGeneratorType =
PeerConnectionE2EQualityTestFixture::VideoGeneratorType;
using RunParams = PeerConnectionE2EQualityTestFixture::RunParams;
diff --git a/test/pc/e2e/peer_connection_quality_test_params.h b/test/pc/e2e/peer_connection_quality_test_params.h
new file mode 100644
index 0000000..94cd917
--- /dev/null
+++ b/test/pc/e2e/peer_connection_quality_test_params.h
@@ -0,0 +1,114 @@
+/*
+ * 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 TEST_PC_E2E_PEER_CONNECTION_QUALITY_TEST_PARAMS_H_
+#define TEST_PC_E2E_PEER_CONNECTION_QUALITY_TEST_PARAMS_H_
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "absl/memory/memory.h"
+#include "api/async_resolver_factory.h"
+#include "api/call/call_factory_interface.h"
+#include "api/fec_controller.h"
+#include "api/media_transport_interface.h"
+#include "api/transport/network_control.h"
+#include "api/video_codecs/video_decoder_factory.h"
+#include "api/video_codecs/video_encoder_factory.h"
+#include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
+#include "rtc_base/network.h"
+#include "rtc_base/rtc_certificate_generator.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/thread.h"
+#include "test/pc/e2e/api/peerconnection_quality_test_fixture.h"
+
+namespace webrtc {
+namespace webrtc_pc_e2e {
+
+// Contains most part from PeerConnectionFactoryDependencies. Also all fields
+// are optional and defaults will be provided by fixture implementation if
+// any will be omitted.
+//
+// Separate class was introduced to clarify which components can be
+// overridden. For example worker and signaling threads will be provided by
+// fixture implementation. The same is applicable to the media engine. So user
+// can override only some parts of media engine like video encoder/decoder
+// factories.
+struct PeerConnectionFactoryComponents {
+ std::unique_ptr<CallFactoryInterface> call_factory;
+ std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory;
+ std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory;
+ std::unique_ptr<NetworkControllerFactoryInterface> network_controller_factory;
+ std::unique_ptr<MediaTransportFactory> media_transport_factory;
+
+ // Will be passed to MediaEngineInterface, that will be used in
+ // PeerConnectionFactory.
+ std::unique_ptr<VideoEncoderFactory> video_encoder_factory;
+ std::unique_ptr<VideoDecoderFactory> video_decoder_factory;
+};
+
+// Contains most parts from PeerConnectionDependencies. Also all fields are
+// optional and defaults will be provided by fixture implementation if any
+// will be omitted.
+//
+// Separate class was introduced to clarify which components can be
+// overridden. For example observer, which is required to
+// PeerConnectionDependencies, will be provided by fixture implementation,
+// so client can't inject its own. Also only network manager can be overridden
+// inside port allocator.
+struct PeerConnectionComponents {
+ explicit PeerConnectionComponents(rtc::NetworkManager* network_manager)
+ : network_manager(network_manager) {
+ RTC_CHECK(network_manager);
+ }
+
+ rtc::NetworkManager* const network_manager;
+ std::unique_ptr<webrtc::AsyncResolverFactory> async_resolver_factory;
+ std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator;
+ std::unique_ptr<rtc::SSLCertificateVerifier> tls_cert_verifier;
+};
+
+// Contains all components, that can be overridden in peer connection. Also
+// has a network thread, that will be used to communicate with another peers.
+struct InjectableComponents {
+ explicit InjectableComponents(rtc::Thread* network_thread,
+ rtc::NetworkManager* network_manager)
+ : network_thread(network_thread),
+ pcf_dependencies(absl::make_unique<PeerConnectionFactoryComponents>()),
+ pc_dependencies(
+ absl::make_unique<PeerConnectionComponents>(network_manager)) {
+ RTC_CHECK(network_thread);
+ }
+
+ rtc::Thread* const network_thread;
+
+ std::unique_ptr<PeerConnectionFactoryComponents> pcf_dependencies;
+ std::unique_ptr<PeerConnectionComponents> pc_dependencies;
+};
+
+// Contains information about call media streams (up to 1 audio stream and
+// unlimited amount of video streams) and rtc configuration, that will be used
+// to set up peer connection.
+struct Params {
+ // If |video_configs| is empty - no video should be added to the test call.
+ std::vector<PeerConnectionE2EQualityTestFixture::VideoConfig> video_configs;
+ // If |audio_config| is set audio stream will be configured
+ absl::optional<PeerConnectionE2EQualityTestFixture::AudioConfig> audio_config;
+ // If |rtc_event_log_path| is set, an RTCEventLog will be saved in that
+ // location and it will be available for further analysis.
+ absl::optional<std::string> rtc_event_log_path;
+
+ PeerConnectionInterface::RTCConfiguration rtc_configuration;
+};
+
+} // namespace webrtc_pc_e2e
+} // namespace webrtc
+
+#endif // TEST_PC_E2E_PEER_CONNECTION_QUALITY_TEST_PARAMS_H_
diff --git a/test/pc/e2e/test_peer.cc b/test/pc/e2e/test_peer.cc
index 18736ea..6491b94 100644
--- a/test/pc/e2e/test_peer.cc
+++ b/test/pc/e2e/test_peer.cc
@@ -33,13 +33,6 @@
constexpr int16_t kGeneratedAudioMaxAmplitude = 32000;
constexpr int kSamplingFrequencyInHz = 48000;
-using Params = PeerConnectionE2EQualityTestFixture::Params;
-using InjectableComponents =
- PeerConnectionE2EQualityTestFixture::InjectableComponents;
-using PeerConnectionFactoryComponents =
- PeerConnectionE2EQualityTestFixture::PeerConnectionFactoryComponents;
-using PeerConnectionComponents =
- PeerConnectionE2EQualityTestFixture::PeerConnectionComponents;
using AudioConfig = PeerConnectionE2EQualityTestFixture::AudioConfig;
// Sets mandatory entities in injectable components like |pcf_dependencies|
diff --git a/test/pc/e2e/test_peer.h b/test/pc/e2e/test_peer.h
index fa2f8eb..f87636f 100644
--- a/test/pc/e2e/test_peer.h
+++ b/test/pc/e2e/test_peer.h
@@ -24,6 +24,7 @@
#include "rtc_base/thread.h"
#include "test/pc/e2e/analyzer/video/video_quality_analyzer_injection_helper.h"
#include "test/pc/e2e/api/peerconnection_quality_test_fixture.h"
+#include "test/pc/e2e/peer_connection_quality_test_params.h"
namespace webrtc {
namespace webrtc_pc_e2e {
@@ -32,11 +33,8 @@
class TestPeer final : public PeerConnectionWrapper {
public:
using PeerConnectionWrapper::PeerConnectionWrapper;
- using Params = PeerConnectionE2EQualityTestFixture::Params;
using VideoConfig = PeerConnectionE2EQualityTestFixture::VideoConfig;
using AudioConfig = PeerConnectionE2EQualityTestFixture::AudioConfig;
- using InjectableComponents =
- PeerConnectionE2EQualityTestFixture::InjectableComponents;
// Setups all components, that should be provided to WebRTC
// PeerConnectionFactory and PeerConnection creation methods,
