From ceb7b36d3a1228c5b7a20ddfb51e12b34ae1e111 Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Tue, 19 Apr 2022 17:35:04 +0200 Subject: [PATCH] Move byte_buffer out of rtc_base_approved Bug: webrtc:9838 Change-Id: Ic7e912cba1218f1eed794cb8c393ac148106b16c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/259310 Reviewed-by: Harald Alvestrand Commit-Queue: Florent Castelli Cr-Commit-Position: refs/heads/main@{#36634} --- api/transport/BUILD.gn | 2 ++ modules/rtp_rtcp/BUILD.gn | 1 + p2p/BUILD.gn | 4 ++++ pc/BUILD.gn | 2 ++ rtc_base/BUILD.gn | 20 ++++++++++++++++++-- test/fuzzers/BUILD.gn | 1 + video/BUILD.gn | 2 ++ 7 files changed, 30 insertions(+), 2 deletions(-) diff --git a/api/transport/BUILD.gn b/api/transport/BUILD.gn index 1f1f5ca529..127452f7a2 100644 --- a/api/transport/BUILD.gn +++ b/api/transport/BUILD.gn @@ -99,6 +99,7 @@ rtc_source_set("stun_types") { deps = [ "../../api:array_view", + "../../rtc_base:byte_buffer", "../../rtc_base:byte_order", "../../rtc_base:checks", "../../rtc_base:ip_address", @@ -142,6 +143,7 @@ if (rtc_include_tests) { deps = [ ":stun_types", "../../rtc_base", + "../../rtc_base:byte_buffer", "../../rtc_base:byte_order", "../../rtc_base:macromagic", "../../rtc_base:rtc_base_approved", diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn index f0ef4bbaa3..5ae567c4ff 100644 --- a/modules/rtp_rtcp/BUILD.gn +++ b/modules/rtp_rtcp/BUILD.gn @@ -297,6 +297,7 @@ rtc_library("rtp_rtcp") { "../../rtc_base:bit_buffer", "../../rtc_base:bitstream_reader", "../../rtc_base:buffer", + "../../rtc_base:byte_buffer", "../../rtc_base:checks", "../../rtc_base:divide_round", "../../rtc_base:gtest_prod", diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn index 393c301fd5..e590220220 100644 --- a/p2p/BUILD.gn +++ b/p2p/BUILD.gn @@ -104,6 +104,7 @@ rtc_library("rtc_p2p") { "../rtc_base:async_resolver_interface", "../rtc_base:buffer", "../rtc_base:buffer_queue", + "../rtc_base:byte_buffer", "../rtc_base:byte_order", "../rtc_base:callback_list", "../rtc_base:checks", @@ -258,6 +259,7 @@ if (rtc_include_tests) { "../api/units:time_delta", "../rtc_base", "../rtc_base:buffer", + "../rtc_base:byte_buffer", "../rtc_base:checks", "../rtc_base:gunit_helpers", "../rtc_base:ip_address", @@ -305,6 +307,7 @@ rtc_library("p2p_server_utils") { "../api:sequence_checker", "../api/transport:stun_types", "../rtc_base", + "../rtc_base:byte_buffer", "../rtc_base:checks", "../rtc_base:logging", "../rtc_base:rtc_base_tests_utils", @@ -334,6 +337,7 @@ rtc_library("libstunprober") { "../api/transport:stun_types", "../rtc_base", "../rtc_base:async_resolver_interface", + "../rtc_base:byte_buffer", "../rtc_base:checks", "../rtc_base:ip_address", "../rtc_base:logging", diff --git a/pc/BUILD.gn b/pc/BUILD.gn index 7e5b352ed9..df86e4c083 100644 --- a/pc/BUILD.gn +++ b/pc/BUILD.gn @@ -546,6 +546,7 @@ rtc_source_set("sctp_utils") { "../api:priority", "../api/transport:datagram_transport_interface", "../media:rtc_media_base", + "../rtc_base:byte_buffer", "../rtc_base:logging", "../rtc_base:rtc_base_approved", ] @@ -2381,6 +2382,7 @@ if (rtc_include_tests && !build_with_chromium) { "../modules/rtp_rtcp:rtp_rtcp_format", "../p2p:fake_port_allocator", "../p2p:p2p_server_utils", + "../rtc_base:byte_buffer", "../rtc_base:checks", "../rtc_base:gunit_helpers", "../rtc_base:ip_address", diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index cb3aaf009f..4acea37b75 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -85,6 +85,7 @@ rtc_library("rtc_base_approved") { ":bit_buffer", ":buffer", ":buffer_queue", + ":byte_buffer", ":byte_order", ":checks", ":histogram_percentile_counter", @@ -132,8 +133,7 @@ rtc_library("rtc_base_approved") { "bit_buffer.h", # Transitional, use :bit_buffer "buffer.h", # Transitional, use :buffer "buffer_queue.h", # Transitional, use :buffer_queue - "byte_buffer.cc", - "byte_buffer.h", + "byte_buffer.h", # Transitional, use :byte_buffer "byte_order.h", # Transitional, use :byte_order "copy_on_write_buffer.cc", "copy_on_write_buffer.h", @@ -263,6 +263,19 @@ rtc_library("bit_buffer") { absl_deps = [ "//third_party/abseil-cpp/absl/numeric:bits" ] } +rtc_library("byte_buffer") { + visibility = [ "*" ] + sources = [ + "byte_buffer.cc", + "byte_buffer.h", + ] + deps = [ + ":buffer", + ":byte_order", + ] + absl_deps = [ "//third_party/abseil-cpp/absl/strings" ] +} + rtc_library("buffer_queue") { visibility = [ "*" ] sources = [ @@ -1128,6 +1141,7 @@ rtc_library("rtc_base") { ":async_resolver_interface", ":async_socket", ":buffer", + ":byte_buffer", ":byte_order", ":callback_list", ":checks", @@ -1430,6 +1444,7 @@ rtc_library("rtc_base_tests_utils") { ] deps = [ ":async_socket", + ":byte_buffer", ":checks", ":ip_address", ":location", @@ -1620,6 +1635,7 @@ if (rtc_include_tests) { ":bounded_inline_vector", ":buffer", ":buffer_queue", + ":byte_buffer", ":byte_order", ":checks", ":criticalsection", diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn index d079000836..a0c45d4b96 100644 --- a/test/fuzzers/BUILD.gn +++ b/test/fuzzers/BUILD.gn @@ -130,6 +130,7 @@ webrtc_fuzzer_test("forward_error_correction_fuzzer") { "../../api:scoped_refptr", "../../modules/rtp_rtcp", "../../modules/rtp_rtcp:rtp_rtcp_format", + "../../rtc_base:byte_buffer", "../../rtc_base:rtc_base_approved", ] } diff --git a/video/BUILD.gn b/video/BUILD.gn index 615b1ebcdf..c6386ac179 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -925,6 +925,7 @@ if (rtc_include_tests) { "../modules/video_coding:webrtc_vp9_helpers", "../modules/video_coding/codecs/av1:libaom_av1_encoder_if_supported", "../rtc_base", + "../rtc_base:byte_buffer", "../rtc_base:checks", "../rtc_base:gunit_helpers", "../rtc_base:location", @@ -1003,6 +1004,7 @@ if (rtc_include_tests) { "../modules/utility", "../modules/video_coding", "../modules/video_coding:video_codec_interface", + "../rtc_base:byte_buffer", "../rtc_base:location", "../rtc_base:logging", "../rtc_base:rtc_base_approved",