From 6bb1fd358be6479b8a894333443c959814d750dd Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Tue, 19 Apr 2022 15:58:39 +0200 Subject: [PATCH] Move rate_statistics out of rtc_base_approved Bug: webrtc:9838 Change-Id: Ia5a45291a403097c0527d50ced85c3881653fa37 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/259306 Reviewed-by: Harald Alvestrand Commit-Queue: Florent Castelli Cr-Commit-Position: refs/heads/main@{#36627} --- common_video/BUILD.gn | 1 + modules/remote_bitrate_estimator/BUILD.gn | 1 + modules/rtp_rtcp/BUILD.gn | 2 ++ modules/video_coding/BUILD.gn | 2 ++ rtc_base/BUILD.gn | 21 +++++++++++++++++++-- rtc_tools/BUILD.gn | 1 + video/BUILD.gn | 5 +++++ 7 files changed, 31 insertions(+), 2 deletions(-) diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn index 268519ccd7..e1068c3b1d 100644 --- a/common_video/BUILD.gn +++ b/common_video/BUILD.gn @@ -62,6 +62,7 @@ rtc_library("common_video") { "../rtc_base:logging", "../rtc_base:macromagic", "../rtc_base:race_checker", + "../rtc_base:rate_statistics", "../rtc_base:refcount", "../rtc_base:rtc_task_queue", "../rtc_base:safe_minmax", diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn index 30b3124703..6b7da43b5d 100644 --- a/modules/remote_bitrate_estimator/BUILD.gn +++ b/modules/remote_bitrate_estimator/BUILD.gn @@ -59,6 +59,7 @@ rtc_library("remote_bitrate_estimator") { "../../rtc_base:macromagic", "../../rtc_base:platform_thread", "../../rtc_base:race_checker", + "../../rtc_base:rate_statistics", "../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_numerics", "../../rtc_base:safe_minmax", diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn index f170caf1ea..afae083efc 100644 --- a/modules/rtp_rtcp/BUILD.gn +++ b/modules/rtp_rtcp/BUILD.gn @@ -305,6 +305,7 @@ rtc_library("rtp_rtcp") { "../../rtc_base:race_checker", "../../rtc_base:random", "../../rtc_base:rate_limiter", + "../../rtc_base:rate_statistics", "../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_numerics", "../../rtc_base:safe_conversions", @@ -358,6 +359,7 @@ rtc_source_set("rtp_rtcp_legacy") { "../../rtc_base:gtest_prod", "../../rtc_base:logging", "../../rtc_base:macromagic", + "../../rtc_base:rate_statistics", "../../rtc_base:rtc_base_approved", "../../rtc_base/synchronization:mutex", "../../system_wrappers", diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index 9581941ba7..3107777ef2 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -528,6 +528,7 @@ rtc_library("video_coding_utility") { "../../rtc_base:bitstream_reader", "../../rtc_base:checks", "../../rtc_base:logging", + "../../rtc_base:rate_statistics", "../../rtc_base:refcount", "../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_numerics", @@ -729,6 +730,7 @@ rtc_library("webrtc_vp8_temporal_layers") { "../../rtc_base:checks", "../../rtc_base:logging", "../../rtc_base:macromagic", + "../../rtc_base:rate_statistics", "../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_numerics", "../../rtc_base:timeutils", diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 2d754f958f..a06570a047 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -95,6 +95,7 @@ rtc_library("rtc_base_approved") { ":platform_thread_types", ":race_checker", ":random", + ":rate_statistics", ":rate_tracker", ":refcount", ":rtc_event", @@ -145,8 +146,7 @@ rtc_library("rtc_base_approved") { "one_time_event.h", # Transitional, use :one_time_event "race_checker.h", # Transitional, use :race_checker "random.h", # Transitional, use :random - "rate_statistics.cc", - "rate_statistics.h", + "rate_statistics.h", # Transitional, use :rate_statistics "rate_tracker.h", # Transitional, use :rate_tracker "strong_alias.h", # Transitional, use :strong_alias "swap_queue.h", # Transitional, use :swap_queue @@ -287,6 +287,21 @@ rtc_library("random") { ] } +rtc_library("rate_statistics") { + visibility = [ "*" ] + sources = [ + "rate_statistics.cc", + "rate_statistics.h", + ] + deps = [ + ":checks", + ":logging", + ":safe_conversions", + "system:rtc_export", + ] + absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] +} + rtc_library("rate_tracker") { visibility = [ "*" ] sources = [ @@ -505,6 +520,7 @@ rtc_library("rate_limiter") { ] deps = [ ":macromagic", + ":rate_statistics", ":rtc_base_approved", "../system_wrappers", "synchronization:mutex", @@ -1577,6 +1593,7 @@ if (rtc_include_tests) { ":platform_thread", ":random", ":rate_limiter", + ":rate_statistics", ":rate_tracker", ":refcount", ":rtc_base", diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn index 0a48f602d9..d3bcf44745 100644 --- a/rtc_tools/BUILD.gn +++ b/rtc_tools/BUILD.gn @@ -384,6 +384,7 @@ if (!build_with_chromium) { "../rtc_base:ignore_wundef", "../rtc_base:logging", "../rtc_base:macromagic", + "../rtc_base:rate_statistics", "../rtc_base:refcount", # TODO(kwiberg): Remove this dependency. diff --git a/video/BUILD.gn b/video/BUILD.gn index a22f079a18..615b1ebcdf 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -119,6 +119,7 @@ rtc_library("video") { "../rtc_base:moving_max_counter", "../rtc_base:platform_thread", "../rtc_base:rate_limiter", + "../rtc_base:rate_statistics", "../rtc_base:rate_tracker", "../rtc_base:rtc_base", "../rtc_base:rtc_base_approved", @@ -217,6 +218,7 @@ rtc_source_set("video_legacy") { "../rtc_base:macromagic", "../rtc_base:moving_max_counter", "../rtc_base:platform_thread", + "../rtc_base:rate_statistics", "../rtc_base:rate_tracker", "../rtc_base:rtc_base_approved", "../rtc_base:rtc_numerics", @@ -312,6 +314,7 @@ rtc_library("frame_cadence_adapter") { "../rtc_base:logging", "../rtc_base:macromagic", "../rtc_base:race_checker", + "../rtc_base:rate_statistics", "../rtc_base:rtc_base_approved", "../rtc_base:timeutils", "../rtc_base/synchronization:mutex", @@ -494,6 +497,7 @@ rtc_library("video_stream_encoder_impl") { "../rtc_base:logging", "../rtc_base:macromagic", "../rtc_base:race_checker", + "../rtc_base:rate_statistics", "../rtc_base:refcount", "../rtc_base:rtc_base_approved", "../rtc_base:rtc_event", @@ -928,6 +932,7 @@ if (rtc_include_tests) { "../rtc_base:macromagic", "../rtc_base:platform_thread", "../rtc_base:rate_limiter", + "../rtc_base:rate_statistics", "../rtc_base:refcount", "../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_tests_utils",