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

Removes dependency on Optional for unit classes.

Browse Source 
This makes the dependency graph simpler and prepares for moving the
unit classes to api/.

Bug: webrtc:9155
Change-Id: I1b36d5e05f75d70ba8951e880d76359f896f7741
Reviewed-on: https://webrtc-review.googlesource.com/74920
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23161}
This commit is contained in:
Sebastian Jansson 2018-05-07 18:14:53 +02:00 committed by Commit Bot
parent f8ed5614c2
commit ea562b40f8
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,6 +101,15 @@ std::vector<PacketFeedback> ReceivedPacketsFeedbackAsRtp(
return packet_feedback_vector;
}
int64_t GetBpsOrDefault(const rtc::Optional<DataRate>& rate,
int64_t fallback_bps) {
if (rate && rate->IsFinite()) {
return rate->bps();
} else {
return fallback_bps;
}
}
} // namespace
GoogCcNetworkController::GoogCcNetworkController(RtcEventLog* event_log,

4
modules/congestion_controller/network_control/units/BUILD.gn
View File

@ -17,7 +17,6 @@ rtc_source_set("data_rate") {
deps = [
":data_size",
":time_delta",
"../../../../api:optional",
"../../../../rtc_base:checks",
"../../../../rtc_base:rtc_base_approved",
]
@ -30,7 +29,6 @@ rtc_source_set("data_size") {
]
deps = [
"../../../../api:optional",
"../../../../rtc_base:checks",
"../../../../rtc_base:rtc_base_approved",
]
@ -42,7 +40,6 @@ rtc_source_set("time_delta") {
]
deps = [
"../../../../api:optional",
"../../../../rtc_base:checks",
"../../../../rtc_base:rtc_base_approved",
]
@ -56,7 +53,6 @@ rtc_source_set("timestamp") {
deps = [
":time_delta",
"../../../../api:optional",
"../../../../rtc_base:checks",
"../../../../rtc_base:rtc_base_approved",
]

10
modules/congestion_controller/network_control/units/data_rate.h
View File

@ -16,7 +16,6 @@
#include <limits>
#include <string>
#include "api/optional.h"
#include "rtc_base/checks.h"
#include "modules/congestion_controller/network_control/units/data_size.h"
@ -128,15 +127,6 @@ inline DataSize operator*(const TimeDelta& duration, const DataRate& rate) {
return rate * duration;
}
inline int64_t GetBpsOrDefault(const rtc::Optional<DataRate>& rate,
int64_t fallback_bps) {
if (rate && rate->IsFinite()) {
return rate->bps();
} else {
return fallback_bps;
}
}
std::string ToString(const DataRate& value);
} // namespace webrtc