This reverts commit c36c8e114df8f21ec286adf1ffe76cf5fc495f53. Reason for revert: Breaks downstream code. Original change's description: > Makes send side network estimation opt-in. > > Bug: webrtc:10742 > Change-Id: I57159a3bf853ef8de32f5ba70ad4fa897ee5c528 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144046 > Reviewed-by: Björn Terelius <terelius@webrtc.org> > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#28631} TBR=terelius@webrtc.org,srte@webrtc.org Change-Id: Ie9ce099d9154551fd123dbc1eca96ca2730fbc9f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:10742 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/146544 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28634}
66 lines
2.3 KiB
C++
66 lines
2.3 KiB
C++
/*
|
|
* Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "api/transport/goog_cc_factory.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "absl/memory/memory.h"
|
|
#include "modules/congestion_controller/goog_cc/goog_cc_network_control.h"
|
|
|
|
namespace webrtc {
|
|
GoogCcNetworkControllerFactory::GoogCcNetworkControllerFactory(
|
|
RtcEventLog* event_log)
|
|
: event_log_(event_log) {}
|
|
|
|
GoogCcNetworkControllerFactory::GoogCcNetworkControllerFactory(
|
|
NetworkStatePredictorFactoryInterface* network_state_predictor_factory) {
|
|
factory_config_.network_state_predictor_factory =
|
|
network_state_predictor_factory;
|
|
}
|
|
|
|
GoogCcNetworkControllerFactory::GoogCcNetworkControllerFactory(
|
|
GoogCcFactoryConfig config)
|
|
: factory_config_(std::move(config)) {}
|
|
|
|
std::unique_ptr<NetworkControllerInterface>
|
|
GoogCcNetworkControllerFactory::Create(NetworkControllerConfig config) {
|
|
if (event_log_)
|
|
config.event_log = event_log_;
|
|
GoogCcConfig goog_cc_config;
|
|
goog_cc_config.feedback_only = factory_config_.feedback_only;
|
|
if (factory_config_.network_state_estimator_factory) {
|
|
RTC_DCHECK(config.key_value_config);
|
|
goog_cc_config.network_state_estimator =
|
|
factory_config_.network_state_estimator_factory->Create(
|
|
config.key_value_config);
|
|
}
|
|
if (factory_config_.network_state_predictor_factory) {
|
|
goog_cc_config.network_state_predictor =
|
|
factory_config_.network_state_predictor_factory
|
|
->CreateNetworkStatePredictor();
|
|
}
|
|
return absl::make_unique<GoogCcNetworkController>(config,
|
|
std::move(goog_cc_config));
|
|
}
|
|
|
|
TimeDelta GoogCcNetworkControllerFactory::GetProcessInterval() const {
|
|
const int64_t kUpdateIntervalMs = 25;
|
|
return TimeDelta::ms(kUpdateIntervalMs);
|
|
}
|
|
|
|
GoogCcFeedbackNetworkControllerFactory::GoogCcFeedbackNetworkControllerFactory(
|
|
RtcEventLog* event_log)
|
|
: GoogCcNetworkControllerFactory(event_log) {
|
|
factory_config_.feedback_only = true;
|
|
}
|
|
|
|
} // namespace webrtc
|