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

Adding bps_or method to DataRate class.

Browse Source 
Bug: webrtc:8415
Change-Id: I64e46b63d82cb843f0710839c1fc22e2440ae7e1
Reviewed-on: https://webrtc-review.googlesource.com/59222
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22285}
This commit is contained in:
Sebastian Jansson 2018-03-01 19:12:12 +01:00 committed by Commit Bot
parent e90636adc2
commit 8d9dcb1c89
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/congestion_controller/goog_cc/goog_cc_network_control.cc
View File

@ -137,13 +137,8 @@ void GoogCcNetworkController::OnNetworkAvailability(NetworkAvailability msg) {
void GoogCcNetworkController::OnNetworkRouteChange(NetworkRouteChange msg) {
int64_t min_bitrate_bps = msg.constraints.min_data_rate.bps();
int64_t max_bitrate_bps = -1;
int64_t start_bitrate_bps = -1;
if (msg.constraints.max_data_rate.IsFinite())
max_bitrate_bps = msg.constraints.max_data_rate.bps();
if (msg.constraints.starting_rate.IsFinite())
start_bitrate_bps = msg.constraints.starting_rate.bps();
int64_t max_bitrate_bps = msg.constraints.max_data_rate.bps_or(-1);
int64_t start_bitrate_bps = msg.constraints.starting_rate.bps_or(-1);
ClampBitrates(&start_bitrate_bps, &min_bitrate_bps, &max_bitrate_bps);
@ -216,13 +211,8 @@ void GoogCcNetworkController::OnStreamsConfig(StreamsConfig msg) {
void GoogCcNetworkController::OnTargetRateConstraints(
TargetRateConstraints constraints) {
int64_t min_bitrate_bps = constraints.min_data_rate.bps();
int64_t max_bitrate_bps = -1;
int64_t start_bitrate_bps = -1;
if (constraints.max_data_rate.IsFinite())
max_bitrate_bps = constraints.max_data_rate.bps();
if (constraints.starting_rate.IsFinite())
start_bitrate_bps = constraints.starting_rate.bps();
int64_t max_bitrate_bps = constraints.max_data_rate.bps_or(-1);
int64_t start_bitrate_bps = constraints.starting_rate.bps_or(-1);
ClampBitrates(&start_bitrate_bps, &min_bitrate_bps, &max_bitrate_bps);

3
modules/congestion_controller/network_control/include/network_units.h
View File

@ -285,6 +285,9 @@ class DataRate {
}
int64_t bytes_per_second() const { return bits_per_second() / 8; }
int64_t bps() const { return bits_per_second(); }
int64_t bps_or(int64_t fallback) const {
return IsFinite() ? bits_per_second() : fallback;
}
int64_t kbps() const { return units_internal::DivideAndRound(bps(), 1000); }
bool IsZero() const { return bits_per_sec_ == 0; }
bool IsInfinite() const {