317a1f09ed
WebRTC is now using C++14 so there is no need to use the Abseil version of std::make_unique. This CL has been created with the following steps: git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \ uniq > /tmp/only_make_unique.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/only_make_unique.txt /tmp/memory.txt | \ xargs grep -l "absl/memory" > /tmp/add-memory.txt git grep -l "\babsl::make_unique\b" | \ xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g" git checkout PRESUBMIT.py abseil-in-webrtc.md cat /tmp/add-memory.txt | \ xargs sed -i \ 's/#include "absl\/memory\/memory.h"/#include <memory>/g' git cl format # Manual fix order of the new inserted #include <memory> cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \ xargs sed -i '/#include "absl\/memory\/memory.h"/d' git ls-files | grep BUILD.gn | \ xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d' python tools_webrtc/gn_check_autofix.py \ -m tryserver.webrtc -b linux_rel # Repead the gn_check_autofix step for other platforms git ls-files | grep BUILD.gn | \ xargs sed -i 's/absl\/memory:memory/absl\/memory/g' git cl format Bug: webrtc:10945 Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29209}
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 <memory>
|
|
#include <utility>
|
|
|
|
#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 std::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
|