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/call/call_config.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/call/call_config.cc | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/third_party/libwebrtc/call/call_config.cc b/third_party/libwebrtc/call/call_config.cc index 5832969b9c..0a6ad2c2ec 100644 --- a/third_party/libwebrtc/call/call_config.cc +++ b/third_party/libwebrtc/call/call_config.cc @@ -10,37 +10,27 @@ #include "call/call_config.h" -#include "rtc_base/checks.h" +#include "api/environment/environment.h" +#include "api/task_queue/task_queue_base.h" namespace webrtc { CallConfig::CallConfig(const Environment& env, TaskQueueBase* network_task_queue) : env(env), - event_log(&env.event_log()), - task_queue_factory(&env.task_queue_factory()), - trials(&env.field_trials()), network_task_queue_(network_task_queue) {} -CallConfig::CallConfig(RtcEventLog* event_log, - TaskQueueBase* network_task_queue /* = nullptr*/) - : event_log(event_log), network_task_queue_(network_task_queue) { - RTC_DCHECK(event_log); -} - CallConfig::CallConfig(const CallConfig& config) = default; RtpTransportConfig CallConfig::ExtractTransportConfig() const { - RtpTransportConfig transportConfig; - transportConfig.bitrate_config = bitrate_config; - transportConfig.event_log = event_log; - transportConfig.network_controller_factory = network_controller_factory; - transportConfig.network_state_predictor_factory = + RtpTransportConfig transport_config = {.env = env}; + transport_config.bitrate_config = bitrate_config; + transport_config.network_controller_factory = network_controller_factory; + transport_config.network_state_predictor_factory = network_state_predictor_factory; - transportConfig.task_queue_factory = task_queue_factory; - transportConfig.trials = trials; + transport_config.pacer_burst_interval = pacer_burst_interval; - return transportConfig; + return transport_config; } CallConfig::~CallConfig() = default; |