Adding upstream version 125.0.1.upstream/125.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 14 insertions, 4 deletions

diff --git a/third_party/libwebrtc/call/call_config.h b/third_party/libwebrtc/call/call_config.h
index 918c077435..1b1f696fee 100644
--- a/third_party/libwebrtc/call/call_config.h
+++ b/third_party/libwebrtc/call/call_config.h
@@ -10,6 +10,8 @@
 #ifndef CALL_CALL_CONFIG_H_
 #define CALL_CALL_CONFIG_H_
 
+#include "absl/types/optional.h"
+#include "api/environment/environment.h"
 #include "api/fec_controller.h"
 #include "api/field_trials_view.h"
 #include "api/metronome/metronome.h"
@@ -32,12 +34,23 @@ struct CallConfig {
   // If `network_task_queue` is set to nullptr, Call will assume that network
   // related callbacks will be made on the same TQ as the Call instance was
   // constructed on.
+  explicit CallConfig(const Environment& env,
+                      TaskQueueBase* network_task_queue = nullptr);
+
+  // TODO(bugs.webrtc.org/15656): Deprecate and delete constructor below.
   explicit CallConfig(RtcEventLog* event_log,
                       TaskQueueBase* network_task_queue = nullptr);
+
   CallConfig(const CallConfig&);
-  RtpTransportConfig ExtractTransportConfig() const;
+
   ~CallConfig();
 
+  RtpTransportConfig ExtractTransportConfig() const;
+
+  // TODO(bugs.webrtc.org/15656): Make non-optional when constructor that
+  // doesn't pass Environment is removed.
+  absl::optional<Environment> env;
+
   // Bitrate config used until valid bitrate estimates are calculated. Also
   // used to cap total bitrate used. This comes from the remote connection.
   BitrateConstraints bitrate_config;
@@ -79,9 +92,6 @@ struct CallConfig {
 
   Metronome* metronome = nullptr;
 
-  // The burst interval of the pacer, see TaskQueuePacedSender constructor.
-  absl::optional<TimeDelta> pacer_burst_interval;
-
   // Enables send packet batching from the egress RTP sender.
   bool enable_send_packet_batching = false;
 };