diff --git a/logging/BUILD.gn b/logging/BUILD.gn index 8e94920ea1..e9237b748a 100644 --- a/logging/BUILD.gn +++ b/logging/BUILD.gn @@ -37,6 +37,7 @@ rtc_source_set("rtc_event_log_parse_status") { sources = [ "rtc_event_log/events/rtc_event_log_parse_status.h" ] deps = [ "../rtc_base:checks", + "//third_party/abseil-cpp/absl/base:core_headers", "//third_party/abseil-cpp/absl/strings:string_view", ] } @@ -63,6 +64,7 @@ rtc_library("rtc_event_field") { "../rtc_base:bitstream_reader", "../rtc_base:checks", "../rtc_base:logging", + "//third_party/abseil-cpp/absl/base:core_headers", "//third_party/abseil-cpp/absl/strings:string_view", "//third_party/abseil-cpp/absl/types:optional", ] @@ -90,6 +92,8 @@ rtc_library("rtc_event_pacing") { deps = [ ":rtc_event_field", + ":rtc_event_log_parse_status", + "../api:array_view", "../api/rtc_event_log", "../api/units:timestamp", "//third_party/abseil-cpp/absl/memory", @@ -114,7 +118,9 @@ rtc_library("rtc_event_audio") { deps = [ ":rtc_event_field", + ":rtc_event_log_parse_status", ":rtc_stream_config", + "../api:array_view", "../api/rtc_event_log", "../api/units:timestamp", "../modules/audio_coding:audio_network_adaptor_config", @@ -133,6 +139,7 @@ rtc_library("rtc_event_begin_end") { ] deps = [ ":rtc_event_field", + ":rtc_event_log_parse_status", "../api:array_view", "../api/rtc_event_log", "../api/units:timestamp", @@ -160,10 +167,13 @@ rtc_library("rtc_event_bwe") { deps = [ ":rtc_event_field", + ":rtc_event_log_parse_status", + "../api:array_view", "../api/rtc_event_log", "../api/transport:bandwidth_usage", "../api/units:data_rate", "../api/units:timestamp", + "../rtc_base:checks", "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/strings:string_view", "//third_party/abseil-cpp/absl/types:optional", @@ -178,6 +188,8 @@ rtc_library("rtc_event_frame_events") { ] deps = [ ":rtc_event_field", + ":rtc_event_log_parse_status", + "../api:array_view", "../api/rtc_event_log", "../api/units:timestamp", "../api/video:video_frame", @@ -199,6 +211,8 @@ rtc_library("rtc_event_generic_packet_events") { ] deps = [ ":rtc_event_field", + ":rtc_event_log_parse_status", + "../api:array_view", "../api/rtc_event_log", "../api/units:timestamp", "../rtc_base:timeutils", @@ -224,6 +238,7 @@ rtc_library("rtc_event_rtp_rtcp") { deps = [ ":rtc_event_field", + ":rtc_event_log_parse_status", "../api:array_view", "../api:rtp_headers", "../api/rtc_event_log", @@ -247,7 +262,9 @@ rtc_library("rtc_event_video") { deps = [ ":rtc_event_field", + ":rtc_event_log_parse_status", ":rtc_stream_config", + "../api:array_view", "../api/rtc_event_log", "../api/units:timestamp", "../rtc_base:checks", @@ -363,7 +380,13 @@ rtc_library("rtc_event_log_impl_encoder") { ":rtc_event_video", ":rtc_stream_config", "../api:array_view", + "../api:candidate", + "../api:dtls_transport_interface", + "../api/rtc_event_log:rtc_event_log", "../api/transport:bandwidth_usage", + "../api/units:timestamp", + "../api/video:video_frame", + "../api/video:video_rtp_headers", "../modules/audio_coding:audio_network_adaptor", "../modules/rtp_rtcp:rtp_rtcp_format", ] @@ -390,9 +413,11 @@ if (rtc_enable_protobuf) { ":rtc_event_log_optional_blob_encoding", ":rtc_event_log_parse_status", ":rtc_event_log_proto", # Why does this need to be included here? + "../api:array_view", "../rtc_base:bitstream_reader", "../rtc_base:checks", "../rtc_base:logging", + "//third_party/abseil-cpp/absl/strings:string_view", "//third_party/abseil-cpp/absl/types:optional", ] } @@ -401,7 +426,8 @@ if (rtc_enable_protobuf) { if (rtc_enable_protobuf) { rtc_source_set("rtc_event_log2_proto_include") { sources = [ "rtc_event_log/rtc_event_log2_proto_include.h" ] - deps = [ ":rtc_event_log2_proto" ] + public_deps += # no-presubmit-check TODO(webrtc:8603) + [ ":rtc_event_log2_proto" ] } } @@ -440,6 +466,7 @@ if (rtc_enable_protobuf) { "../rtc_base:safe_conversions", "../rtc_base:safe_minmax", "../rtc_base:timeutils", + "../rtc_base/synchronization:mutex", "../rtc_base/system:no_unique_address", "//third_party/abseil-cpp/absl/strings:string_view", ] @@ -456,6 +483,7 @@ rtc_library("fake_rtc_event_log") { ] deps = [ + "../api:libjingle_logging_api", "../api/environment", "../api/rtc_event_log", "../rtc_base:macromagic", @@ -499,12 +527,15 @@ if (rtc_enable_protobuf) { ":rtc_event_log_blob_encoding", ":rtc_event_log_delta_encoding", ":rtc_event_log_impl_encoder", + ":rtc_event_log_parse_status", ":rtc_event_log_proto", ":rtc_event_number_encodings", ":rtc_event_pacing", ":rtc_event_rtp_rtcp", ":rtc_event_video", ":rtc_stream_config", + "../api:candidate", + "../api:dtls_transport_interface", "../api:function_view", "../api:rtp_headers", "../api:rtp_parameters", @@ -555,12 +586,14 @@ if (rtc_enable_protobuf) { ":dependency_descriptor_encoder_decoder", ":ice_log", ":rtc_event_audio", + ":rtc_event_begin_end", ":rtc_event_bwe", ":rtc_event_field", ":rtc_event_frame_events", ":rtc_event_generic_packet_events", ":rtc_event_log2_proto", ":rtc_event_log2_proto_include", + ":rtc_event_log_api", ":rtc_event_log_blob_encoding", ":rtc_event_log_delta_encoding", ":rtc_event_log_impl", @@ -574,7 +607,10 @@ if (rtc_enable_protobuf) { ":rtc_event_video", ":rtc_stream_config", "../api:array_view", + "../api:candidate", + "../api:dtls_transport_interface", "../api:field_trials_view", + "../api:libjingle_logging_api", "../api:rtc_event_log_output_file", "../api:rtp_headers", "../api:rtp_parameters", @@ -583,17 +619,21 @@ if (rtc_enable_protobuf) { "../api/rtc_event_log", "../api/rtc_event_log:rtc_event_log_factory", "../api/transport:bandwidth_usage", + "../api/units:data_rate", "../api/units:time_delta", "../api/units:timestamp", + "../api/video:video_frame", "../call", "../call:call_interfaces", "../modules/audio_coding:audio_network_adaptor", "../modules/rtp_rtcp:rtp_rtcp_format", "../rtc_base:buffer", "../rtc_base:checks", + "../rtc_base:logging", "../rtc_base:macromagic", "../rtc_base:random", "../rtc_base:rtc_base_tests_utils", + "../rtc_base:safe_conversions", "../rtc_base:timeutils", "../system_wrappers", "../test:explicit_key_value_config", @@ -602,6 +642,7 @@ if (rtc_enable_protobuf) { "../test/logging:log_writer", "../test/time_controller", "//testing/gtest", + "//third_party/abseil-cpp/absl/algorithm:container", "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/strings:string_view", "//third_party/abseil-cpp/absl/types:optional", @@ -614,6 +655,7 @@ if (rtc_enable_protobuf) { sources = [ "rtc_event_log/rtc_event_log2rtp_dump.cc" ] deps = [ ":rtc_event_log_parser", + ":rtc_event_rtp_rtcp", "../api:array_view", "../api:rtp_headers", "../api/rtc_event_log", @@ -651,6 +693,8 @@ rtc_library("ice_log") { deps = [ ":rtc_event_field", + ":rtc_event_log_parse_status", + "../api:array_view", "../api:candidate", "../api:dtls_transport_interface", "../api:libjingle_logging_api", @@ -669,6 +713,7 @@ if (rtc_include_tests) { "rtc_event_log/mock/mock_rtc_event_log.h", ] deps = [ + "../api:libjingle_logging_api", "../api/rtc_event_log", "../test:test_support", ] diff --git a/logging/rtc_event_log/dependency_descriptor_encoder_decoder.cc b/logging/rtc_event_log/dependency_descriptor_encoder_decoder.cc index c74c8c4b63..bac57df023 100644 --- a/logging/rtc_event_log/dependency_descriptor_encoder_decoder.cc +++ b/logging/rtc_event_log/dependency_descriptor_encoder_decoder.cc @@ -10,13 +10,19 @@ #include "logging/rtc_event_log/dependency_descriptor_encoder_decoder.h" +#include +#include #include #include +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" +#include "api/array_view.h" #include "logging/rtc_event_log/encoder/delta_encoding.h" #include "logging/rtc_event_log/encoder/optional_blob_encoding.h" #include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" #include "logging/rtc_event_log/rtc_event_log2_proto_include.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/logging/rtc_event_log/dependency_descriptor_encoder_decoder.h b/logging/rtc_event_log/dependency_descriptor_encoder_decoder.h index 6729a38b6d..863a3c8e9f 100644 --- a/logging/rtc_event_log/dependency_descriptor_encoder_decoder.h +++ b/logging/rtc_event_log/dependency_descriptor_encoder_decoder.h @@ -11,13 +11,14 @@ #ifndef LOGGING_RTC_EVENT_LOG_DEPENDENCY_DESCRIPTOR_ENCODER_DECODER_H_ #define LOGGING_RTC_EVENT_LOG_DEPENDENCY_DESCRIPTOR_ENCODER_DECODER_H_ +#include +#include #include #include "absl/types/optional.h" +#include "api/array_view.h" #include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" #include "logging/rtc_event_log/rtc_event_log2_proto_include.h" -#include "rtc_base/bitstream_reader.h" -#include "rtc_base/checks.h" namespace webrtc { diff --git a/logging/rtc_event_log/dependency_descriptor_encoder_decoder_unittest.cc b/logging/rtc_event_log/dependency_descriptor_encoder_decoder_unittest.cc index 04c7147e28..90f608e4d5 100644 --- a/logging/rtc_event_log/dependency_descriptor_encoder_decoder_unittest.cc +++ b/logging/rtc_event_log/dependency_descriptor_encoder_decoder_unittest.cc @@ -10,12 +10,14 @@ #include "logging/rtc_event_log/dependency_descriptor_encoder_decoder.h" +#include #include #include #include "logging/rtc_event_log/encoder/delta_encoding.h" #include "logging/rtc_event_log/encoder/optional_blob_encoding.h" #include "logging/rtc_event_log/rtc_event_log2_proto_include.h" +#include "rtc_base/checks.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/logging/rtc_event_log/encoder/bit_writer.cc b/logging/rtc_event_log/encoder/bit_writer.cc index e8748d3db3..fd77d3d962 100644 --- a/logging/rtc_event_log/encoder/bit_writer.cc +++ b/logging/rtc_event_log/encoder/bit_writer.cc @@ -10,6 +10,15 @@ #include "logging/rtc_event_log/encoder/bit_writer.h" +#include +#include +#include +#include +#include + +#include "absl/strings/string_view.h" +#include "rtc_base/checks.h" + namespace webrtc { namespace { diff --git a/logging/rtc_event_log/encoder/bit_writer.h b/logging/rtc_event_log/encoder/bit_writer.h index 421e7c4370..a40b7dc512 100644 --- a/logging/rtc_event_log/encoder/bit_writer.h +++ b/logging/rtc_event_log/encoder/bit_writer.h @@ -15,7 +15,6 @@ #include #include -#include #include "absl/strings/string_view.h" #include "rtc_base/bit_buffer.h" diff --git a/logging/rtc_event_log/encoder/blob_encoding.cc b/logging/rtc_event_log/encoder/blob_encoding.cc index 96699dc96a..e2417ad248 100644 --- a/logging/rtc_event_log/encoder/blob_encoding.cc +++ b/logging/rtc_event_log/encoder/blob_encoding.cc @@ -10,8 +10,13 @@ #include "logging/rtc_event_log/encoder/blob_encoding.h" +#include #include +#include +#include +#include +#include "absl/strings/string_view.h" #include "logging/rtc_event_log/encoder/var_int.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/logging/rtc_event_log/encoder/blob_encoding_unittest.cc b/logging/rtc_event_log/encoder/blob_encoding_unittest.cc index a25923f22d..0d8517170a 100644 --- a/logging/rtc_event_log/encoder/blob_encoding_unittest.cc +++ b/logging/rtc_event_log/encoder/blob_encoding_unittest.cc @@ -10,9 +10,11 @@ #include "logging/rtc_event_log/encoder/blob_encoding.h" +#include #include #include +#include "absl/strings/string_view.h" #include "logging/rtc_event_log/encoder/var_int.h" #include "rtc_base/checks.h" #include "test/gtest.h" diff --git a/logging/rtc_event_log/encoder/delta_encoding.cc b/logging/rtc_event_log/encoder/delta_encoding.cc index c80424574c..7d62f4a08f 100644 --- a/logging/rtc_event_log/encoder/delta_encoding.cc +++ b/logging/rtc_event_log/encoder/delta_encoding.cc @@ -11,19 +11,21 @@ #include "logging/rtc_event_log/encoder/delta_encoding.h" #include +#include +#include #include #include -#include +#include +#include #include "absl/memory/memory.h" #include "absl/strings/string_view.h" +#include "absl/types/optional.h" #include "logging/rtc_event_log/encoder/bit_writer.h" #include "logging/rtc_event_log/encoder/var_int.h" -#include "rtc_base/bit_buffer.h" #include "rtc_base/bitstream_reader.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { namespace { diff --git a/logging/rtc_event_log/encoder/delta_encoding_unittest.cc b/logging/rtc_event_log/encoder/delta_encoding_unittest.cc index d0f7fb93db..3a27b24356 100644 --- a/logging/rtc_event_log/encoder/delta_encoding_unittest.cc +++ b/logging/rtc_event_log/encoder/delta_encoding_unittest.cc @@ -11,6 +11,9 @@ #include "logging/rtc_event_log/encoder/delta_encoding.h" #include +#include +#include +#include #include #include #include diff --git a/logging/rtc_event_log/encoder/optional_blob_encoding.cc b/logging/rtc_event_log/encoder/optional_blob_encoding.cc index 81d2c0625b..a0078ee37a 100644 --- a/logging/rtc_event_log/encoder/optional_blob_encoding.cc +++ b/logging/rtc_event_log/encoder/optional_blob_encoding.cc @@ -10,12 +10,16 @@ #include "logging/rtc_event_log/encoder/optional_blob_encoding.h" +#include #include +#include +#include +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" #include "rtc_base/bit_buffer.h" #include "rtc_base/bitstream_reader.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" namespace webrtc { diff --git a/logging/rtc_event_log/encoder/optional_blob_encoding_unittest.cc b/logging/rtc_event_log/encoder/optional_blob_encoding_unittest.cc index bdb876f707..8f0e484418 100644 --- a/logging/rtc_event_log/encoder/optional_blob_encoding_unittest.cc +++ b/logging/rtc_event_log/encoder/optional_blob_encoding_unittest.cc @@ -10,9 +10,11 @@ #include "logging/rtc_event_log/encoder/optional_blob_encoding.h" +#include #include #include +#include "absl/types/optional.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder.h b/logging/rtc_event_log/encoder/rtc_event_log_encoder.h index 3c3dc78990..633663a1e9 100644 --- a/logging/rtc_event_log/encoder/rtc_event_log_encoder.h +++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder.h @@ -11,6 +11,7 @@ #ifndef LOGGING_RTC_EVENT_LOG_ENCODER_RTC_EVENT_LOG_ENCODER_H_ #define LOGGING_RTC_EVENT_LOG_ENCODER_RTC_EVENT_LOG_ENCODER_H_ +#include #include #include #include diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_common.cc b/logging/rtc_event_log/encoder/rtc_event_log_encoder_common.cc index 7aea47611d..54900997e4 100644 --- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_common.cc +++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_common.cc @@ -10,6 +10,8 @@ #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_common.h" +#include + #include "rtc_base/checks.h" namespace webrtc { diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc b/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc index dad51745e4..44ef8b3c9f 100644 --- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc +++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc @@ -12,10 +12,16 @@ #include +#include +#include +#include +#include #include #include "absl/types/optional.h" #include "api/array_view.h" +#include "api/candidate.h" +#include "api/rtc_event_log/rtc_event.h" #include "api/rtp_headers.h" #include "api/rtp_parameters.h" #include "api/transport/bandwidth_usage.h" @@ -41,7 +47,6 @@ #include "logging/rtc_event_log/events/rtc_event_video_send_stream_config.h" #include "logging/rtc_event_log/rtc_stream_config.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" -#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtcp_packet/app.h" #include "modules/rtp_rtcp/source/rtcp_packet/bye.h" #include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" @@ -51,7 +56,7 @@ #include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" #include "modules/rtp_rtcp/source/rtcp_packet/sdes.h" #include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" -#include "modules/rtp_rtcp/source/rtp_packet.h" +#include "rtc_base/buffer.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.h b/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.h index 33c530789b..26a332b763 100644 --- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.h +++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.h @@ -11,11 +11,14 @@ #ifndef LOGGING_RTC_EVENT_LOG_ENCODER_RTC_EVENT_LOG_ENCODER_LEGACY_H_ #define LOGGING_RTC_EVENT_LOG_ENCODER_RTC_EVENT_LOG_ENCODER_LEGACY_H_ +#include +#include #include #include #include #include "api/array_view.h" +#include "api/rtc_event_log/rtc_event.h" #include "logging/rtc_event_log/encoder/rtc_event_log_encoder.h" #include "rtc_base/buffer.h" diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc b/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc index ff9573faf2..6c57328ba0 100644 --- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc +++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc @@ -10,12 +10,27 @@ #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.h" +#include +#include +#include +#include +#include +#include +#include #include +#include #include "absl/types/optional.h" #include "api/array_view.h" +#include "api/candidate.h" +#include "api/dtls_transport_interface.h" #include "api/field_trials_view.h" +#include "api/rtc_event_log/rtc_event.h" +#include "api/rtp_headers.h" +#include "api/rtp_parameters.h" #include "api/transport/bandwidth_usage.h" +#include "api/video/video_codec_type.h" +#include "api/video/video_rotation.h" #include "logging/rtc_event_log/dependency_descriptor_encoder_decoder.h" #include "logging/rtc_event_log/encoder/blob_encoding.h" #include "logging/rtc_event_log/encoder/delta_encoding.h" @@ -50,7 +65,6 @@ #include "logging/rtc_event_log/rtc_stream_config.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" #include "modules/rtp_rtcp/include/rtp_cvo.h" -#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtcp_packet/app.h" #include "modules/rtp_rtcp/source/rtcp_packet/bye.h" #include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" @@ -62,9 +76,8 @@ #include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" #include "modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.h" #include "modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "modules/rtp_rtcp/source/rtp_packet.h" +#include "rtc_base/buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" // *.pb.h files are generated at build-time by the protobuf compiler. #ifdef WEBRTC_ANDROID_PLATFORM_BUILD diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.h b/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.h index 6a657090dd..5ad4ea8f6f 100644 --- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.h +++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.h @@ -11,6 +11,7 @@ #ifndef LOGGING_RTC_EVENT_LOG_ENCODER_RTC_EVENT_LOG_ENCODER_NEW_FORMAT_H_ #define LOGGING_RTC_EVENT_LOG_ENCODER_RTC_EVENT_LOG_ENCODER_NEW_FORMAT_H_ +#include #include #include #include @@ -19,6 +20,7 @@ #include "api/array_view.h" #include "api/field_trials_view.h" +#include "api/rtc_event_log/rtc_event.h" #include "logging/rtc_event_log/encoder/rtc_event_log_encoder.h" namespace webrtc { diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc b/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc index 72611db8ce..161eb6b4e0 100644 --- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc +++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc @@ -8,16 +8,30 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include "logging/rtc_event_log/encoder/rtc_event_log_encoder.h" + +#include +#include +#include +#include #include #include +#include #include #include #include +#include +#include #include "api/field_trials_view.h" +#include "api/rtc_event_log/rtc_event.h" +#include "api/rtc_event_log/rtc_event_log.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.h" #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.h" #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_v3.h" +#include "logging/rtc_event_log/events/logged_rtp_rtcp.h" #include "logging/rtc_event_log/events/rtc_event_alr_state.h" #include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h" #include "logging/rtc_event_log/events/rtc_event_audio_playout.h" @@ -25,6 +39,7 @@ #include "logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h" #include "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h" #include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h" +#include "logging/rtc_event_log/events/rtc_event_frame_decoded.h" #include "logging/rtc_event_log/events/rtc_event_probe_cluster_created.h" #include "logging/rtc_event_log/events/rtc_event_probe_result_failure.h" #include "logging/rtc_event_log/events/rtc_event_probe_result_success.h" @@ -37,10 +52,24 @@ #include "logging/rtc_event_log/rtc_event_log_parser.h" #include "logging/rtc_event_log/rtc_event_log_unittest_helper.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtcp_packet/bye.h" -#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" +#include "modules/rtp_rtcp/source/rtcp_packet/fir.h" +#include "modules/rtp_rtcp/source/rtcp_packet/loss_notification.h" +#include "modules/rtp_rtcp/source/rtcp_packet/nack.h" +#include "modules/rtp_rtcp/source/rtcp_packet/pli.h" +#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/remb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "rtc_base/buffer.h" #include "rtc_base/fake_clock.h" +#include "rtc_base/logging.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/random.h" +#include "rtc_base/time_utils.h" #include "test/explicit_key_value_config.h" #include "test/gtest.h" diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_v3.cc b/logging/rtc_event_log/encoder/rtc_event_log_encoder_v3.cc index 131aae1de8..2a5ed41278 100644 --- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_v3.cc +++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_v3.cc @@ -10,12 +10,15 @@ #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_v3.h" +#include +#include +#include +#include #include #include -#include "absl/types/optional.h" -#include "logging/rtc_event_log/encoder/rtc_event_log_encoder_common.h" -#include "logging/rtc_event_log/encoder/var_int.h" +#include "api/rtc_event_log/rtc_event.h" +#include "api/units/timestamp.h" #include "logging/rtc_event_log/events/rtc_event_alr_state.h" #include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h" #include "logging/rtc_event_log/events/rtc_event_audio_playout.h" @@ -45,7 +48,6 @@ #include "logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h" #include "logging/rtc_event_log/events/rtc_event_video_send_stream_config.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" namespace webrtc { diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_v3.h b/logging/rtc_event_log/encoder/rtc_event_log_encoder_v3.h index cb796ec562..d96e00b34d 100644 --- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_v3.h +++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_v3.h @@ -11,14 +11,16 @@ #ifndef LOGGING_RTC_EVENT_LOG_ENCODER_RTC_EVENT_LOG_ENCODER_V3_H_ #define LOGGING_RTC_EVENT_LOG_ENCODER_RTC_EVENT_LOG_ENCODER_V3_H_ +#include #include +#include #include #include #include #include "api/array_view.h" +#include "api/rtc_event_log/rtc_event.h" #include "logging/rtc_event_log/encoder/rtc_event_log_encoder.h" -#include "logging/rtc_event_log/events/rtc_event_definition.h" namespace webrtc { diff --git a/logging/rtc_event_log/encoder/var_int.cc b/logging/rtc_event_log/encoder/var_int.cc index a84a233d6b..da88bd9ccc 100644 --- a/logging/rtc_event_log/encoder/var_int.cc +++ b/logging/rtc_event_log/encoder/var_int.cc @@ -10,6 +10,12 @@ #include "logging/rtc_event_log/encoder/var_int.h" +#include +#include +#include +#include + +#include "absl/strings/string_view.h" #include "rtc_base/bitstream_reader.h" #include "rtc_base/checks.h" diff --git a/logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.cc b/logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.cc index 0c93e6226d..0ad49df17b 100644 --- a/logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.cc +++ b/logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.cc @@ -11,10 +11,12 @@ #include "logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.h" #include +#include #include "absl/types/optional.h" #include "api/array_view.h" #include "logging/rtc_event_log/events/rtc_event_field_extraction.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" using webrtc_event_logging::MaxUnsignedValueOfBitWidth; diff --git a/logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.h b/logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.h index 666fae1c63..ce227a08d4 100644 --- a/logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.h +++ b/logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.h @@ -11,6 +11,8 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_FIXED_LENGTH_ENCODING_PARAMETERS_V3_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_FIXED_LENGTH_ENCODING_PARAMETERS_V3_H_ +#include + #include "absl/types/optional.h" #include "api/array_view.h" #include "logging/rtc_event_log/events/rtc_event_field_extraction.h" diff --git a/logging/rtc_event_log/events/logged_rtp_rtcp.h b/logging/rtc_event_log/events/logged_rtp_rtcp.h index fe5fcfd765..b0f2ec3324 100644 --- a/logging/rtc_event_log/events/logged_rtp_rtcp.h +++ b/logging/rtc_event_log/events/logged_rtp_rtcp.h @@ -11,7 +11,9 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_LOGGED_RTP_RTCP_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_LOGGED_RTP_RTCP_H_ -#include +#include +#include +#include #include #include "absl/strings/string_view.h" diff --git a/logging/rtc_event_log/events/rtc_event_alr_state.cc b/logging/rtc_event_log/events/rtc_event_alr_state.cc index 25941eb16b..20fd1fd5d2 100644 --- a/logging/rtc_event_log/events/rtc_event_alr_state.cc +++ b/logging/rtc_event_log/events/rtc_event_alr_state.cc @@ -10,7 +10,14 @@ #include "logging/rtc_event_log/events/rtc_event_alr_state.h" +#include +#include + #include "absl/memory/memory.h" +#include "absl/strings/string_view.h" +#include "api/rtc_event_log/rtc_event.h" +#include "logging/rtc_event_log/events/rtc_event_definition.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { constexpr RtcEvent::Type RtcEventAlrState::kType; diff --git a/logging/rtc_event_log/events/rtc_event_alr_state.h b/logging/rtc_event_log/events/rtc_event_alr_state.h index 9f595ecd90..9c6aee2ccb 100644 --- a/logging/rtc_event_log/events/rtc_event_alr_state.h +++ b/logging/rtc_event_log/events/rtc_event_alr_state.h @@ -11,17 +11,18 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_ALR_STATE_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_ALR_STATE_H_ +#include #include #include #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" #include "logging/rtc_event_log/events/rtc_event_definition.h" #include "logging/rtc_event_log/events/rtc_event_field_encoding.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" -#include "logging/rtc_event_log/events/rtc_event_field_extraction.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.cc b/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.cc index 5f2d55c357..a05e4b4247 100644 --- a/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.cc +++ b/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.cc @@ -10,9 +10,11 @@ #include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h" +#include #include #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" #include "rtc_base/checks.h" diff --git a/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h b/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h index d4cae3abfa..700be2cf9a 100644 --- a/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h +++ b/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h @@ -11,14 +11,16 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_AUDIO_NETWORK_ADAPTATION_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_AUDIO_NETWORK_ADAPTATION_H_ +#include #include #include #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_audio_playout.cc b/logging/rtc_event_log/events/rtc_event_audio_playout.cc index 21a3f9266c..2bc0d71d4c 100644 --- a/logging/rtc_event_log/events/rtc_event_audio_playout.cc +++ b/logging/rtc_event_log/events/rtc_event_audio_playout.cc @@ -10,7 +10,12 @@ #include "logging/rtc_event_log/events/rtc_event_audio_playout.h" +#include +#include + #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" +#include "logging/rtc_event_log/events/rtc_event_definition.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_audio_playout.h b/logging/rtc_event_log/events/rtc_event_audio_playout.h index 196c3ca247..7c02f349f3 100644 --- a/logging/rtc_event_log/events/rtc_event_audio_playout.h +++ b/logging/rtc_event_log/events/rtc_event_audio_playout.h @@ -19,9 +19,12 @@ #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" #include "logging/rtc_event_log/events/rtc_event_definition.h" +#include "logging/rtc_event_log/events/rtc_event_field_encoding.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.cc b/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.cc index 87caaff098..0025d3f4f6 100644 --- a/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.cc +++ b/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.cc @@ -10,9 +10,11 @@ #include "logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h" +#include #include #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" #include "logging/rtc_event_log/rtc_stream_config.h" #include "rtc_base/checks.h" diff --git a/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h b/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h index 9863e235af..a40a3688cc 100644 --- a/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h +++ b/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h @@ -11,14 +11,16 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_AUDIO_RECEIVE_STREAM_CONFIG_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_AUDIO_RECEIVE_STREAM_CONFIG_H_ +#include #include #include #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" #include "logging/rtc_event_log/rtc_stream_config.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.cc b/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.cc index 681ae11e63..36c2695e7a 100644 --- a/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.cc +++ b/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.cc @@ -10,9 +10,11 @@ #include "logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h" +#include #include #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" #include "logging/rtc_event_log/rtc_stream_config.h" #include "rtc_base/checks.h" diff --git a/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h b/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h index 550723bcf0..27521a6884 100644 --- a/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h +++ b/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h @@ -11,13 +11,16 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_AUDIO_SEND_STREAM_CONFIG_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_AUDIO_SEND_STREAM_CONFIG_H_ +#include #include #include #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "api/units/timestamp.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" #include "logging/rtc_event_log/rtc_stream_config.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_begin_log.cc b/logging/rtc_event_log/events/rtc_event_begin_log.cc index 49b9effa9e..0926bac202 100644 --- a/logging/rtc_event_log/events/rtc_event_begin_log.cc +++ b/logging/rtc_event_log/events/rtc_event_begin_log.cc @@ -10,7 +10,17 @@ #include "logging/rtc_event_log/events/rtc_event_begin_log.h" +#include +#include +#include + #include "absl/strings/string_view.h" +#include "api/array_view.h" +#include "api/rtc_event_log/rtc_event.h" +#include "api/units/timestamp.h" +#include "logging/rtc_event_log/events/rtc_event_field_encoding.h" +#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { constexpr RtcEvent::Type RtcEventBeginLog::kType; diff --git a/logging/rtc_event_log/events/rtc_event_begin_log.h b/logging/rtc_event_log/events/rtc_event_begin_log.h index f3b74c117e..0f8a912e5f 100644 --- a/logging/rtc_event_log/events/rtc_event_begin_log.h +++ b/logging/rtc_event_log/events/rtc_event_begin_log.h @@ -11,6 +11,7 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_BEGIN_LOG_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_BEGIN_LOG_H_ +#include #include #include @@ -19,8 +20,7 @@ #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" #include "logging/rtc_event_log/events/rtc_event_field_encoding.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" -#include "logging/rtc_event_log/events/rtc_event_field_extraction.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.cc b/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.cc index 2788511046..44c0e43ade 100644 --- a/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.cc +++ b/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.cc @@ -10,8 +10,13 @@ #include "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h" +#include +#include + #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" #include "api/transport/bandwidth_usage.h" +#include "logging/rtc_event_log/events/rtc_event_definition.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h b/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h index 6d6351e55d..97a41209d0 100644 --- a/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h +++ b/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h @@ -19,10 +19,15 @@ #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/transport/bandwidth_usage.h" #include "api/units/timestamp.h" #include "logging/rtc_event_log/events/rtc_event_definition.h" +#include "logging/rtc_event_log/events/rtc_event_field_encoding.h" +#include "logging/rtc_event_log/events/rtc_event_field_extraction.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.cc b/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.cc index 44524ab033..dc11471956 100644 --- a/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.cc +++ b/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.cc @@ -10,7 +10,11 @@ #include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h" +#include +#include + #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h b/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h index fd41b316e0..fb02af3300 100644 --- a/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h +++ b/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h @@ -18,9 +18,10 @@ #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_definition.h b/logging/rtc_event_log/events/rtc_event_definition.h index 8688c5fc7b..fae9262d92 100644 --- a/logging/rtc_event_log/events/rtc_event_definition.h +++ b/logging/rtc_event_log/events/rtc_event_definition.h @@ -11,18 +11,16 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_DEFINITION_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_DEFINITION_H_ -#include +#include #include #include #include "absl/strings/string_view.h" -#include "absl/types/optional.h" #include "api/array_view.h" -#include "api/units/timestamp.h" +#include "api/rtc_event_log/rtc_event.h" #include "logging/rtc_event_log/events/rtc_event_field_encoding.h" #include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" -#include "logging/rtc_event_log/events/rtc_event_field_extraction.h" -#include "rtc_base/logging.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_dtls_transport_state.cc b/logging/rtc_event_log/events/rtc_event_dtls_transport_state.cc index f00342df72..87bbe59c89 100644 --- a/logging/rtc_event_log/events/rtc_event_dtls_transport_state.cc +++ b/logging/rtc_event_log/events/rtc_event_dtls_transport_state.cc @@ -10,7 +10,11 @@ #include "logging/rtc_event_log/events/rtc_event_dtls_transport_state.h" +#include + #include "absl/memory/memory.h" +#include "api/dtls_transport_interface.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_dtls_transport_state.h b/logging/rtc_event_log/events/rtc_event_dtls_transport_state.h index b9af213256..a242811945 100644 --- a/logging/rtc_event_log/events/rtc_event_dtls_transport_state.h +++ b/logging/rtc_event_log/events/rtc_event_dtls_transport_state.h @@ -11,15 +11,17 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_DTLS_TRANSPORT_STATE_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_DTLS_TRANSPORT_STATE_H_ +#include #include #include #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/dtls_transport_interface.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_dtls_writable_state.cc b/logging/rtc_event_log/events/rtc_event_dtls_writable_state.cc index d4cb093ce6..4fb50ebcaa 100644 --- a/logging/rtc_event_log/events/rtc_event_dtls_writable_state.cc +++ b/logging/rtc_event_log/events/rtc_event_dtls_writable_state.cc @@ -10,7 +10,10 @@ #include "logging/rtc_event_log/events/rtc_event_dtls_writable_state.h" +#include + #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_dtls_writable_state.h b/logging/rtc_event_log/events/rtc_event_dtls_writable_state.h index c820f184d7..fec4cd46ad 100644 --- a/logging/rtc_event_log/events/rtc_event_dtls_writable_state.h +++ b/logging/rtc_event_log/events/rtc_event_dtls_writable_state.h @@ -11,14 +11,16 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_DTLS_WRITABLE_STATE_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_DTLS_WRITABLE_STATE_H_ +#include #include #include #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_end_log.cc b/logging/rtc_event_log/events/rtc_event_end_log.cc index 52abf9e842..1397b55b93 100644 --- a/logging/rtc_event_log/events/rtc_event_end_log.cc +++ b/logging/rtc_event_log/events/rtc_event_end_log.cc @@ -10,7 +10,17 @@ #include "logging/rtc_event_log/events/rtc_event_end_log.h" +#include +#include +#include + #include "absl/strings/string_view.h" +#include "api/array_view.h" +#include "api/rtc_event_log/rtc_event.h" +#include "api/units/timestamp.h" +#include "logging/rtc_event_log/events/rtc_event_field_encoding.h" +#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { constexpr RtcEvent::Type RtcEventEndLog::kType; diff --git a/logging/rtc_event_log/events/rtc_event_end_log.h b/logging/rtc_event_log/events/rtc_event_end_log.h index 79648bdb8d..e043c00291 100644 --- a/logging/rtc_event_log/events/rtc_event_end_log.h +++ b/logging/rtc_event_log/events/rtc_event_end_log.h @@ -11,7 +11,7 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_END_LOG_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_END_LOG_H_ -#include +#include #include #include @@ -20,8 +20,7 @@ #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" #include "logging/rtc_event_log/events/rtc_event_field_encoding.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" -#include "logging/rtc_event_log/events/rtc_event_field_extraction.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_field_encoding.cc b/logging/rtc_event_log/events/rtc_event_field_encoding.cc index 68188ce856..87132c933e 100644 --- a/logging/rtc_event_log/events/rtc_event_field_encoding.cc +++ b/logging/rtc_event_log/events/rtc_event_field_encoding.cc @@ -10,16 +10,21 @@ #include "logging/rtc_event_log/events/rtc_event_field_encoding.h" -#include +#include +#include #include -#include -#include +#include +#include +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" +#include "api/array_view.h" +#include "api/rtc_event_log/rtc_event.h" #include "logging/rtc_event_log/encoder/bit_writer.h" #include "logging/rtc_event_log/encoder/var_int.h" +#include "logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.h" #include "logging/rtc_event_log/events/rtc_event_field_extraction.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" using webrtc_event_logging::UnsignedDelta; diff --git a/logging/rtc_event_log/events/rtc_event_field_encoding.h b/logging/rtc_event_log/events/rtc_event_field_encoding.h index 33b77b80f5..21a4b413a0 100644 --- a/logging/rtc_event_log/events/rtc_event_field_encoding.h +++ b/logging/rtc_event_log/events/rtc_event_field_encoding.h @@ -11,16 +11,19 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_FIELD_ENCODING_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_FIELD_ENCODING_H_ +#include +#include #include +#include #include +#include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" -#include "logging/rtc_event_log/encoder/rtc_event_log_encoder_common.h" #include "logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.h" #include "logging/rtc_event_log/events/rtc_event_field_extraction.h" -#include "rtc_base/logging.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_field_encoding_parser.cc b/logging/rtc_event_log/events/rtc_event_field_encoding_parser.cc index f0cdf8a0f7..f55b25d7cc 100644 --- a/logging/rtc_event_log/events/rtc_event_field_encoding_parser.cc +++ b/logging/rtc_event_log/events/rtc_event_field_encoding_parser.cc @@ -11,10 +11,18 @@ #include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include +#include +#include +#include + #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include "api/array_view.h" #include "logging/rtc_event_log/encoder/var_int.h" +#include "logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.h" #include "logging/rtc_event_log/events/rtc_event_field_encoding.h" +#include "logging/rtc_event_log/events/rtc_event_field_extraction.h" #include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" #include "rtc_base/bitstream_reader.h" #include "rtc_base/checks.h" diff --git a/logging/rtc_event_log/events/rtc_event_field_encoding_parser.h b/logging/rtc_event_log/events/rtc_event_field_encoding_parser.h index 89dbb19298..a47cc3c64b 100644 --- a/logging/rtc_event_log/events/rtc_event_field_encoding_parser.h +++ b/logging/rtc_event_log/events/rtc_event_field_encoding_parser.h @@ -11,12 +11,22 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_FIELD_ENCODING_PARSER_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_FIELD_ENCODING_PARSER_H_ +#include +#include #include +#include #include +#include "absl/base/attributes.h" #include "absl/strings/string_view.h" +#include "absl/types/optional.h" +#include "api/array_view.h" +#include "api/units/timestamp.h" +#include "logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.h" #include "logging/rtc_event_log/events/rtc_event_field_encoding.h" +#include "logging/rtc_event_log/events/rtc_event_field_extraction.h" #include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_field_encoding_unittest.cc b/logging/rtc_event_log/events/rtc_event_field_encoding_unittest.cc index 18beda1417..62004e8835 100644 --- a/logging/rtc_event_log/events/rtc_event_field_encoding_unittest.cc +++ b/logging/rtc_event_log/events/rtc_event_field_encoding_unittest.cc @@ -8,14 +8,22 @@ */ #include "logging/rtc_event_log/events/rtc_event_field_encoding.h" +#include +#include +#include #include -#include #include +#include +#include +#include #include "absl/strings/string_view.h" +#include "absl/types/optional.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "logging/rtc_event_log/encoder/var_int.h" #include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "rtc_base/checks.h" #include "test/gtest.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_field_extraction.cc b/logging/rtc_event_log/events/rtc_event_field_extraction.cc index 99f0b3697c..987a9abe10 100644 --- a/logging/rtc_event_log/events/rtc_event_field_extraction.cc +++ b/logging/rtc_event_log/events/rtc_event_field_extraction.cc @@ -11,6 +11,7 @@ #include "logging/rtc_event_log/events/rtc_event_field_extraction.h" #include +#include #include #include "rtc_base/checks.h" diff --git a/logging/rtc_event_log/events/rtc_event_field_extraction.h b/logging/rtc_event_log/events/rtc_event_field_extraction.h index eb9d67f1c2..9a8a1740e2 100644 --- a/logging/rtc_event_log/events/rtc_event_field_extraction.h +++ b/logging/rtc_event_log/events/rtc_event_field_extraction.h @@ -11,13 +11,10 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_FIELD_EXTRACTION_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_FIELD_EXTRACTION_H_ -#include +#include +#include #include -#include "absl/types/optional.h" -#include "api/array_view.h" -#include "api/rtc_event_log/rtc_event.h" -#include "api/units/timestamp.h" #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_common.h" #include "rtc_base/logging.h" diff --git a/logging/rtc_event_log/events/rtc_event_field_extraction_unittest.cc b/logging/rtc_event_log/events/rtc_event_field_extraction_unittest.cc index f9fb993af0..09f924a532 100644 --- a/logging/rtc_event_log/events/rtc_event_field_extraction_unittest.cc +++ b/logging/rtc_event_log/events/rtc_event_field_extraction_unittest.cc @@ -9,6 +9,8 @@ #include "logging/rtc_event_log/events/rtc_event_field_extraction.h" +#include + #include "rtc_base/random.h" #include "test/gtest.h" diff --git a/logging/rtc_event_log/events/rtc_event_frame_decoded.cc b/logging/rtc_event_log/events/rtc_event_frame_decoded.cc index cde412e6c4..e5604c87ae 100644 --- a/logging/rtc_event_log/events/rtc_event_frame_decoded.cc +++ b/logging/rtc_event_log/events/rtc_event_frame_decoded.cc @@ -10,7 +10,12 @@ #include "logging/rtc_event_log/events/rtc_event_frame_decoded.h" +#include +#include + #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" +#include "api/video/video_codec_type.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_frame_decoded.h b/logging/rtc_event_log/events/rtc_event_frame_decoded.h index 91190faea9..62d711bee6 100644 --- a/logging/rtc_event_log/events/rtc_event_frame_decoded.h +++ b/logging/rtc_event_log/events/rtc_event_frame_decoded.h @@ -19,10 +19,11 @@ #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" #include "api/video/video_codec_type.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_generic_ack_received.cc b/logging/rtc_event_log/events/rtc_event_generic_ack_received.cc index ba18d50ab6..e5aa375776 100644 --- a/logging/rtc_event_log/events/rtc_event_generic_ack_received.cc +++ b/logging/rtc_event_log/events/rtc_event_generic_ack_received.cc @@ -10,9 +10,13 @@ #include "logging/rtc_event_log/events/rtc_event_generic_ack_received.h" +#include +#include #include #include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/rtc_event_log/rtc_event.h" #include "rtc_base/time_utils.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_generic_ack_received.h b/logging/rtc_event_log/events/rtc_event_generic_ack_received.h index 57fd7cd9a6..16b2a9ea7c 100644 --- a/logging/rtc_event_log/events/rtc_event_generic_ack_received.h +++ b/logging/rtc_event_log/events/rtc_event_generic_ack_received.h @@ -11,15 +11,17 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_GENERIC_ACK_RECEIVED_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_GENERIC_ACK_RECEIVED_H_ +#include #include #include #include #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_generic_packet_received.cc b/logging/rtc_event_log/events/rtc_event_generic_packet_received.cc index 0bdc4dd505..19f9d8fdf4 100644 --- a/logging/rtc_event_log/events/rtc_event_generic_packet_received.cc +++ b/logging/rtc_event_log/events/rtc_event_generic_packet_received.cc @@ -10,6 +10,10 @@ #include "logging/rtc_event_log/events/rtc_event_generic_packet_received.h" +#include +#include +#include + #include "absl/memory/memory.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_generic_packet_received.h b/logging/rtc_event_log/events/rtc_event_generic_packet_received.h index a6006ca4d4..aeed84a5e2 100644 --- a/logging/rtc_event_log/events/rtc_event_generic_packet_received.h +++ b/logging/rtc_event_log/events/rtc_event_generic_packet_received.h @@ -11,14 +11,17 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_GENERIC_PACKET_RECEIVED_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_GENERIC_PACKET_RECEIVED_H_ +#include +#include #include #include #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_generic_packet_sent.cc b/logging/rtc_event_log/events/rtc_event_generic_packet_sent.cc index e8335624b1..e7c5046cec 100644 --- a/logging/rtc_event_log/events/rtc_event_generic_packet_sent.cc +++ b/logging/rtc_event_log/events/rtc_event_generic_packet_sent.cc @@ -10,6 +10,10 @@ #include "logging/rtc_event_log/events/rtc_event_generic_packet_sent.h" +#include +#include +#include + #include "absl/memory/memory.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_generic_packet_sent.h b/logging/rtc_event_log/events/rtc_event_generic_packet_sent.h index 903950a398..cb8fce60cb 100644 --- a/logging/rtc_event_log/events/rtc_event_generic_packet_sent.h +++ b/logging/rtc_event_log/events/rtc_event_generic_packet_sent.h @@ -11,14 +11,17 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_GENERIC_PACKET_SENT_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_GENERIC_PACKET_SENT_H_ +#include +#include #include #include #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.cc b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.cc index 2b4b5ba762..15f1351408 100644 --- a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.cc +++ b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.cc @@ -10,7 +10,11 @@ #include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h" +#include +#include + #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h index bdacf15a59..d99812483a 100644 --- a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h +++ b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h @@ -18,9 +18,10 @@ #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.cc b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.cc index 59d76e7a03..fa3984ae68 100644 --- a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.cc +++ b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.cc @@ -10,7 +10,12 @@ #include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h" +#include +#include + #include "absl/memory/memory.h" +#include "api/candidate.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h index 8198659cb2..1c006f931e 100644 --- a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h +++ b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h @@ -18,10 +18,11 @@ #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/candidate.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_log_parse_status.h b/logging/rtc_event_log/events/rtc_event_log_parse_status.h index e7d6de7d60..6c41a97086 100644 --- a/logging/rtc_event_log/events/rtc_event_log_parse_status.h +++ b/logging/rtc_event_log/events/rtc_event_log_parse_status.h @@ -12,8 +12,8 @@ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_LOG_PARSE_STATUS_H_ #include -#include +#include "absl/base/attributes.h" #include "absl/strings/string_view.h" #include "rtc_base/checks.h" diff --git a/logging/rtc_event_log/events/rtc_event_neteq_set_minimum_delay.cc b/logging/rtc_event_log/events/rtc_event_neteq_set_minimum_delay.cc index 7b958c181b..61d01b054e 100644 --- a/logging/rtc_event_log/events/rtc_event_neteq_set_minimum_delay.cc +++ b/logging/rtc_event_log/events/rtc_event_neteq_set_minimum_delay.cc @@ -12,14 +12,7 @@ #include -#include -#include -#include -#include -#include "api/rtc_event_log/rtc_event.h" -#include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_definition.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_neteq_set_minimum_delay.h b/logging/rtc_event_log/events/rtc_event_neteq_set_minimum_delay.h index 2e49adb36e..7e0f0be255 100644 --- a/logging/rtc_event_log/events/rtc_event_neteq_set_minimum_delay.h +++ b/logging/rtc_event_log/events/rtc_event_neteq_set_minimum_delay.h @@ -13,16 +13,11 @@ #include -#include #include -#include -#include #include "absl/memory/memory.h" -#include "absl/strings/string_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_definition.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_probe_cluster_created.cc b/logging/rtc_event_log/events/rtc_event_probe_cluster_created.cc index c3d9e59b47..a3bb8246e6 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_cluster_created.cc +++ b/logging/rtc_event_log/events/rtc_event_probe_cluster_created.cc @@ -10,7 +10,11 @@ #include "logging/rtc_event_log/events/rtc_event_probe_cluster_created.h" +#include +#include + #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h b/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h index ae6810c39d..b927f1e52d 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h +++ b/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h @@ -18,9 +18,10 @@ #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_probe_result_failure.cc b/logging/rtc_event_log/events/rtc_event_probe_result_failure.cc index a79b0c173d..9e77a01c6c 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_result_failure.cc +++ b/logging/rtc_event_log/events/rtc_event_probe_result_failure.cc @@ -10,7 +10,11 @@ #include "logging/rtc_event_log/events/rtc_event_probe_result_failure.h" +#include +#include + #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_probe_result_failure.h b/logging/rtc_event_log/events/rtc_event_probe_result_failure.h index 1aa6e75cb7..ca57d08481 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_result_failure.h +++ b/logging/rtc_event_log/events/rtc_event_probe_result_failure.h @@ -18,9 +18,10 @@ #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_probe_result_success.cc b/logging/rtc_event_log/events/rtc_event_probe_result_success.cc index e7bc7c25da..80dc70f75c 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_result_success.cc +++ b/logging/rtc_event_log/events/rtc_event_probe_result_success.cc @@ -10,7 +10,11 @@ #include "logging/rtc_event_log/events/rtc_event_probe_result_success.h" +#include +#include + #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_probe_result_success.h b/logging/rtc_event_log/events/rtc_event_probe_result_success.h index 49d1abec5a..60f9023dc5 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_result_success.h +++ b/logging/rtc_event_log/events/rtc_event_probe_result_success.h @@ -18,9 +18,10 @@ #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_remote_estimate.h b/logging/rtc_event_log/events/rtc_event_remote_estimate.h index 4a39ecc597..78366aa760 100644 --- a/logging/rtc_event_log/events/rtc_event_remote_estimate.h +++ b/logging/rtc_event_log/events/rtc_event_remote_estimate.h @@ -10,16 +10,17 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_REMOTE_ESTIMATE_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_REMOTE_ESTIMATE_H_ -#include +#include #include #include #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/data_rate.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_route_change.cc b/logging/rtc_event_log/events/rtc_event_route_change.cc index 71bd78b346..78312288b6 100644 --- a/logging/rtc_event_log/events/rtc_event_route_change.cc +++ b/logging/rtc_event_log/events/rtc_event_route_change.cc @@ -10,7 +10,11 @@ #include "logging/rtc_event_log/events/rtc_event_route_change.h" +#include +#include + #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_route_change.h b/logging/rtc_event_log/events/rtc_event_route_change.h index bc1461d7bb..5ff2b29475 100644 --- a/logging/rtc_event_log/events/rtc_event_route_change.h +++ b/logging/rtc_event_log/events/rtc_event_route_change.h @@ -11,14 +11,16 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_ROUTE_CHANGE_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_ROUTE_CHANGE_H_ +#include #include #include #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.cc b/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.cc index 0ea700a024..09bed642b7 100644 --- a/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.cc +++ b/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.cc @@ -10,7 +10,12 @@ #include "logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h" +#include +#include + #include "absl/memory/memory.h" +#include "api/array_view.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h b/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h index 84fe398e08..8d2cecaee5 100644 --- a/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h +++ b/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h @@ -21,7 +21,7 @@ #include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "logging/rtc_event_log/events/logged_rtp_rtcp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" #include "rtc_base/buffer.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.cc b/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.cc index b6a41ac034..c16b95b67c 100644 --- a/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.cc +++ b/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.cc @@ -10,7 +10,12 @@ #include "logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h" +#include +#include + #include "absl/memory/memory.h" +#include "api/array_view.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h b/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h index 687bd319b4..f3cf1f55d8 100644 --- a/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h +++ b/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h @@ -21,7 +21,7 @@ #include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "logging/rtc_event_log/events/logged_rtp_rtcp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" #include "rtc_base/buffer.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.cc b/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.cc index 4cf33a238f..978713abb7 100644 --- a/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.cc +++ b/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.cc @@ -10,9 +10,11 @@ #include "logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h" +#include + #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" -#include "rtc_base/checks.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h b/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h index 66ea167a1c..9b9e725e82 100644 --- a/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h +++ b/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h @@ -23,7 +23,7 @@ #include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "logging/rtc_event_log/events/logged_rtp_rtcp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" #include "modules/rtp_rtcp/source/rtp_packet.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.cc b/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.cc index a6a4d99702..4094dca2d8 100644 --- a/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.cc +++ b/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.cc @@ -10,9 +10,11 @@ #include "logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h" +#include + #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "rtc_base/checks.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h b/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h index 4f4be04445..d4004a4f93 100644 --- a/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h +++ b/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h @@ -23,7 +23,7 @@ #include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "logging/rtc_event_log/events/logged_rtp_rtcp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" #include "modules/rtp_rtcp/source/rtp_packet.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.cc b/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.cc index 90ab8185a3..c6b4686863 100644 --- a/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.cc +++ b/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.cc @@ -10,9 +10,12 @@ #include "logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h" +#include #include #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" +#include "logging/rtc_event_log/rtc_stream_config.h" #include "rtc_base/checks.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h b/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h index 0be56c2065..d506fc76f2 100644 --- a/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h +++ b/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h @@ -11,14 +11,16 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_VIDEO_RECEIVE_STREAM_CONFIG_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_VIDEO_RECEIVE_STREAM_CONFIG_H_ +#include #include #include #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" #include "logging/rtc_event_log/rtc_stream_config.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_video_send_stream_config.cc b/logging/rtc_event_log/events/rtc_event_video_send_stream_config.cc index c28a476d01..05f729cbf4 100644 --- a/logging/rtc_event_log/events/rtc_event_video_send_stream_config.cc +++ b/logging/rtc_event_log/events/rtc_event_video_send_stream_config.cc @@ -10,9 +10,12 @@ #include "logging/rtc_event_log/events/rtc_event_video_send_stream_config.h" +#include #include #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" +#include "logging/rtc_event_log/rtc_stream_config.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_video_send_stream_config.h b/logging/rtc_event_log/events/rtc_event_video_send_stream_config.h index f1717b19ea..f007055600 100644 --- a/logging/rtc_event_log/events/rtc_event_video_send_stream_config.h +++ b/logging/rtc_event_log/events/rtc_event_video_send_stream_config.h @@ -11,14 +11,16 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_VIDEO_SEND_STREAM_CONFIG_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_VIDEO_SEND_STREAM_CONFIG_H_ +#include #include #include #include #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "api/rtc_event_log/rtc_event.h" #include "api/units/timestamp.h" -#include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" #include "logging/rtc_event_log/rtc_stream_config.h" namespace webrtc { diff --git a/logging/rtc_event_log/fake_rtc_event_log.cc b/logging/rtc_event_log/fake_rtc_event_log.cc index 5a44b00694..836492fa9b 100644 --- a/logging/rtc_event_log/fake_rtc_event_log.cc +++ b/logging/rtc_event_log/fake_rtc_event_log.cc @@ -10,10 +10,12 @@ #include "logging/rtc_event_log/fake_rtc_event_log.h" +#include #include #include -#include "api/rtc_event_log/rtc_event_log.h" +#include "api/rtc_event_log/rtc_event.h" +#include "api/rtc_event_log_output.h" #include "rtc_base/synchronization/mutex.h" namespace webrtc { diff --git a/logging/rtc_event_log/fake_rtc_event_log.h b/logging/rtc_event_log/fake_rtc_event_log.h index effa7507f1..bdeff8aa2b 100644 --- a/logging/rtc_event_log/fake_rtc_event_log.h +++ b/logging/rtc_event_log/fake_rtc_event_log.h @@ -11,11 +11,13 @@ #ifndef LOGGING_RTC_EVENT_LOG_FAKE_RTC_EVENT_LOG_H_ #define LOGGING_RTC_EVENT_LOG_FAKE_RTC_EVENT_LOG_H_ +#include #include #include #include "api/rtc_event_log/rtc_event.h" #include "api/rtc_event_log/rtc_event_log.h" +#include "api/rtc_event_log_output.h" #include "rtc_base/synchronization/mutex.h" #include "rtc_base/thread_annotations.h" diff --git a/logging/rtc_event_log/fake_rtc_event_log_factory.cc b/logging/rtc_event_log/fake_rtc_event_log_factory.cc index bacc3cd1cb..cbc6c89420 100644 --- a/logging/rtc_event_log/fake_rtc_event_log_factory.cc +++ b/logging/rtc_event_log/fake_rtc_event_log_factory.cc @@ -12,6 +12,8 @@ #include +#include "absl/base/nullability.h" +#include "api/environment/environment.h" #include "api/rtc_event_log/rtc_event_log.h" #include "logging/rtc_event_log/fake_rtc_event_log.h" diff --git a/logging/rtc_event_log/ice_logger.cc b/logging/rtc_event_log/ice_logger.cc index daa7057439..a0ddfd92f3 100644 --- a/logging/rtc_event_log/ice_logger.cc +++ b/logging/rtc_event_log/ice_logger.cc @@ -10,9 +10,12 @@ #include "logging/rtc_event_log/ice_logger.h" +#include #include #include "api/rtc_event_log/rtc_event_log.h" +#include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h" +#include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h" namespace webrtc { diff --git a/logging/rtc_event_log/ice_logger.h b/logging/rtc_event_log/ice_logger.h index 0dea43bf9d..43857c716e 100644 --- a/logging/rtc_event_log/ice_logger.h +++ b/logging/rtc_event_log/ice_logger.h @@ -11,6 +11,7 @@ #ifndef LOGGING_RTC_EVENT_LOG_ICE_LOGGER_H_ #define LOGGING_RTC_EVENT_LOG_ICE_LOGGER_H_ +#include #include #include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h" diff --git a/logging/rtc_event_log/mock/mock_rtc_event_log.h b/logging/rtc_event_log/mock/mock_rtc_event_log.h index 646831de27..4a41572dfa 100644 --- a/logging/rtc_event_log/mock/mock_rtc_event_log.h +++ b/logging/rtc_event_log/mock/mock_rtc_event_log.h @@ -11,9 +11,12 @@ #ifndef LOGGING_RTC_EVENT_LOG_MOCK_MOCK_RTC_EVENT_LOG_H_ #define LOGGING_RTC_EVENT_LOG_MOCK_MOCK_RTC_EVENT_LOG_H_ +#include #include +#include "api/rtc_event_log/rtc_event.h" #include "api/rtc_event_log/rtc_event_log.h" +#include "api/rtc_event_log_output.h" #include "test/gmock.h" namespace webrtc { diff --git a/logging/rtc_event_log/rtc_event_log2rtp_dump.cc b/logging/rtc_event_log/rtc_event_log2rtp_dump.cc index a845fcb0c2..6a4dd58366 100644 --- a/logging/rtc_event_log/rtc_event_log2rtp_dump.cc +++ b/logging/rtc_event_log/rtc_event_log2rtp_dump.cc @@ -13,19 +13,18 @@ #include #include +#include // no-presubmit-check TODO(webrtc:8982): #include -#include #include #include "absl/flags/flag.h" #include "absl/flags/parse.h" #include "absl/flags/usage.h" -#include "absl/memory/memory.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "api/array_view.h" -#include "api/rtc_event_log/rtc_event_log.h" #include "api/rtp_headers.h" +#include "logging/rtc_event_log/events/logged_rtp_rtcp.h" #include "logging/rtc_event_log/rtc_event_log_parser.h" #include "logging/rtc_event_log/rtc_event_processor.h" #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" diff --git a/logging/rtc_event_log/rtc_event_log_impl.cc b/logging/rtc_event_log/rtc_event_log_impl.cc index 5cafe8a711..19746cfb1b 100644 --- a/logging/rtc_event_log/rtc_event_log_impl.cc +++ b/logging/rtc_event_log/rtc_event_log_impl.cc @@ -10,24 +10,31 @@ #include "logging/rtc_event_log/rtc_event_log_impl.h" +#include +#include #include -#include +#include #include +#include #include -#include #include "absl/strings/string_view.h" #include "api/environment/environment.h" #include "api/field_trials_view.h" +#include "api/rtc_event_log/rtc_event.h" +#include "api/rtc_event_log/rtc_event_log.h" +#include "api/rtc_event_log_output.h" +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_base.h" #include "api/units/time_delta.h" +#include "logging/rtc_event_log/encoder/rtc_event_log_encoder.h" #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.h" #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.h" #include "rtc_base/checks.h" #include "rtc_base/event.h" #include "rtc_base/logging.h" -#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/numerics/safe_minmax.h" +#include "rtc_base/synchronization/mutex.h" #include "rtc_base/time_utils.h" namespace webrtc { diff --git a/logging/rtc_event_log/rtc_event_log_impl.h b/logging/rtc_event_log/rtc_event_log_impl.h index 2c4ef8d7ed..3070034528 100644 --- a/logging/rtc_event_log/rtc_event_log_impl.h +++ b/logging/rtc_event_log/rtc_event_log_impl.h @@ -14,8 +14,8 @@ #include #include #include +#include #include -#include #include "absl/strings/string_view.h" #include "api/environment/environment.h" @@ -26,6 +26,7 @@ #include "api/task_queue/task_queue_base.h" #include "api/task_queue/task_queue_factory.h" #include "logging/rtc_event_log/encoder/rtc_event_log_encoder.h" +#include "rtc_base/synchronization/mutex.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/thread_annotations.h" diff --git a/logging/rtc_event_log/rtc_event_log_impl_unittest.cc b/logging/rtc_event_log/rtc_event_log_impl_unittest.cc index 1e8799bdd6..6ab2d2f6dc 100644 --- a/logging/rtc_event_log/rtc_event_log_impl_unittest.cc +++ b/logging/rtc_event_log/rtc_event_log_impl_unittest.cc @@ -10,9 +10,20 @@ #include "logging/rtc_event_log/rtc_event_log_impl.h" +#include +#include +#include +#include +#include #include -#include +#include "absl/strings/string_view.h" +#include "api/rtc_event_log/rtc_event.h" +#include "api/rtc_event_log_output.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" +#include "logging/rtc_event_log/encoder/rtc_event_log_encoder.h" +#include "rtc_base/checks.h" #include "test/gmock.h" #include "test/gtest.h" #include "test/time_controller/simulated_time_controller.h" diff --git a/logging/rtc_event_log/rtc_event_log_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc index 3e4f6fd191..f1e4878e96 100644 --- a/logging/rtc_event_log/rtc_event_log_parser.cc +++ b/logging/rtc_event_log/rtc_event_log_parser.cc @@ -16,26 +16,77 @@ #include #include #include +#include +#include +#include #include +#include -#include "absl/memory/memory.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include "api/candidate.h" +#include "api/dtls_transport_interface.h" +#include "api/rtc_event_log/rtc_event.h" #include "api/rtc_event_log/rtc_event_log.h" #include "api/rtp_headers.h" #include "api/rtp_parameters.h" #include "api/transport/bandwidth_usage.h" +#include "api/units/data_rate.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" +#include "api/video/video_codec_type.h" #include "logging/rtc_event_log/dependency_descriptor_encoder_decoder.h" #include "logging/rtc_event_log/encoder/blob_encoding.h" #include "logging/rtc_event_log/encoder/delta_encoding.h" #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_common.h" #include "logging/rtc_event_log/encoder/var_int.h" #include "logging/rtc_event_log/events/logged_rtp_rtcp.h" +#include "logging/rtc_event_log/events/rtc_event_alr_state.h" +#include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h" +#include "logging/rtc_event_log/events/rtc_event_audio_playout.h" +#include "logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h" +#include "logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h" +#include "logging/rtc_event_log/events/rtc_event_begin_log.h" +#include "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h" +#include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h" +#include "logging/rtc_event_log/events/rtc_event_dtls_transport_state.h" +#include "logging/rtc_event_log/events/rtc_event_dtls_writable_state.h" +#include "logging/rtc_event_log/events/rtc_event_end_log.h" +#include "logging/rtc_event_log/events/rtc_event_frame_decoded.h" +#include "logging/rtc_event_log/events/rtc_event_generic_ack_received.h" +#include "logging/rtc_event_log/events/rtc_event_generic_packet_received.h" +#include "logging/rtc_event_log/events/rtc_event_generic_packet_sent.h" +#include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h" +#include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" +#include "logging/rtc_event_log/events/rtc_event_probe_cluster_created.h" +#include "logging/rtc_event_log/events/rtc_event_probe_result_failure.h" +#include "logging/rtc_event_log/events/rtc_event_probe_result_success.h" +#include "logging/rtc_event_log/events/rtc_event_remote_estimate.h" +#include "logging/rtc_event_log/events/rtc_event_route_change.h" +#include "logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h" +#include "logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h" +#include "logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h" +#include "logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h" +#include "logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h" +#include "logging/rtc_event_log/events/rtc_event_video_send_stream_config.h" +#include "logging/rtc_event_log/rtc_event_log.pb.h" +#include "logging/rtc_event_log/rtc_event_log2.pb.h" #include "logging/rtc_event_log/rtc_event_processor.h" -#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "logging/rtc_event_log/rtc_stream_config.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" #include "modules/rtp_rtcp/include/rtp_cvo.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/source/rtcp_packet/bye.h" +#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" +#include "modules/rtp_rtcp/source/rtcp_packet/fir.h" +#include "modules/rtp_rtcp/source/rtcp_packet/nack.h" +#include "modules/rtp_rtcp/source/rtcp_packet/pli.h" +#include "modules/rtp_rtcp/source/rtcp_packet/psfb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" #include "modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.h" #include "modules/rtp_rtcp/source/rtp_header_extensions.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" diff --git a/logging/rtc_event_log/rtc_event_log_parser.h b/logging/rtc_event_log/rtc_event_log_parser.h index c24e5e8186..f974f04d47 100644 --- a/logging/rtc_event_log/rtc_event_log_parser.h +++ b/logging/rtc_event_log/rtc_event_log_parser.h @@ -10,18 +10,23 @@ #ifndef LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_PARSER_H_ #define LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_PARSER_H_ +#include +#include #include #include #include #include -#include +#include #include #include "absl/base/attributes.h" #include "absl/strings/string_view.h" -#include "api/rtc_event_log/rtc_event_log.h" -#include "call/video_receive_stream.h" -#include "call/video_send_stream.h" +#include "api/candidate.h" +#include "api/dtls_transport_interface.h" +#include "api/rtp_parameters.h" +#include "api/transport/bandwidth_usage.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "logging/rtc_event_log/events/logged_rtp_rtcp.h" #include "logging/rtc_event_log/events/rtc_event_alr_state.h" #include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h" @@ -40,20 +45,18 @@ #include "logging/rtc_event_log/events/rtc_event_generic_packet_sent.h" #include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h" #include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h" +#include "logging/rtc_event_log/events/rtc_event_log_parse_status.h" #include "logging/rtc_event_log/events/rtc_event_neteq_set_minimum_delay.h" #include "logging/rtc_event_log/events/rtc_event_probe_cluster_created.h" #include "logging/rtc_event_log/events/rtc_event_probe_result_failure.h" #include "logging/rtc_event_log/events/rtc_event_probe_result_success.h" #include "logging/rtc_event_log/events/rtc_event_remote_estimate.h" #include "logging/rtc_event_log/events/rtc_event_route_change.h" -#include "logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h" -#include "logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h" -#include "logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h" -#include "logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h" #include "logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h" #include "logging/rtc_event_log/events/rtc_event_video_send_stream_config.h" +#include "logging/rtc_event_log/rtc_stream_config.h" #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "rtc_base/checks.h" // Files generated at build-time by the protobuf compiler. #ifdef WEBRTC_ANDROID_PLATFORM_BUILD diff --git a/logging/rtc_event_log/rtc_event_log_unittest.cc b/logging/rtc_event_log/rtc_event_log_unittest.cc index a3005729ab..df30e6323a 100644 --- a/logging/rtc_event_log/rtc_event_log_unittest.cc +++ b/logging/rtc_event_log/rtc_event_log_unittest.cc @@ -11,6 +11,8 @@ #include "api/rtc_event_log/rtc_event_log.h" #include +#include +#include #include #include #include @@ -22,6 +24,9 @@ #include "api/environment/environment.h" #include "api/environment/environment_factory.h" #include "api/rtc_event_log/rtc_event_log_factory.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" +#include "logging/rtc_event_log/events/rtc_event_alr_state.h" #include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h" #include "logging/rtc_event_log/events/rtc_event_audio_playout.h" #include "logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h" @@ -30,12 +35,17 @@ #include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h" #include "logging/rtc_event_log/events/rtc_event_dtls_transport_state.h" #include "logging/rtc_event_log/events/rtc_event_dtls_writable_state.h" +#include "logging/rtc_event_log/events/rtc_event_frame_decoded.h" #include "logging/rtc_event_log/events/rtc_event_generic_ack_received.h" #include "logging/rtc_event_log/events/rtc_event_generic_packet_received.h" #include "logging/rtc_event_log/events/rtc_event_generic_packet_sent.h" +#include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h" +#include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h" #include "logging/rtc_event_log/events/rtc_event_probe_cluster_created.h" #include "logging/rtc_event_log/events/rtc_event_probe_result_failure.h" #include "logging/rtc_event_log/events/rtc_event_probe_result_success.h" +#include "logging/rtc_event_log/events/rtc_event_remote_estimate.h" +#include "logging/rtc_event_log/events/rtc_event_route_change.h" #include "logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h" #include "logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h" #include "logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h" @@ -44,15 +54,16 @@ #include "logging/rtc_event_log/events/rtc_event_video_send_stream_config.h" #include "logging/rtc_event_log/rtc_event_log_parser.h" #include "logging/rtc_event_log/rtc_event_log_unittest_helper.h" -#include "logging/rtc_event_log/rtc_stream_config.h" #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.h" -#include "modules/rtp_rtcp/source/rtp_header_extensions.h" #include "rtc_base/checks.h" #include "rtc_base/fake_clock.h" #include "rtc_base/random.h" +#include "rtc_base/time_utils.h" #include "test/explicit_key_value_config.h" #include "test/gtest.h" +#include "test/logging/log_writer.h" #include "test/logging/memory_log_writer.h" #include "test/testsupport/file_utils.h" diff --git a/logging/rtc_event_log/rtc_event_log_unittest_helper.cc b/logging/rtc_event_log/rtc_event_log_unittest_helper.cc index b5bfa3bbea..337f7ee052 100644 --- a/logging/rtc_event_log/rtc_event_log_unittest_helper.cc +++ b/logging/rtc_event_log/rtc_event_log_unittest_helper.cc @@ -17,23 +17,70 @@ #include #include #include -#include #include #include +#include "absl/algorithm/container.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "api/array_view.h" +#include "api/candidate.h" +#include "api/dtls_transport_interface.h" +#include "api/rtc_event_log/rtc_event_log.h" #include "api/rtp_headers.h" #include "api/rtp_parameters.h" #include "api/transport/bandwidth_usage.h" +#include "api/units/data_rate.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" +#include "api/video/video_codec_type.h" +#include "logging/rtc_event_log/events/logged_rtp_rtcp.h" +#include "logging/rtc_event_log/events/rtc_event_alr_state.h" +#include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h" +#include "logging/rtc_event_log/events/rtc_event_audio_playout.h" +#include "logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h" +#include "logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h" +#include "logging/rtc_event_log/events/rtc_event_begin_log.h" +#include "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h" +#include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h" +#include "logging/rtc_event_log/events/rtc_event_dtls_transport_state.h" +#include "logging/rtc_event_log/events/rtc_event_dtls_writable_state.h" +#include "logging/rtc_event_log/events/rtc_event_end_log.h" +#include "logging/rtc_event_log/events/rtc_event_frame_decoded.h" +#include "logging/rtc_event_log/events/rtc_event_generic_ack_received.h" +#include "logging/rtc_event_log/events/rtc_event_generic_packet_received.h" +#include "logging/rtc_event_log/events/rtc_event_generic_packet_sent.h" +#include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h" +#include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h" +#include "logging/rtc_event_log/events/rtc_event_neteq_set_minimum_delay.h" +#include "logging/rtc_event_log/events/rtc_event_probe_cluster_created.h" +#include "logging/rtc_event_log/events/rtc_event_probe_result_failure.h" +#include "logging/rtc_event_log/events/rtc_event_probe_result_success.h" +#include "logging/rtc_event_log/events/rtc_event_remote_estimate.h" +#include "logging/rtc_event_log/events/rtc_event_route_change.h" +#include "logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h" +#include "logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h" +#include "logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h" +#include "logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h" +#include "logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h" +#include "logging/rtc_event_log/events/rtc_event_video_send_stream_config.h" +#include "logging/rtc_event_log/rtc_stream_config.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" #include "modules/rtp_rtcp/include/rtp_cvo.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtcp_packet/bye.h" #include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" +#include "modules/rtp_rtcp/source/rtcp_packet/fir.h" +#include "modules/rtp_rtcp/source/rtcp_packet/loss_notification.h" +#include "modules/rtp_rtcp/source/rtcp_packet/nack.h" +#include "modules/rtp_rtcp/source/rtcp_packet/pli.h" +#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/remb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/report_block.h" #include "modules/rtp_rtcp/source/rtcp_packet/rrtr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" #include "modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h" #include "modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.h" #include "modules/rtp_rtcp/source/rtp_header_extensions.h" @@ -41,6 +88,7 @@ #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "rtc_base/buffer.h" #include "rtc_base/checks.h" +#include "rtc_base/random.h" #include "rtc_base/time_utils.h" #include "system_wrappers/include/ntp_time.h" #include "test/gmock.h" diff --git a/logging/rtc_event_log/rtc_event_log_unittest_helper.h b/logging/rtc_event_log/rtc_event_log_unittest_helper.h index e0fd3b741b..3d1fc115cb 100644 --- a/logging/rtc_event_log/rtc_event_log_unittest_helper.h +++ b/logging/rtc_event_log/rtc_event_log_unittest_helper.h @@ -17,21 +17,26 @@ #include #include +#include "api/rtc_event_log/rtc_event_log.h" +#include "logging/rtc_event_log/events/logged_rtp_rtcp.h" #include "logging/rtc_event_log/events/rtc_event_alr_state.h" #include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h" #include "logging/rtc_event_log/events/rtc_event_audio_playout.h" #include "logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h" #include "logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h" +#include "logging/rtc_event_log/events/rtc_event_begin_log.h" #include "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h" #include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h" #include "logging/rtc_event_log/events/rtc_event_dtls_transport_state.h" #include "logging/rtc_event_log/events/rtc_event_dtls_writable_state.h" +#include "logging/rtc_event_log/events/rtc_event_end_log.h" #include "logging/rtc_event_log/events/rtc_event_frame_decoded.h" #include "logging/rtc_event_log/events/rtc_event_generic_ack_received.h" #include "logging/rtc_event_log/events/rtc_event_generic_packet_received.h" #include "logging/rtc_event_log/events/rtc_event_generic_packet_sent.h" #include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h" #include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h" +#include "logging/rtc_event_log/events/rtc_event_neteq_set_minimum_delay.h" #include "logging/rtc_event_log/events/rtc_event_probe_cluster_created.h" #include "logging/rtc_event_log/events/rtc_event_probe_result_failure.h" #include "logging/rtc_event_log/events/rtc_event_probe_result_success.h" @@ -43,9 +48,8 @@ #include "logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h" #include "logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h" #include "logging/rtc_event_log/events/rtc_event_video_send_stream_config.h" -#include "logging/rtc_event_log/rtc_event_log_parser.h" -#include "logging/rtc_event_log/rtc_stream_config.h" #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtcp_packet/bye.h" #include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" #include "modules/rtp_rtcp/source/rtcp_packet/fir.h" @@ -56,6 +60,7 @@ #include "modules/rtp_rtcp/source/rtcp_packet/remb.h" #include "modules/rtp_rtcp/source/rtcp_packet/report_block.h" #include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "modules/rtp_rtcp/source/rtp_packet.h" #include "rtc_base/random.h" diff --git a/logging/rtc_event_log/rtc_event_processor.cc b/logging/rtc_event_log/rtc_event_processor.cc index e1024b1b22..433b4874af 100644 --- a/logging/rtc_event_log/rtc_event_processor.cc +++ b/logging/rtc_event_log/rtc_event_processor.cc @@ -9,6 +9,10 @@ */ #include "logging/rtc_event_log/rtc_event_processor.h" +#include +#include + +#include "absl/types/optional.h" #include "rtc_base/numerics/sequence_number_util.h" namespace webrtc { diff --git a/logging/rtc_event_log/rtc_event_processor.h b/logging/rtc_event_log/rtc_event_processor.h index a46f390862..0dac1c5a7b 100644 --- a/logging/rtc_event_log/rtc_event_processor.h +++ b/logging/rtc_event_log/rtc_event_processor.h @@ -13,12 +13,13 @@ #include -#include +#include #include -#include +#include #include -#include "api/function_view.h" +#include "absl/types/optional.h" +#include "logging/rtc_event_log/rtc_event_log_parser.h" #include "logging/rtc_event_log/rtc_event_processor_order.h" #include "rtc_base/checks.h" diff --git a/logging/rtc_event_log/rtc_event_processor_order.h b/logging/rtc_event_log/rtc_event_processor_order.h index 47ef346d5f..5ee12440da 100644 --- a/logging/rtc_event_log/rtc_event_processor_order.h +++ b/logging/rtc_event_log/rtc_event_processor_order.h @@ -14,8 +14,32 @@ #include #include "absl/types/optional.h" -#include "api/function_view.h" #include "logging/rtc_event_log/events/logged_rtp_rtcp.h" +#include "logging/rtc_event_log/events/rtc_event_alr_state.h" +#include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h" +#include "logging/rtc_event_log/events/rtc_event_audio_playout.h" +#include "logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h" +#include "logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h" +#include "logging/rtc_event_log/events/rtc_event_begin_log.h" +#include "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h" +#include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h" +#include "logging/rtc_event_log/events/rtc_event_dtls_transport_state.h" +#include "logging/rtc_event_log/events/rtc_event_dtls_writable_state.h" +#include "logging/rtc_event_log/events/rtc_event_end_log.h" +#include "logging/rtc_event_log/events/rtc_event_frame_decoded.h" +#include "logging/rtc_event_log/events/rtc_event_generic_ack_received.h" +#include "logging/rtc_event_log/events/rtc_event_generic_packet_received.h" +#include "logging/rtc_event_log/events/rtc_event_generic_packet_sent.h" +#include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h" +#include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h" +#include "logging/rtc_event_log/events/rtc_event_neteq_set_minimum_delay.h" +#include "logging/rtc_event_log/events/rtc_event_probe_cluster_created.h" +#include "logging/rtc_event_log/events/rtc_event_probe_result_failure.h" +#include "logging/rtc_event_log/events/rtc_event_probe_result_success.h" +#include "logging/rtc_event_log/events/rtc_event_remote_estimate.h" +#include "logging/rtc_event_log/events/rtc_event_route_change.h" +#include "logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h" +#include "logging/rtc_event_log/events/rtc_event_video_send_stream_config.h" #include "logging/rtc_event_log/rtc_event_log_parser.h" namespace webrtc { diff --git a/logging/rtc_event_log/rtc_event_processor_unittest.cc b/logging/rtc_event_log/rtc_event_processor_unittest.cc index d57408d1e6..53948ad783 100644 --- a/logging/rtc_event_log/rtc_event_processor_unittest.cc +++ b/logging/rtc_event_log/rtc_event_processor_unittest.cc @@ -15,9 +15,24 @@ #include #include #include +#include +#include +#include -#include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/rtp_headers.h" +#include "api/units/timestamp.h" +#include "logging/rtc_event_log/events/logged_rtp_rtcp.h" +#include "logging/rtc_event_log/events/rtc_event_begin_log.h" +#include "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h" +#include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h" +#include "logging/rtc_event_log/events/rtc_event_end_log.h" +#include "logging/rtc_event_log/events/rtc_event_probe_cluster_created.h" +#include "logging/rtc_event_log/events/rtc_event_probe_result_failure.h" +#include "logging/rtc_event_log/events/rtc_event_probe_result_success.h" +#include "logging/rtc_event_log/events/rtc_event_remote_estimate.h" #include "logging/rtc_event_log/rtc_event_log_parser.h" +#include "logging/rtc_event_log/rtc_event_processor_order.h" #include "rtc_base/checks.h" #include "rtc_base/random.h" #include "test/gmock.h"