diff options
author | Danil Chapovalov <danilchap@webrtc.org> | 2020-02-20 14:54:28 +0000 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-02-24 09:50:35 +0000 |
commit | 1db70d5c7b8366f7ec3f0f7c1a6bea0137a245e6 (patch) | |
tree | 83593e9e64a7716e89b25159e910745426d0faba /modules/congestion_controller | |
parent | ecbdbf6ee83864502daa6d0a1aa07ab3432eec1e (diff) | |
download | webrtc-1db70d5c7b8366f7ec3f0f7c1a6bea0137a245e6.tar.gz |
Reland "Delete legacy DataSize and DataRate factories"
This reverts commit 74c5b0ac239141606b3c09022088d440941bfe3b.
Reason for revert: downstream code adjusted
Original change's description:
> Revert "Delete legacy DataSize and DataRate factories"
>
> This reverts commit 70490aa3a0b08c9342ea9a12d5ac1fa9666fb7fb.
>
> Reason for revert: Breaks downstream project.
>
> Original change's description:
> > Delete legacy DataSize and DataRate factories
> >
> > 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}
>
> TBR=danilchap@webrtc.org,srte@webrtc.org
>
> Change-Id: I3f5a8b4ec473bd2af80ca3acfe0e9c82f25a12ba
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:9709
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168940
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#30574}
TBR=danilchap@webrtc.org,mbonadei@webrtc.org,srte@webrtc.org
Change-Id: If05a6b2aa3d4c50caac52f50c13ba56c1e2c810d
Bug: webrtc:9709
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168960
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30589}
Diffstat (limited to 'modules/congestion_controller')
-rw-r--r-- | modules/congestion_controller/pcc/pcc_network_controller.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/congestion_controller/pcc/pcc_network_controller.cc b/modules/congestion_controller/pcc/pcc_network_controller.cc index 9801b098b9..8653470955 100644 --- a/modules/congestion_controller/pcc/pcc_network_controller.cc +++ b/modules/congestion_controller/pcc/pcc_network_controller.cc @@ -32,9 +32,8 @@ constexpr int64_t kMinPacketsNumberPerInterval = 20; const TimeDelta kMinDurationOfMonitorInterval = TimeDelta::Millis(50); const TimeDelta kStartupDuration = TimeDelta::Millis(500); constexpr double kMinRateChangeBps = 4000; -constexpr DataRate kMinRateHaveMultiplicativeRateChange = - DataRate::BitsPerSec<static_cast<int64_t>(kMinRateChangeBps / - kDefaultSamplingStep)>(); +constexpr DataRate kMinRateHaveMultiplicativeRateChange = DataRate::BitsPerSec( + static_cast<int64_t>(kMinRateChangeBps / kDefaultSamplingStep)); // Bitrate controller constants. constexpr double kInitialConversionFactor = 5; |