Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

160 lines
4.8 KiB
Plaintext
Raw Normal View History

# 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.
Reland of Moving webrtc.gni up one level from build/ (patchset #1 id:1 of https://codereview.webrtc.org/2657563002/ ) Reason for revert: Starting to work on a fix (it seems that there are third_party dependencies that depends on the path to the webrtc.gni file) Original issue's description: > Revert of Moving webrtc.gni up one level from build/ (patchset #1 id:1 of https://codereview.webrtc.org/2651543003/ ) > > Reason for revert: > This was causing the following failure: https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Builder/builds/838/steps/generate_build_files/logs/stdio > > Original issue's description: > > Moving webrtc.gni up one level from build/ > > > > BUG=webrtc:7030 > > > > Review-Url: https://codereview.webrtc.org/2651543003 > > Cr-Commit-Position: refs/heads/master@{#16241} > > Committed: https://chromium.googlesource.com/external/webrtc/+/35a32700fc9b5d932ddbd528c12f59c3274e4774 > > TBR=kjellander@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:7030 > > Review-Url: https://codereview.webrtc.org/2657563002 > Cr-Commit-Position: refs/heads/master@{#16244} > Committed: https://chromium.googlesource.com/external/webrtc/+/69dc7dbe247ead087f3bae0eb7e23f27f0de1ec3 TBR=kjellander@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7030 Review-Url: https://codereview.webrtc.org/2654773002 Cr-Commit-Position: refs/heads/master@{#16247}
2017-01-24 06:58:22 -08:00
import("../../webrtc.gni")
config("bwe_test_logging") {
if (rtc_enable_bwe_test_logging) {
defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1" ]
} else {
defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0" ]
}
}
rtc_static_library("congestion_controller") {
Revert "Revert "GN rtc_* templates: Set default visibility to webrtc_root + "/*""" This reverts commit c73e1f437889d882cbf2987f7fb3a029a6150613. Reason for revert: The problem with failed deps in chrome content/renderer had already been fixed in https://webrtc-review.googlesource.com/c/src/+/38660 Original change's description: > Revert "GN rtc_* templates: Set default visibility to webrtc_root + "/*"" > > This reverts commit 588c548657b3ddf76e7b3f241263eef7f5799f16. > > Reason for revert: > > Breaks Chrome FYI: > > /b/c/b/Linux_Builder/src/buildtools/linux64/gn gen //out/Release --check > -> returned 1 > ERROR at //build/split_static_library.gni:12:5: Dependency not allowed. > static_library(target_name) { > ^---------------------------- > The item //content/renderer:renderer > can not depend on //third_party/webrtc/media:rtc_internal_video_codecs > because it is not in //third_party/webrtc/media:rtc_internal_video_codecs's visibility list: [ > //third_party/webrtc/* > //third_party/webrtc_overrides/* > ] > > https://logs.chromium.org/v/?s=chromium%2Fbb%2Fchromium.webrtc.fyi%2FLinux_Builder%2F23560%2F%2B%2Frecipes%2Fsteps%2Fgenerate_build_files%2F0%2Fstdout > > Original change's description: > > GN rtc_* templates: Set default visibility to webrtc_root + "/*" > > > > This means that by default, targets are visible to everything under > > the WebRTC root, but not visible to anything else. > > > > API targets are manually tagged with visibility "*", so that targets > > outside the WebRTC tree can see them. > > > > BUG=webrtc:8254 > > > > Change-Id: Icdbee6e0d22d93240ff2fb530c8f9dc48e351509 > > Reviewed-on: https://webrtc-review.googlesource.com/24140 > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > Commit-Queue: Karl Wiberg <kwiberg@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21548} > > TBR=mbonadei@webrtc.org,kwiberg@webrtc.org > > Change-Id: I06620ce3d6f67482935c22efa231dd6cab91625a > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8254 > Reviewed-on: https://webrtc-review.googlesource.com/38760 > Reviewed-by: Per Kjellander <perkj@webrtc.org> > Commit-Queue: Per Kjellander <perkj@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#21555} TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,perkj@webrtc.org Change-Id: I6f720078ce21bd172e0a6471bae8c4c011e4a657 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8254 Reviewed-on: https://webrtc-review.googlesource.com/38860 Reviewed-by: Per Kjellander <perkj@webrtc.org> Commit-Queue: Per Kjellander <perkj@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21558}
2018-01-10 15:54:53 +00:00
visibility = [ "*" ]
configs += [ ":bwe_test_logging" ]
sources = [
"include/network_changed_observer.h",
"include/receive_side_congestion_controller.h",
"include/send_side_congestion_controller.h",
"include/send_side_congestion_controller_interface.h",
"receive_side_congestion_controller.cc",
"send_side_congestion_controller.cc",
]
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 = [
":transport_feedback",
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:13:32 +00:00
"..:module_api",
"../..:webrtc_common",
"../../api:scoped_refptr",
"../../api/transport:field_trial_based_config",
"../../api/transport:network_control",
"../../api/transport:webrtc_key_value_config",
"../../api/units:data_rate",
"../../api/units:timestamp",
"../../rtc_base:checks",
"../../rtc_base:deprecation",
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:13:32 +00:00
"../../rtc_base:rate_limiter",
"../../rtc_base/experiments:rate_control_settings",
"../../rtc_base/network:sent_packet",
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:13:32 +00:00
"../../system_wrappers",
"../../system_wrappers:field_trial",
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:13:32 +00:00
"../bitrate_controller",
"../pacing",
"../remote_bitrate_estimator",
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:13:32 +00:00
"../rtp_rtcp:rtp_rtcp_format",
"goog_cc:delay_based_bwe",
"goog_cc:estimators",
"goog_cc:probe_controller",
"goog_cc:pushback_controller",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
if (!build_with_mozilla) {
deps += [ "../../rtc_base:rtc_base" ]
}
}
rtc_static_library("transport_feedback") {
visibility = [ "*" ]
sources = [
"transport_feedback_adapter.cc",
"transport_feedback_adapter.h",
]
deps = [
"../../api/transport:network_control",
"../../api/units:data_size",
Revert "Revert "Revert "Reland "Moved congestion controller to task queue."""" This reverts commit 65792c5a5c542201f7b9feefded505842692e6ed. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Revert "Reland "Moved congestion controller to task queue.""" > > This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. > > Reason for revert: <INSERT REASONING HERE> > > Original change's description: > > Revert "Reland "Moved congestion controller to task queue."" > > > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > > > Original change's description: > > > Reland "Moved congestion controller to task queue." > > > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > > > Original change's description: > > > > Moved congestion controller to task queue. > > > > > > > > The goal of this work is to make it easier to experiment with the > > > > bandwidth estimation implementation. For this reason network control > > > > functionality is moved from SendSideCongestionController(SSCC), > > > > PacedSender and BitrateController to the newly created > > > > GoogCcNetworkController which implements the newly created > > > > NetworkControllerInterface. This allows the implementation to be > > > > replaced at runtime in the future. > > > > > > > > This is the first part of a split of a larger CL, see: > > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > > For further explanations. > > > > > > > > Bug: webrtc:8415 > > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > > > Bug: webrtc:8415 > > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21899} > > > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > > > # Not skipping CQ checks because original CL landed > 1 day ago. > > > > Bug: webrtc:8415 > > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > > Reviewed-on: https://webrtc-review.googlesource.com/52980 > > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#22017} > > TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8415 > Reviewed-on: https://webrtc-review.googlesource.com/53262 > Reviewed-by: Sebastian Jansson <srte@webrtc.org> > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22023} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: Id68ad986ee51142b7be3381d0793709b4392fe2c No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53360 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22024}
2018-02-14 16:53:38 +00:00
"../../modules:module_api",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
Revert "Revert "Revert "Reland "Moved congestion controller to task queue."""" This reverts commit 65792c5a5c542201f7b9feefded505842692e6ed. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Revert "Reland "Moved congestion controller to task queue.""" > > This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. > > Reason for revert: <INSERT REASONING HERE> > > Original change's description: > > Revert "Reland "Moved congestion controller to task queue."" > > > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > > > Original change's description: > > > Reland "Moved congestion controller to task queue." > > > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > > > Original change's description: > > > > Moved congestion controller to task queue. > > > > > > > > The goal of this work is to make it easier to experiment with the > > > > bandwidth estimation implementation. For this reason network control > > > > functionality is moved from SendSideCongestionController(SSCC), > > > > PacedSender and BitrateController to the newly created > > > > GoogCcNetworkController which implements the newly created > > > > NetworkControllerInterface. This allows the implementation to be > > > > replaced at runtime in the future. > > > > > > > > This is the first part of a split of a larger CL, see: > > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > > For further explanations. > > > > > > > > Bug: webrtc:8415 > > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > > > Bug: webrtc:8415 > > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21899} > > > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > > > # Not skipping CQ checks because original CL landed > 1 day ago. > > > > Bug: webrtc:8415 > > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > > Reviewed-on: https://webrtc-review.googlesource.com/52980 > > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#22017} > > TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8415 > Reviewed-on: https://webrtc-review.googlesource.com/53262 > Reviewed-by: Sebastian Jansson <srte@webrtc.org> > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22023} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: Id68ad986ee51142b7be3381d0793709b4392fe2c No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53360 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22024}
2018-02-14 16:53:38 +00:00
"../../system_wrappers:system_wrappers",
"../rtp_rtcp:rtp_rtcp_format",
"rtp:transport_feedback",
]
}
if (rtc_include_tests) {
rtc_source_set("test_controller_printer") {
testonly = true
sources = [
"test/controller_printer.cc",
"test/controller_printer.h",
]
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 = [
"../../api/transport:network_control",
"../../api/units:data_rate",
"../../api/units:data_size",
"../../api/units:time_delta",
"../../api/units:timestamp",
"../../rtc_base:checks",
"../../test/logging:log_writer",
"//third_party/abseil-cpp/absl/types:optional",
]
}
rtc_source_set("congestion_controller_unittests") {
testonly = true
sources = [
"receive_side_congestion_controller_unittest.cc",
"send_side_congestion_controller_unittest.cc",
"transport_feedback_adapter_unittest.cc",
]
deps = [
":congestion_controller",
":mock_congestion_controller",
":transport_feedback",
"../../logging:mocks",
"../../rtc_base:checks",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../rtc_base/network:sent_packet",
"../../system_wrappers",
"../../test:field_trial",
"../../test:test_support",
Revert "Revert "Revert "Reland "Moved congestion controller to task queue."""" This reverts commit 65792c5a5c542201f7b9feefded505842692e6ed. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Revert "Reland "Moved congestion controller to task queue.""" > > This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. > > Reason for revert: <INSERT REASONING HERE> > > Original change's description: > > Revert "Reland "Moved congestion controller to task queue."" > > > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > > > Original change's description: > > > Reland "Moved congestion controller to task queue." > > > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > > > Original change's description: > > > > Moved congestion controller to task queue. > > > > > > > > The goal of this work is to make it easier to experiment with the > > > > bandwidth estimation implementation. For this reason network control > > > > functionality is moved from SendSideCongestionController(SSCC), > > > > PacedSender and BitrateController to the newly created > > > > GoogCcNetworkController which implements the newly created > > > > NetworkControllerInterface. This allows the implementation to be > > > > replaced at runtime in the future. > > > > > > > > This is the first part of a split of a larger CL, see: > > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > > For further explanations. > > > > > > > > Bug: webrtc:8415 > > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > > > Bug: webrtc:8415 > > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21899} > > > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > > > # Not skipping CQ checks because original CL landed > 1 day ago. > > > > Bug: webrtc:8415 > > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > > Reviewed-on: https://webrtc-review.googlesource.com/52980 > > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#22017} > > TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8415 > Reviewed-on: https://webrtc-review.googlesource.com/53262 > Reviewed-by: Sebastian Jansson <srte@webrtc.org> > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22023} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: Id68ad986ee51142b7be3381d0793709b4392fe2c No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53360 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22024}
2018-02-14 16:53:38 +00:00
"../bitrate_controller:bitrate_controller",
"../bitrate_controller:mocks",
"../pacing:mock_paced_sender",
"../pacing:pacing",
"../remote_bitrate_estimator:remote_bitrate_estimator",
"../rtp_rtcp:rtp_rtcp_format",
"bbr:bbr_unittests",
"goog_cc:estimators",
"goog_cc:goog_cc_unittests",
"pcc:pcc_unittests",
"rtp:congestion_controller_unittests",
]
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("mock_congestion_controller") {
testonly = true
sources = [
"include/mock/mock_congestion_observer.h",
]
deps = [
":congestion_controller",
"../../test:test_support",
]
}
}