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

98 lines
3.0 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")
rtc_static_library("bitrate_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 = [ "*" ]
sources = [
"bitrate_controller.cc",
"bitrate_controller_impl.cc",
"bitrate_controller_impl.h",
"include/bitrate_controller.h",
"loss_based_bandwidth_estimation.cc",
"loss_based_bandwidth_estimation.h",
"send_side_bandwidth_estimation.cc",
"send_side_bandwidth_estimation.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" ]
}
deps = [
"..:module_api",
"../../api/transport:network_control",
"../../api/units:data_rate",
"../../api/units:time_delta",
"../../api/units:timestamp",
"../../logging:rtc_event_bwe",
"../../logging:rtc_event_log_api",
"../../rtc_base:checks",
"../../rtc_base:deprecation",
"../../rtc_base:rtc_base_approved",
"../../rtc_base/experiments:field_trial_parser",
"../../system_wrappers",
"../../system_wrappers:field_trial",
"../../system_wrappers:metrics",
"../congestion_controller/goog_cc:delay_based_bwe",
"../pacing",
"../remote_bitrate_estimator:remote_bitrate_estimator",
"../rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",
"//third_party/abseil-cpp/absl/memory",
Reland "Reland "Using units in SendSideBandwidthEstimation."" This reverts commit a4de9c8b04ce9f7b1c4be639edd6cc4d3a9f07a1. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Using units in SendSideBandwidthEstimation."" > > This reverts commit e2cb26cb4fa2a3ce7c12636225ba9c720d7c7e56. > > Reason for revert: <INSERT REASONING HERE> > > Original change's description: > > Reland "Using units in SendSideBandwidthEstimation." > > > > This reverts commit 917e5967a597fa8d6e6cae9ffccb21e3d35d553b. > > > > Reason for revert: Handling downstream use case. > > > > Original change's description: > > > Revert "Using units in SendSideBandwidthEstimation." > > > > > > This reverts commit 35b5e5f3b0dc409bf571b3609860ad5bb8e00c29. > > > > > > Reason for revert: Breaks downstream project > > > > > > Original change's description: > > > > Using units in SendSideBandwidthEstimation. > > > > > > > > This CL moves SendSideBandwidthEstimation to use the unit types > > > > DataRate, TimeDelta and Timestamp. This prepares for upcoming changes. > > > > > > > > Bug: webrtc:9718 > > > > Change-Id: If10e329920dda037b53055ff3352ae7f8d7e32b8 > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/104021 > > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > > Cr-Commit-Position: refs/heads/master@{#25029} > > > > > > TBR=terelius@webrtc.org,srte@webrtc.org > > > > > > No-Try: True > > > Bug: webrtc:9718 > > > Change-Id: Iaf470f1eec9911ee6fc7c1b4f5db9675d89d3780 > > > Reviewed-on: https://webrtc-review.googlesource.com/c/104480 > > > Commit-Queue: Oleh Prypin <oprypin@webrtc.org> > > > Reviewed-by: Oleh Prypin <oprypin@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#25035} > > > > TBR=oprypin@webrtc.org,terelius@webrtc.org,srte@webrtc.org > > > > Change-Id: I0940791fcd1e196598b0f0a2ec779c49931ee5df > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: webrtc:9718 > > Reviewed-on: https://webrtc-review.googlesource.com/c/104520 > > Reviewed-by: Sebastian Jansson <srte@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#25036} > > TBR=oprypin@webrtc.org,terelius@webrtc.org,srte@webrtc.org > > Change-Id: I6628771c79fc78dfd856649ae92232e95df63495 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:9718 > Reviewed-on: https://webrtc-review.googlesource.com/c/104540 > Reviewed-by: Sebastian Jansson <srte@webrtc.org> > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#25037} TBR=oprypin@webrtc.org,terelius@webrtc.org,srte@webrtc.org Change-Id: If5473859cea725420afce11b6683fa0c70a29b0a No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9718 Reviewed-on: https://webrtc-review.googlesource.com/c/104501 Commit-Queue: Sebastian Jansson <srte@webrtc.org> Reviewed-by: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25039}
2018-10-08 11:00:50 +02:00
"//third_party/abseil-cpp/absl/types:optional",
]
}
if (rtc_include_tests) {
rtc_source_set("mocks") {
testonly = true
sources = [
"include/mock/mock_bitrate_controller.h",
]
deps = [
":bitrate_controller",
"../../test:test_support",
]
}
rtc_source_set("bitrate_controller_unittests") {
testonly = true
sources = [
"bitrate_controller_unittest.cc",
"send_side_bandwidth_estimation_unittest.cc",
]
deps = [
":bitrate_controller",
"../../logging:mocks",
"../../logging:rtc_event_bwe",
"../../logging:rtc_event_log_api",
"../../system_wrappers:system_wrappers",
"../../test:field_trial",
"../../test:test_support",
"../congestion_controller/goog_cc:delay_based_bwe",
"../pacing:mock_paced_sender",
"../pacing:pacing",
"../remote_bitrate_estimator:remote_bitrate_estimator",
"../rtp_rtcp:rtp_rtcp_format",
]
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" ]
}
}
}