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

Removes common header for network units.

Browse Source 
The code using the units now depends on specific targets to make the
dependencies more clear

Bug: None
Change-Id: I3200d57a2974b6981db68f05d84391cbbb06e981
Reviewed-on: https://webrtc-review.googlesource.com/70181
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22882}
This commit is contained in:
Sebastian Jansson 2018-04-16 12:17:06 +02:00 committed by Commit Bot
parent b5c9a79e68
commit 324865a206
12 changed files with 25 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/congestion_controller/bbr/BUILD.gn
View File

@ -36,7 +36,6 @@ rtc_source_set("bbr_controller") {
"../../../rtc_base/experiments:congestion_controller_experiment",
"../../../rtc_base/system:fallthrough",
"../network_control",
"../network_control/units",
]
}
rtc_source_set("data_transfer_tracker") {
@ -48,7 +47,9 @@ rtc_source_set("data_transfer_tracker") {
deps = [
"../../../rtc_base:checks",
"../../../rtc_base:rtc_base_approved",
"../network_control/units",
"../network_control/units:data_size",
"../network_control/units:time_delta",
"../network_control/units:timestamp",
]
}
rtc_source_set("rtt_stats") {
@ -59,7 +60,8 @@ rtc_source_set("rtt_stats") {
]
deps = [
"../../../rtc_base:rtc_base_approved",
"../network_control/units",
"../network_control/units:time_delta",
"../network_control/units:timestamp",
]
}
rtc_source_set("windowed_filter") {
@ -85,7 +87,8 @@ if (rtc_include_tests) {
":windowed_filter",
"../../../test:test_support",
"../network_control:network_control_test",
"../network_control/units",
"../network_control/units:data_rate",
"../network_control/units:time_delta",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).

1
modules/congestion_controller/bbr/bbr_network_controller.cc
View File

@ -15,7 +15,6 @@
#include <string>
#include <vector>
#include "modules/congestion_controller/network_control/units/network_units.h"
#include "rtc_base/checks.h"
#include "rtc_base/experiments/congestion_controller_experiment.h"
#include "rtc_base/logging.h"

4
modules/congestion_controller/bbr/data_transfer_tracker.h
View File

@ -11,7 +11,9 @@
#define MODULES_CONGESTION_CONTROLLER_BBR_DATA_TRANSFER_TRACKER_H_
#include <deque>
#include "modules/congestion_controller/network_control/units/network_units.h"
#include "modules/congestion_controller/network_control/units/data_size.h"
#include "modules/congestion_controller/network_control/units/time_delta.h"
#include "modules/congestion_controller/network_control/units/timestamp.h"
namespace webrtc {
namespace bbr {

1
modules/congestion_controller/bbr/data_transfer_tracker_unittest.cc
View File

@ -9,7 +9,6 @@
*/
#include "modules/congestion_controller/bbr/data_transfer_tracker.h"
#include "modules/congestion_controller/network_control/units/network_units.h"
#include "test/gtest.h"
namespace webrtc {

1
modules/congestion_controller/bbr/rtt_stats.cc
View File

@ -12,7 +12,6 @@
#include <cstdlib>
#include "modules/congestion_controller/network_control/units/network_units.h"
#include "rtc_base/logging.h"
namespace webrtc {

3
modules/congestion_controller/bbr/rtt_stats.h
View File

@ -16,7 +16,8 @@
#include <algorithm>
#include <cstdint>
#include "modules/congestion_controller/network_control/units/network_units.h"
#include "modules/congestion_controller/network_control/units/time_delta.h"
#include "modules/congestion_controller/network_control/units/timestamp.h"
#include "rtc_base/constructormagic.h"
#include "rtc_base/logging.h"

3
modules/congestion_controller/bbr/windowed_filter_unittest.cc
View File

@ -10,6 +10,9 @@
#include "modules/congestion_controller/bbr/windowed_filter.h"
#include "modules/congestion_controller/network_control/units/data_rate.h"
#include "modules/congestion_controller/network_control/units/time_delta.h"
#include "modules/congestion_controller/bbr/rtt_stats.h"
#include "test/gtest.h"

6
modules/congestion_controller/network_control/BUILD.gn
View File

@ -20,7 +20,10 @@ rtc_static_library("network_control") {
"../../../api:optional",
"../../../rtc_base:checks",
"../../../rtc_base:rtc_base_approved",
"units",
"units:data_rate",
"units:data_size",
"units:time_delta",
"units:timestamp",
]
}
@ -38,7 +41,6 @@ if (rtc_include_tests) {
"../../../rtc_base:checks",
"../../../rtc_base:rtc_base_approved",
"../../../test:test_support",
"units",
]
}
rtc_source_set("network_control_unittests") {

1
modules/congestion_controller/network_control/include/network_control.h
View File

@ -14,7 +14,6 @@
#include <memory>
#include "modules/congestion_controller/network_control/include/network_types.h"
#include "modules/congestion_controller/network_control/units/network_units.h"
namespace webrtc {

7
modules/congestion_controller/network_control/include/network_types.h
View File

@ -12,8 +12,13 @@
#define MODULES_CONGESTION_CONTROLLER_NETWORK_CONTROL_INCLUDE_NETWORK_TYPES_H_
#include <stdint.h>
#include <vector>
#include "modules/congestion_controller/network_control/units/network_units.h"
#include "modules/congestion_controller/network_control/units/data_rate.h"
#include "modules/congestion_controller/network_control/units/data_size.h"
#include "modules/congestion_controller/network_control/units/time_delta.h"
#include "modules/congestion_controller/network_control/units/timestamp.h"
#include "modules/include/module_common_types.h"
#include "rtc_base/constructormagic.h"
namespace webrtc {

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

@ -8,22 +8,6 @@
import("../../../../webrtc.gni")
rtc_source_set("units") {
sources = [
"network_units.h",
]
deps = [
":data_rate",
":data_size",
":time_delta",
":timestamp",
"../../../../api:optional",
"../../../../rtc_base:checks",
"../../../../rtc_base:rtc_base_approved",
]
}
rtc_source_set("data_rate") {
sources = [
"data_rate.cc",
@ -92,7 +76,6 @@ if (rtc_include_tests) {
":data_size",
":time_delta",
":timestamp",
":units",
"../../../../test:test_support",
]
}

19
modules/congestion_controller/network_control/units/network_units.h
View File

@ -1,19 +0,0 @@
/*
* 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.
*/
#ifndef MODULES_CONGESTION_CONTROLLER_NETWORK_CONTROL_UNITS_NETWORK_UNITS_H_
#define MODULES_CONGESTION_CONTROLLER_NETWORK_CONTROL_UNITS_NETWORK_UNITS_H_
#include "modules/congestion_controller/network_control/units/data_rate.h"
#include "modules/congestion_controller/network_control/units/data_size.h"
#include "modules/congestion_controller/network_control/units/time_delta.h"
#include "modules/congestion_controller/network_control/units/timestamp.h"
#endif // MODULES_CONGESTION_CONTROLLER_NETWORK_CONTROL_UNITS_NETWORK_UNITS_H_