From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- third_party/libwebrtc/call/call_config.h | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) (limited to 'third_party/libwebrtc/call/call_config.h') diff --git a/third_party/libwebrtc/call/call_config.h b/third_party/libwebrtc/call/call_config.h index 1b1f696fee..6fd9179a43 100644 --- a/third_party/libwebrtc/call/call_config.h +++ b/third_party/libwebrtc/call/call_config.h @@ -10,15 +10,11 @@ #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" #include "api/neteq/neteq_factory.h" #include "api/network_state_predictor.h" -#include "api/rtc_error.h" -#include "api/task_queue/task_queue_factory.h" #include "api/transport/bitrate_settings.h" #include "api/transport/network_control.h" #include "call/audio_state.h" @@ -28,7 +24,6 @@ namespace webrtc { class AudioProcessing; -class RtcEventLog; struct CallConfig { // If `network_task_queue` is set to nullptr, Call will assume that network @@ -37,19 +32,13 @@ struct CallConfig { 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&); ~CallConfig(); RtpTransportConfig ExtractTransportConfig() const; - // TODO(bugs.webrtc.org/15656): Make non-optional when constructor that - // doesn't pass Environment is removed. - absl::optional env; + Environment env; // Bitrate config used until valid bitrate estimates are calculated. Also // used to cap total bitrate used. This comes from the remote connection. @@ -61,16 +50,9 @@ struct CallConfig { // Audio Processing Module to be used in this call. AudioProcessing* audio_processing = nullptr; - // RtcEventLog to use for this call. Required. - // Use webrtc::RtcEventLog::CreateNull() for a null implementation. - RtcEventLog* const event_log = nullptr; - // FecController to use for this call. FecControllerFactoryInterface* fec_controller_factory = nullptr; - // Task Queue Factory to be used in this call. Required. - TaskQueueFactory* task_queue_factory = nullptr; - // NetworkStatePredictor to use for this call. NetworkStatePredictorFactoryInterface* network_state_predictor_factory = nullptr; @@ -81,16 +63,16 @@ struct CallConfig { // NetEq factory to use for this call. NetEqFactory* neteq_factory = nullptr; - // Key-value mapping of internal configurations to apply, - // e.g. field trials. - const FieldTrialsView* trials = nullptr; - TaskQueueBase* const network_task_queue_ = nullptr; // RtpTransportControllerSend to use for this call. RtpTransportControllerSendFactoryInterface* rtp_transport_controller_send_factory = nullptr; - Metronome* metronome = nullptr; + Metronome* decode_metronome = nullptr; + Metronome* encode_metronome = nullptr; + + // The burst interval of the pacer, see TaskQueuePacedSender constructor. + absl::optional pacer_burst_interval; // Enables send packet batching from the egress RTP sender. bool enable_send_packet_batching = false; -- cgit v1.2.3