Olga Sharonova 44e57be3c8 Revert "Fix circular dependency in BWE code."
This reverts commit 08279b5cf5a8412f7e946cc2bb43703e920f5855.

Reason for revert: msvc bots breaking, blocking WebRTC rolls.

Sample log:
FAILED: obj/third_party/webrtc/modules/congestion_controller/estimators/probe_bitrate_estimator.obj 
ninja -t msvc -e environment.x64 -- E:\b\c\goma_client/gomacc.exe "e:\b\c\win_toolchain\vs_files\1180cb75833ea365097e279efb2d5d7a42dee4b0\vc\tools\msvc\14.11.25503\bin\hostx64\x64/cl.exe" /nologo /showIncludes  @obj/third_party/webrtc/modules/congestion_controller/estimators/probe_bitrate_estimator.obj.rsp /c ../../third_party/webrtc/modules/congestion_controller/probe_bitrate_estimator.cc /Foobj/third_party/webrtc/modules/congestion_controller/estimators/probe_bitrate_estimator.obj /Fd"obj/third_party/webrtc/modules/congestion_controller/estimators_cc.pdb"
../../third_party/webrtc/modules/congestion_controller/probe_bitrate_estimator.cc(68): error C2220: warning treated as error - no 'object' file generated
../../third_party/webrtc/modules/congestion_controller/probe_bitrate_estimator.cc(68): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
[22699/51826] CXX obj/third_party/webrtc/modules/pacing/pacing/packet_router.obj
[22700/51826] CXX obj/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator/aimd_rate_control.obj
[22701/51826] CXX obj/third_party/webrtc/modules/desktop_capture/desktop_capture_generic/dxgi_texture_mapping.obj
[22702/51826] CXX obj/third_party/webrtc/modules/congestion_controller/estimators/acknowledged_bitrate_estimator.obj
FAILED: obj/third_party/webrtc/modules/congestion_controller/estimators/acknowledged_bitrate_estimator.obj 
ninja -t msvc -e environment.x64 -- E:\b\c\goma_client/gomacc.exe "e:\b\c\win_toolchain\vs_files\1180cb75833ea365097e279efb2d5d7a42dee4b0\vc\tools\msvc\14.11.25503\bin\hostx64\x64/cl.exe" /nologo /showIncludes  @obj/third_party/webrtc/modules/congestion_controller/estimators/acknowledged_bitrate_estimator.obj.rsp /c ../../third_party/webrtc/modules/congestion_controller/acknowledged_bitrate_estimator.cc /Foobj/third_party/webrtc/modules/congestion_controller/estimators/acknowledged_bitrate_estimator.obj /Fd"obj/third_party/webrtc/modules/congestion_controller/estimators_cc.pdb"
../../third_party/webrtc/modules/congestion_controller/acknowledged_bitrate_estimator.cc(41): error C2220: warning treated as error - no 'object' file generated
../../third_party/webrtc/modules/congestion_controller/acknowledged_bitrate_estimator.cc(41): warning C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data

https://logs.chromium.org/v/?s=chromium%2Fbb%2Ftryserver.chromium.win%2Fwin-msvc-dbg%2F1780%2F%2B%2Frecipes%2Fsteps%2Fcompile__with_patch_%2F0%2Fstdout


Original change's description:
> Fix circular dependency in BWE code.
> 
> Bug: webrtc:6828
> Change-Id: I531ee5dea41140f085d82641253fadb9e997a378
> Reviewed-on: https://webrtc-review.googlesource.com/34641
> Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#21350}

TBR=phoglund@webrtc.org,stefan@webrtc.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: webrtc:6828
Change-Id: I361050942cbd1d2b344b129c8c3a4e7b6e1c02f4
Reviewed-on: https://webrtc-review.googlesource.com/35240
Reviewed-by: Olga Sharonova <olka@webrtc.org>
Commit-Queue: Olga Sharonova <olka@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21384}
2017-12-20 13:54:36 +00:00

266 lines
7.8 KiB
Plaintext

