zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WebRTC-DeprecateGlobalFieldTrialString/Enabled/ - part 12/inf

Browse Source 
rename WebRtcKeyValueConfig to FieldTrialsView

Bug: webrtc:10335
Change-Id: If725bd498c4c3daf144bee638230fa089fdde833
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/256965
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Jonas Oreland <jonaso@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36365}
This commit is contained in:
Jonas Oreland
2022-03-29 11:04:48 +02:00
committed by WebRTC LUCI CQ
parent bddfa1d9de
commit e62c2f2c77
303 changed files with 785 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
p2p/client/basic_port_allocator.h
View File

@ -15,8 +15,8 @@
#include <string>
#include <vector>
#include "api/field_trials_view.h"
#include "api/turn_customizer.h"
#include "api/webrtc_key_value_config.h"
#include "p2p/base/port_allocator.h"
#include "p2p/client/relay_port_factory_interface.h"
#include "p2p/client/turn_port_factory.h"
@ -81,9 +81,7 @@ class RTC_EXPORT BasicPortAllocator : public PortAllocator {
void SetVpnList(const std::vector<rtc::NetworkMask>& vpn_list) override;
const webrtc::WebRtcKeyValueConfig* field_trials() const {
return field_trials_;
}
const webrtc::FieldTrialsView* field_trials() const { return field_trials_; }
private:
void OnIceRegathering(PortAllocatorSession* session,
@ -92,12 +90,12 @@ class RTC_EXPORT BasicPortAllocator : public PortAllocator {
// This function makes sure that relay_port_factory_ and field_trials_ is set
// properly.
void Init(RelayPortFactoryInterface* relay_port_factory,
const webrtc::WebRtcKeyValueConfig* field_trials);
const webrtc::FieldTrialsView* field_trials);
bool MdnsObfuscationEnabled() const override;
const webrtc::WebRtcKeyValueConfig* field_trials_;
std::unique_ptr<webrtc::WebRtcKeyValueConfig> owned_field_trials_;
const webrtc::FieldTrialsView* field_trials_;
std::unique_ptr<webrtc::FieldTrialsView> owned_field_trials_;
rtc::NetworkManager* network_manager_;
rtc::PacketSocketFactory* socket_factory_;
int network_ignore_mask_ = rtc::kDefaultNetworkIgnoreMask;
@ -310,7 +308,7 @@ struct RTC_EXPORT PortConfiguration {
PortConfiguration(const ServerAddresses& stun_servers,
const std::string& username,
const std::string& password,
const webrtc::WebRtcKeyValueConfig* field_trials = nullptr);
const webrtc::FieldTrialsView* field_trials = nullptr);
// Returns addresses of both the explicitly configured STUN servers,
// and TURN servers that should be used as STUN servers.