admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete legacy DataSize and DataRate factories

Browse Source 
Bug: webrtc:9709
Change-Id: Ia9464893ec9868c51d72eedaee8efc82b0c17b28
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168722
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30564}
This commit is contained in:
Danil Chapovalov 2020-02-18 17:20:40 +01:00 committed by Commit Bot
parent e8f4e09be9
commit 70490aa3a0
3 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
api/units/data_rate.h
View File

@ -49,31 +49,7 @@ class DataRate final : public rtc_units_impl::RelativeUnit<DataRate> {
static constexpr DataRate Infinity() { return PlusInfinity(); } static constexpr DataRate Infinity() { return PlusInfinity(); }
DataRate() = delete; DataRate() = delete;
// TODO(danilchap): Migrate all code to the 3 factories above and delete the
// 5 factories below.
template <int64_t bps>
static constexpr DataRate BitsPerSec() {
return FromValue(bps);
}
template <int64_t kbps>
static constexpr DataRate KilobitsPerSec() {
return FromFraction(1000, kbps);
}
template <typename T>
static constexpr DataRate bps(T bits_per_second) {
static_assert(std::is_arithmetic<T>::value, "");
return FromValue(bits_per_second);
}
template <typename T>
static constexpr DataRate bytes_per_sec(T bytes_per_second) {
static_assert(std::is_arithmetic<T>::value, "");
return FromFraction(8, bytes_per_second);
}
template <typename T>
static constexpr DataRate kbps(T kilobits_per_sec) {
static_assert(std::is_arithmetic<T>::value, "");
return FromFraction(1000, kilobits_per_sec);
}
template <typename T = int64_t> template <typename T = int64_t>
constexpr T bps() const { constexpr T bps() const {
return ToValue<T>(); return ToValue<T>();

11
api/units/data_size.h
View File

@ -32,18 +32,7 @@ class DataSize final : public rtc_units_impl::RelativeUnit<DataSize> {
static constexpr DataSize Infinity() { return PlusInfinity(); } static constexpr DataSize Infinity() { return PlusInfinity(); }
DataSize() = delete; DataSize() = delete;
// TODO(danilchap): Migrate all code to the factory above and delete the
// 2 factories below.
template <int64_t bytes>
static constexpr DataSize Bytes() {
return FromValue(bytes);
}
template <typename T>
static constexpr DataSize bytes(T bytes) {
static_assert(std::is_arithmetic<T>::value, "");
return FromValue(bytes);
}
template <typename T = int64_t> template <typename T = int64_t>
constexpr T bytes() const { constexpr T bytes() const {
return ToValue<T>(); return ToValue<T>();

5
modules/congestion_controller/pcc/pcc_network_controller.cc
View File

@ -32,9 +32,8 @@ constexpr int64_t kMinPacketsNumberPerInterval = 20;
const TimeDelta kMinDurationOfMonitorInterval = TimeDelta::Millis(50); const TimeDelta kMinDurationOfMonitorInterval = TimeDelta::Millis(50);
const TimeDelta kStartupDuration = TimeDelta::Millis(500); const TimeDelta kStartupDuration = TimeDelta::Millis(500);
constexpr double kMinRateChangeBps = 4000; constexpr double kMinRateChangeBps = 4000;
constexpr DataRate kMinRateHaveMultiplicativeRateChange = constexpr DataRate kMinRateHaveMultiplicativeRateChange = DataRate::BitsPerSec(
DataRate::BitsPerSec<static_cast<int64_t>(kMinRateChangeBps / static_cast<int64_t>(kMinRateChangeBps / kDefaultSamplingStep));
kDefaultSamplingStep)>();
// Bitrate controller constants. // Bitrate controller constants.
constexpr double kInitialConversionFactor = 5; constexpr double kInitialConversionFactor = 5;