diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
tree | eff41dc61d9f714852212739e6b3738b82a2af87 /third_party/libwebrtc/test/pc/e2e/test_peer_factory.cc | |
parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | third_party/libwebrtc/test/pc/e2e/test_peer_factory.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/third_party/libwebrtc/test/pc/e2e/test_peer_factory.cc b/third_party/libwebrtc/test/pc/e2e/test_peer_factory.cc index dd900027ee..a184c5db3c 100644 --- a/third_party/libwebrtc/test/pc/e2e/test_peer_factory.cc +++ b/third_party/libwebrtc/test/pc/e2e/test_peer_factory.cc @@ -43,16 +43,14 @@ constexpr int kDefaultSamplingFrequencyInHz = 48000; // and `pc_dependencies` if they are omitted. Also setup required // dependencies, that won't be specially provided by factory and will be just // transferred to peer connection creation code. -void SetMandatoryEntities(InjectableComponents* components, - TimeController& time_controller) { +void SetMandatoryEntities(InjectableComponents* components) { RTC_DCHECK(components->pcf_dependencies); RTC_DCHECK(components->pc_dependencies); // Setup required peer connection factory dependencies. if (components->pcf_dependencies->event_log_factory == nullptr) { components->pcf_dependencies->event_log_factory = - std::make_unique<RtcEventLogFactory>( - time_controller.GetTaskQueueFactory()); + std::make_unique<RtcEventLogFactory>(); } if (!components->pcf_dependencies->trials) { components->pcf_dependencies->trials = @@ -286,7 +284,7 @@ std::unique_ptr<TestPeer> TestPeerFactory::CreateTestPeer( RTC_DCHECK(configurable_params); RTC_DCHECK_EQ(configurable_params->video_configs.size(), video_sources.size()); - SetMandatoryEntities(components.get(), time_controller_); + SetMandatoryEntities(components.get()); params->rtc_configuration.sdp_semantics = SdpSemantics::kUnifiedPlan; // Create peer connection factory. @@ -329,6 +327,7 @@ std::unique_ptr<TestPeer> TestPeerFactory::CreateTestPeer( components->worker_thread, components->network_thread); rtc::scoped_refptr<PeerConnectionFactoryInterface> peer_connection_factory = CreateModularPeerConnectionFactory(std::move(pcf_deps)); + peer_connection_factory->SetOptions(params->peer_connection_factory_options); // Create peer connection. PeerConnectionDependencies pc_deps = |