# Copyright (c) 2014 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.
import("../../webrtc.gni")
rtc_static_library("remote_bitrate_estimator") {
sources = [
"aimd_rate_control.cc",
"aimd_rate_control.h",
"bwe_defines.cc",
"include/bwe_defines.h",
"include/remote_bitrate_estimator.h",
"include/send_time_history.h",
"inter_arrival.cc",
"inter_arrival.h",
"overuse_detector.cc",
"overuse_detector.h",
"overuse_estimator.cc",
"overuse_estimator.h",
"remote_bitrate_estimator_abs_send_time.cc",
"remote_bitrate_estimator_abs_send_time.h",
"remote_bitrate_estimator_single_stream.cc",
"remote_bitrate_estimator_single_stream.h",
"remote_estimator_proxy.cc",
"remote_estimator_proxy.h",
"send_time_history.cc",
"test/bwe_test_logging.h",
]
if (rtc_enable_bwe_test_logging) {
defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1" ]
sources += [ "test/bwe_test_logging.cc" ]
} else {
defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0" ]
}
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
deps = [
"../..:webrtc_common",
"../../:typedefs",
"../../api:optional",
"../../modules:module_api",
"../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../../system_wrappers:metrics_api",
]
}
if (!build_with_chromium) {
rtc_source_set("bwe_rtp") {
testonly = true
sources = [
"tools/bwe_rtp.cc",
"tools/bwe_rtp.h",
]
deps = [
":remote_bitrate_estimator",
"../../rtc_base:rtc_base_approved",
"../../test:rtp_test_utils",
"../rtp_rtcp",
]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
}
if (rtc_include_tests) {
rtc_static_library("bwe_simulator_lib") {
testonly = true
sources = [
"test/bbr_paced_sender.cc",
"test/bbr_paced_sender.h",
"test/bwe.cc",
"test/bwe.h",
"test/bwe_test.cc",
"test/bwe_test.h",
"test/bwe_test_baselinefile.cc",
"test/bwe_test_baselinefile.h",
"test/bwe_test_fileutils.cc",
"test/bwe_test_fileutils.h",
"test/bwe_test_framework.cc",
"test/bwe_test_framework.h",
"test/bwe_test_logging.h",
"test/estimators/bbr.cc",
"test/estimators/bbr.h",
"test/estimators/congestion_window.cc",
"test/estimators/congestion_window.h",
"test/estimators/max_bandwidth_filter.cc",
"test/estimators/max_bandwidth_filter.h",
"test/estimators/min_rtt_filter.h",
"test/estimators/nada.cc",
"test/estimators/nada.h",
"test/estimators/remb.cc",
"test/estimators/remb.h",
"test/estimators/send_side.cc",
"test/estimators/send_side.h",
"test/estimators/tcp.cc",
"test/estimators/tcp.h",
"test/metric_recorder.cc",
"test/metric_recorder.h",
"test/packet.h",
"test/packet_receiver.cc",
"test/packet_receiver.h",
"test/packet_sender.cc",
"test/packet_sender.h",
]
if (rtc_enable_bwe_test_logging) {
defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1" ]
} else {
defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0" ]
}
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
if (is_win) {
cflags = [
# TODO(kjellander): Bug 261: fix this warning.
"/wd4373", # virtual function override.
]
}
deps = [
":remote_bitrate_estimator",
"..:module_api",
"../..:webrtc_common",
"../../:typedefs",
"../../api:optional",
"../../rtc_base:checks",
"../../rtc_base:gtest_prod",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_numerics",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../../test:test_support",
"../../voice_engine",
"../bitrate_controller",
"../congestion_controller",
"../pacing",
"../rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",
"../video_coding:video_coding_utility",
"//testing/gmock",
"//testing/gtest",
]
}
rtc_source_set("remote_bitrate_estimator_perf_tests") {
testonly = true
sources = [
"remote_bitrate_estimators_test.cc",
]
deps = [
":bwe_simulator_lib",
":remote_bitrate_estimator",
"../../rtc_base:rtc_base_approved",
"../../test:field_trial",
"../../test:test_support",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
rtc_source_set("remote_bitrate_estimator_unittests") {
testonly = true
sources = [
"aimd_rate_control_unittest.cc",
"inter_arrival_unittest.cc",
"overuse_detector_unittest.cc",
"remote_bitrate_estimator_abs_send_time_unittest.cc",
"remote_bitrate_estimator_single_stream_unittest.cc",
"remote_bitrate_estimator_unittest_helper.cc",
"remote_bitrate_estimator_unittest_helper.h",
"remote_estimator_proxy_unittest.cc",
"send_time_history_unittest.cc",
"test/bwe_test_framework_unittest.cc",
"test/bwe_unittest.cc",
"test/estimators/congestion_window_unittest.cc",
"test/estimators/max_bandwidth_filter_unittest.cc",
"test/estimators/min_rtt_filter_unittest.cc",
"test/estimators/nada_unittest.cc",
"test/metric_recorder_unittest.cc",
]
deps = [
":bwe_simulator_lib",
":remote_bitrate_estimator",
"../..:webrtc_common",
"../../rtc_base:checks",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../test:field_trial",
"../../test:test_support",
"../pacing:pacing",
"../rtp_rtcp:rtp_rtcp_format",
"//testing/gmock",
]
if (is_win) {
cflags = [
# TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
"/wd4373", # virtual function override.
]
}
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
rtc_test("bwe_simulations_tests") {
testonly = true
sources = [
"bwe_simulations.cc",
]
deps = [
":bwe_simulator_lib",
":remote_bitrate_estimator",
"../..:webrtc_common",
"../../rtc_base:rtc_base_approved",
"../../test:test_main",
"//testing/gmock",
"//testing/gtest",
]
data = [
"//resources/sprint-uplink.rx",
"//resources/verizon4g-downlink.rx",
"//resources/google-wifi-3mbps.rx",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
if (is_win) {
cflags = [
# TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
"/wd4373", # virtual function override.
]
}
}
}