Delete deprecated rtc_event_log header
Bug: webrtc:10206
Change-Id: I9ed3148843c647372993729b87c0e74741ab540b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/147870
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28791}
diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index 3cbfa14..6dc6dc2 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -49,6 +49,7 @@
"../api/audio:audio_frame_api",
"../api/audio:audio_mixer_api",
"../api/audio_codecs:audio_codecs_api",
+ "../api/rtc_event_log",
"../api/task_queue",
"../call:bitrate_allocator",
"../call:call_interfaces",
@@ -56,7 +57,6 @@
"../common_audio",
"../common_audio:common_audio_c",
"../logging:rtc_event_audio",
- "../logging:rtc_event_log_api",
"../logging:rtc_stream_config",
"../modules/audio_coding",
"../modules/audio_coding:audio_coding_module_typedefs",
@@ -133,6 +133,7 @@
"../api/audio_codecs:audio_codecs_api",
"../api/audio_codecs/opus:audio_decoder_opus",
"../api/audio_codecs/opus:audio_encoder_opus",
+ "../api/rtc_event_log",
"../api/task_queue:default_task_queue_factory",
"../api/units:time_delta",
"../call:mock_bitrate_allocator",
@@ -143,7 +144,6 @@
"../call:rtp_sender",
"../common_audio",
"../logging:mocks",
- "../logging:rtc_event_log_api",
"../modules/audio_device:audio_device_impl", # For TestAudioDeviceModule
"../modules/audio_device:mock_audio_device",
"../modules/audio_mixer:audio_mixer_impl",
diff --git a/audio/audio_send_stream.cc b/audio/audio_send_stream.cc
index c5ec1b5..b27e29c 100644
--- a/audio/audio_send_stream.cc
+++ b/audio/audio_send_stream.cc
@@ -22,6 +22,7 @@
#include "api/crypto/frame_encryptor_interface.h"
#include "api/function_view.h"
#include "api/media_transport_config.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "audio/audio_state.h"
#include "audio/channel_send.h"
#include "audio/conversion.h"
@@ -29,7 +30,6 @@
#include "call/rtp_transport_controller_send_interface.h"
#include "common_audio/vad/include/vad.h"
#include "logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/rtc_stream_config.h"
#include "modules/audio_coding/codecs/cng/audio_encoder_cng.h"
#include "modules/audio_processing/include/audio_processing.h"
diff --git a/audio/channel_receive.cc b/audio/channel_receive.cc
index 2554476..ed3356a 100644
--- a/audio/channel_receive.cc
+++ b/audio/channel_receive.cc
@@ -18,11 +18,11 @@
#include <vector>
#include "absl/memory/memory.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "audio/audio_level.h"
#include "audio/channel_send.h"
#include "audio/utility/audio_frame_operations.h"
#include "logging/rtc_event_log/events/rtc_event_audio_playout.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/audio_coding/acm2/acm_receiver.h"
#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
#include "modules/audio_device/include/audio_device.h"
diff --git a/audio/channel_send.cc b/audio/channel_send.cc
index 4df06f3..d729b9f 100644
--- a/audio/channel_send.cc
+++ b/audio/channel_send.cc
@@ -21,10 +21,10 @@
#include "api/array_view.h"
#include "api/call/transport.h"
#include "api/crypto/frame_encryptor_interface.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "audio/utility/audio_frame_operations.h"
#include "call/rtp_transport_controller_send_interface.h"
#include "logging/rtc_event_log/events/rtc_event_audio_playout.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
#include "modules/audio_coding/include/audio_coding_module.h"
#include "modules/audio_processing/rms_level.h"
diff --git a/audio/test/media_transport_test.cc b/audio/test/media_transport_test.cc
index b06d46d..cc360df 100644
--- a/audio/test/media_transport_test.cc
+++ b/audio/test/media_transport_test.cc
@@ -14,6 +14,7 @@
#include "api/audio_codecs/opus/audio_decoder_opus.h"
#include "api/audio_codecs/opus/audio_encoder_opus.h"
#include "api/media_transport_config.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/task_queue/default_task_queue_factory.h"
#include "api/test/loopback_media_transport.h"
#include "api/test/mock_audio_mixer.h"
@@ -21,7 +22,6 @@
#include "audio/audio_send_stream.h"
#include "call/rtp_transport_controller_send.h"
#include "call/test/mock_bitrate_allocator.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/audio_device/include/test_audio_device.h"
#include "modules/audio_mixer/audio_mixer_impl.h"
#include "modules/audio_processing/include/mock_audio_processing.h"
diff --git a/call/BUILD.gn b/call/BUILD.gn
index c6bbae8..6443074 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -76,9 +76,9 @@
"../api:fec_controller_api",
"../api:libjingle_peerconnection_api",
"../api:rtp_headers",
+ "../api/rtc_event_log",
"../api/transport:bitrate_settings",
"../api/units:timestamp",
- "../logging:rtc_event_log_api",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:rtc_base_approved",
"//third_party/abseil-cpp/absl/types:optional",
@@ -130,6 +130,7 @@
"../api:fec_controller_api",
"../api:network_state_predictor_api",
"../api:transport_api",
+ "../api/rtc_event_log",
"../api/transport:field_trial_based_config",
"../api/transport:goog_cc",
"../api/transport:network_control",
@@ -140,7 +141,6 @@
"../api/video:video_rtp_headers",
"../api/video_codecs:video_codecs_api",
"../logging:rtc_event_bwe",
- "../logging:rtc_event_log_api",
"../modules/congestion_controller",
"../modules/congestion_controller/rtp:control_handler",
"../modules/congestion_controller/rtp:transport_feedback",
@@ -228,12 +228,12 @@
"../api:rtp_headers",
"../api:simulated_network_api",
"../api:transport_api",
+ "../api/rtc_event_log",
"../api/transport:network_control",
"../api/units:time_delta",
"../api/video_codecs:video_codecs_api",
"../audio",
"../logging:rtc_event_audio",
- "../logging:rtc_event_log_api",
"../logging:rtc_event_rtp_rtcp",
"../logging:rtc_event_video",
"../logging:rtc_stream_config",
@@ -372,11 +372,11 @@
"../api:rtp_headers",
"../api:transport_api",
"../api/audio_codecs:builtin_audio_decoder_factory",
+ "../api/rtc_event_log",
"../api/task_queue:default_task_queue_factory",
"../api/video:video_frame",
"../api/video:video_rtp_headers",
"../audio",
- "../logging:rtc_event_log_api",
"../modules/audio_device:mock_audio_device",
"../modules/audio_mixer",
"../modules/audio_mixer:audio_mixer_impl",
@@ -427,13 +427,13 @@
"../api:rtc_event_log_output_file",
"../api:simulated_network_api",
"../api/audio_codecs:builtin_audio_encoder_factory",
+ "../api/rtc_event_log",
"../api/rtc_event_log:rtc_event_log_factory",
"../api/task_queue",
"../api/task_queue:default_task_queue_factory",
"../api/video:builtin_video_bitrate_allocator_factory",
"../api/video:video_bitrate_allocation",
"../api/video_codecs:video_codecs_api",
- "../logging:rtc_event_log_api",
"../modules/audio_coding",
"../modules/audio_device",
"../modules/audio_device:audio_device_impl",
diff --git a/call/call.cc b/call/call.cc
index 22c8a0c..5752be7 100644
--- a/call/call.cc
+++ b/call/call.cc
@@ -21,6 +21,7 @@
#include "absl/memory/memory.h"
#include "absl/types/optional.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/transport/network_control.h"
#include "audio/audio_receive_stream.h"
#include "audio/audio_send_stream.h"
@@ -35,7 +36,6 @@
#include "logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.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.h"
#include "logging/rtc_event_log/rtc_stream_config.h"
#include "modules/congestion_controller/include/receive_side_congestion_controller.h"
#include "modules/rtp_rtcp/include/flexfec_receiver.h"
diff --git a/call/call_perf_tests.cc b/call/call_perf_tests.cc
index 421444f..321f69c 100644
--- a/call/call_perf_tests.cc
+++ b/call/call_perf_tests.cc
@@ -15,6 +15,7 @@
#include "absl/memory/memory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/test/simulated_network.h"
#include "api/video/builtin_video_bitrate_allocator_factory.h"
#include "api/video/video_bitrate_allocation.h"
@@ -23,7 +24,6 @@
#include "call/call.h"
#include "call/fake_network_pipe.h"
#include "call/simulated_network.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/audio_coding/include/audio_coding_module.h"
#include "modules/audio_device/include/test_audio_device.h"
#include "modules/audio_mixer/audio_mixer_impl.h"
diff --git a/call/call_unittest.cc b/call/call_unittest.cc
index 2ffa794..e5bc6c0 100644
--- a/call/call_unittest.cc
+++ b/call/call_unittest.cc
@@ -17,13 +17,13 @@
#include "absl/memory/memory.h"
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/task_queue/default_task_queue_factory.h"
#include "api/test/fake_media_transport.h"
#include "api/test/mock_audio_mixer.h"
#include "audio/audio_receive_stream.h"
#include "audio/audio_send_stream.h"
#include "call/audio_state.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/audio_device/include/mock_audio_device.h"
#include "modules/audio_processing/include/mock_audio_processing.h"
#include "modules/pacing/mock/mock_paced_sender.h"
@@ -54,7 +54,7 @@
webrtc::Call* operator->() { return call_.get(); }
private:
- webrtc::RtcEventLogNullImpl event_log_;
+ webrtc::RtcEventLogNull event_log_;
std::unique_ptr<webrtc::TaskQueueFactory> task_queue_factory_;
std::unique_ptr<webrtc::Call> call_;
};
diff --git a/call/rampup_tests.h b/call/rampup_tests.h
index e3ab5f2..3170f71 100644
--- a/call/rampup_tests.h
+++ b/call/rampup_tests.h
@@ -16,10 +16,10 @@
#include <utility>
#include <vector>
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/test/simulated_network.h"
#include "call/call.h"
#include "call/simulated_network.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "rtc_base/event.h"
#include "test/call_test.h"
diff --git a/call/rtp_transport_controller_send_interface.h b/call/rtp_transport_controller_send_interface.h
index d8b6982..c86719a 100644
--- a/call/rtp_transport_controller_send_interface.h
+++ b/call/rtp_transport_controller_send_interface.h
@@ -22,10 +22,10 @@
#include "api/bitrate_constraints.h"
#include "api/crypto/crypto_options.h"
#include "api/fec_controller.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/transport/bitrate_settings.h"
#include "api/units/timestamp.h"
#include "call/rtp_config.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/rtp_rtcp/include/report_block_data.h"
#include "modules/rtp_rtcp/include/rtcp_statistics.h"
#include "modules/rtp_rtcp/include/rtp_packet_sender.h"
diff --git a/call/rtp_video_sender.h b/call/rtp_video_sender.h
index 2f13752..b859483 100644
--- a/call/rtp_video_sender.h
+++ b/call/rtp_video_sender.h
@@ -21,12 +21,12 @@
#include "api/call/transport.h"
#include "api/fec_controller.h"
#include "api/fec_controller_override.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/video_codecs/video_encoder.h"
#include "call/rtp_config.h"
#include "call/rtp_payload_params.h"
#include "call/rtp_transport_controller_send_interface.h"
#include "call/rtp_video_sender_interface.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/rtp_rtcp/include/flexfec_sender.h"
#include "modules/rtp_rtcp/source/rtp_sender.h"
#include "modules/rtp_rtcp/source/rtp_sender_video.h"
diff --git a/call/rtp_video_sender_unittest.cc b/call/rtp_video_sender_unittest.cc
index c314c3c..45888a8 100644
--- a/call/rtp_video_sender_unittest.cc
+++ b/call/rtp_video_sender_unittest.cc
@@ -167,7 +167,7 @@
NiceMock<MockTransport> transport_;
NiceMock<MockRtcpIntraFrameObserver> encoder_feedback_;
SimulatedClock clock_;
- RtcEventLogNullImpl event_log_;
+ RtcEventLogNull event_log_;
VideoSendStream::Config config_;
SendDelayStats send_delay_stats_;
BitrateConstraints bitrate_config_;
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index cd7caea..537c069 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -30,7 +30,6 @@
sources = [
"rtc_event_log/encoder/rtc_event_log_encoder.h",
"rtc_event_log/events/rtc_event.h",
- "rtc_event_log/rtc_event_log.h",
"rtc_event_log/rtc_event_log_factory_interface.h",
]
@@ -277,6 +276,7 @@
deps = [
":ice_log",
":rtc_event_log_api",
+ "../api/rtc_event_log",
"../rtc_base",
"../rtc_base:checks",
]
@@ -314,13 +314,13 @@
":ice_log",
":rtc_event_bwe",
":rtc_event_log2_proto",
- ":rtc_event_log_api",
":rtc_event_log_impl_encoder",
":rtc_event_log_proto",
":rtc_stream_config",
"../api:function_view",
"../api:libjingle_peerconnection_api",
"../api:rtp_headers",
+ "../api/rtc_event_log",
"../api/units:data_rate",
"../api/units:time_delta",
"../api/units:timestamp",
@@ -361,7 +361,6 @@
":rtc_event_bwe",
":rtc_event_generic_packet_events",
":rtc_event_log2_proto",
- ":rtc_event_log_api",
":rtc_event_log_impl_encoder",
":rtc_event_log_parser",
":rtc_event_log_proto",
@@ -373,6 +372,7 @@
"../api:libjingle_peerconnection_api",
"../api:rtc_event_log_output_file",
"../api:rtp_headers",
+ "../api/rtc_event_log",
"../api/rtc_event_log:rtc_event_log_factory",
"../api/task_queue:default_task_queue_factory",
"../call",
@@ -398,11 +398,11 @@
"rtc_event_log/rtc_event_log2rtp_dump.cc",
]
deps = [
- ":rtc_event_log_api",
":rtc_event_log_parser",
"../api:array_view",
"../api:libjingle_peerconnection_api",
"../api:rtp_headers",
+ "../api/rtc_event_log",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
@@ -437,6 +437,7 @@
":rtc_event_log_api",
"../api:libjingle_logging_api",
"../api:libjingle_peerconnection_api",
+ "../api/rtc_event_log",
"../rtc_base:rtc_base_approved",
"//third_party/abseil-cpp/absl/memory",
]
@@ -450,7 +451,7 @@
"rtc_event_log/mock/mock_rtc_event_log.h",
]
deps = [
- ":rtc_event_log_api",
+ "../api/rtc_event_log",
"../test:test_support",
]
}
diff --git a/logging/rtc_event_log/fake_rtc_event_log.h b/logging/rtc_event_log/fake_rtc_event_log.h
index 8c0e498..6522fb6 100644
--- a/logging/rtc_event_log/fake_rtc_event_log.h
+++ b/logging/rtc_event_log/fake_rtc_event_log.h
@@ -14,8 +14,8 @@
#include <map>
#include <memory>
+#include "api/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/events/rtc_event.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "rtc_base/async_invoker.h"
#include "rtc_base/thread.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 852a3c8..f84f74f 100644
--- a/logging/rtc_event_log/fake_rtc_event_log_factory.cc
+++ b/logging/rtc_event_log/fake_rtc_event_log_factory.cc
@@ -10,8 +10,8 @@
#include "logging/rtc_event_log/fake_rtc_event_log_factory.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/fake_rtc_event_log.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
namespace webrtc {
diff --git a/logging/rtc_event_log/ice_logger.cc b/logging/rtc_event_log/ice_logger.cc
index 9e69b52..59076ce 100644
--- a/logging/rtc_event_log/ice_logger.cc
+++ b/logging/rtc_event_log/ice_logger.cc
@@ -11,7 +11,7 @@
#include "logging/rtc_event_log/ice_logger.h"
#include "absl/memory/memory.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
+#include "api/rtc_event_log/rtc_event_log.h"
namespace webrtc {
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 44207ff..66a2065 100644
--- a/logging/rtc_event_log/mock/mock_rtc_event_log.h
+++ b/logging/rtc_event_log/mock/mock_rtc_event_log.h
@@ -13,7 +13,7 @@
#include <memory>
-#include "logging/rtc_event_log/rtc_event_log.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "test/gmock.h"
namespace webrtc {
diff --git a/logging/rtc_event_log/rtc_event_log.h b/logging/rtc_event_log/rtc_event_log.h
deleted file mode 100644
index 2a088f6..0000000
--- a/logging/rtc_event_log/rtc_event_log.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_H_
-#define LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_H_
-
-// TODO(bugs.webrtc.org/10206): For backwards compatibility; Delete as soon as
-// dependencies are updated.
-
-#include "api/rtc_event_log/rtc_event_log.h"
-
-namespace webrtc {
-using RtcEventLogNullImpl = ::webrtc::RtcEventLogNull;
-} // namespace webrtc
-
-#endif // LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_H_
diff --git a/logging/rtc_event_log/rtc_event_log2rtp_dump.cc b/logging/rtc_event_log/rtc_event_log2rtp_dump.cc
index 114a1a0..51d0713 100644
--- a/logging/rtc_event_log/rtc_event_log2rtp_dump.cc
+++ b/logging/rtc_event_log/rtc_event_log2rtp_dump.cc
@@ -23,8 +23,8 @@
#include "absl/memory/memory.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/rtc_event_log.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_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc
index 74267af..45d4ea4 100644
--- a/logging/rtc_event_log/rtc_event_log_parser.cc
+++ b/logging/rtc_event_log/rtc_event_log_parser.cc
@@ -22,12 +22,12 @@
#include "absl/memory/memory.h"
#include "absl/types/optional.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/rtp_headers.h"
#include "api/rtp_parameters.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/rtc_event_log.h"
#include "logging/rtc_event_log/rtc_event_processor.h"
#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
#include "modules/include/module_common_types.h"
diff --git a/logging/rtc_event_log/rtc_event_log_parser.h b/logging/rtc_event_log/rtc_event_log_parser.h
index 2aae9f8..72eff98 100644
--- a/logging/rtc_event_log/rtc_event_log_parser.h
+++ b/logging/rtc_event_log/rtc_event_log_parser.h
@@ -18,10 +18,10 @@
#include <utility> // pair
#include <vector>
+#include "api/rtc_event_log/rtc_event_log.h"
#include "call/video_receive_stream.h"
#include "call/video_send_stream.h"
#include "logging/rtc_event_log/logged_events.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h"
#include "rtc_base/ignore_wundef.h"
diff --git a/logging/rtc_event_log/rtc_event_log_unittest.cc b/logging/rtc_event_log/rtc_event_log_unittest.cc
index a3a6433..e44d818 100644
--- a/logging/rtc_event_log/rtc_event_log_unittest.cc
+++ b/logging/rtc_event_log/rtc_event_log_unittest.cc
@@ -8,8 +8,6 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "logging/rtc_event_log/rtc_event_log.h"
-
#include <algorithm>
#include <limits>
#include <map>
@@ -20,6 +18,7 @@
#include <vector>
#include "absl/memory/memory.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/rtc_event_log/rtc_event_log_factory.h"
#include "api/rtc_event_log_output_file.h"
#include "api/task_queue/default_task_queue_factory.h"
diff --git a/media/BUILD.gn b/media/BUILD.gn
index dd19656..7cb77a5 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -521,6 +521,7 @@
"../api:simulcast_test_fixture_api",
"../api/audio_codecs:builtin_audio_decoder_factory",
"../api/audio_codecs:builtin_audio_encoder_factory",
+ "../api/rtc_event_log",
"../api/task_queue",
"../api/task_queue:default_task_queue_factory",
"../api/test/video:function_video_factory",
@@ -536,7 +537,6 @@
"../audio",
"../call:call_interfaces",
"../common_video",
- "../logging:rtc_event_log_api",
"../modules/audio_device:mock_audio_device",
"../modules/audio_processing",
"../modules/audio_processing:api",
diff --git a/media/engine/webrtc_video_engine_unittest.cc b/media/engine/webrtc_video_engine_unittest.cc
index 9b51b17..44bb128 100644
--- a/media/engine/webrtc_video_engine_unittest.cc
+++ b/media/engine/webrtc_video_engine_unittest.cc
@@ -20,6 +20,7 @@
#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "api/media_transport_config.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/rtp_parameters.h"
#include "api/task_queue/default_task_queue_factory.h"
#include "api/test/fake_media_transport.h"
@@ -39,7 +40,6 @@
#include "api/video_codecs/video_encoder_factory.h"
#include "call/flexfec_receive_stream.h"
#include "common_video/h264/profile_level_id.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "media/base/fake_frame_source.h"
#include "media/base/fake_network_interface.h"
#include "media/base/fake_video_renderer.h"
@@ -272,7 +272,7 @@
// race condition in the clock access.
rtc::ScopedFakeClock fake_clock_;
std::unique_ptr<webrtc::test::ScopedFieldTrials> override_field_trials_;
- webrtc::RtcEventLogNullImpl event_log_;
+ webrtc::RtcEventLogNull event_log_;
std::unique_ptr<webrtc::TaskQueueFactory> task_queue_factory_;
// Used in WebRtcVideoEngineVoiceTest, but defined here so it's properly
// initialized when the constructor is called.
@@ -1146,7 +1146,7 @@
.WillOnce(::testing::Return(decoder));
// Create a call.
- webrtc::RtcEventLogNullImpl event_log;
+ webrtc::RtcEventLogNull event_log;
auto task_queue_factory = webrtc::CreateDefaultTaskQueueFactory();
webrtc::Call::Config call_config(&event_log);
call_config.task_queue_factory = task_queue_factory.get();
@@ -1216,7 +1216,7 @@
.WillOnce(::testing::Return(nullptr));
// Create a call.
- webrtc::RtcEventLogNullImpl event_log;
+ webrtc::RtcEventLogNull event_log;
auto task_queue_factory = webrtc::CreateDefaultTaskQueueFactory();
webrtc::Call::Config call_config(&event_log);
call_config.task_queue_factory = task_queue_factory.get();
@@ -1491,7 +1491,7 @@
return cricket::StreamParams::CreateLegacy(kSsrc);
}
- webrtc::RtcEventLogNullImpl event_log_;
+ webrtc::RtcEventLogNull event_log_;
std::unique_ptr<webrtc::TaskQueueFactory> task_queue_factory_;
std::unique_ptr<webrtc::Call> call_;
std::unique_ptr<webrtc::VideoBitrateAllocatorFactory>
@@ -7539,7 +7539,7 @@
return streams[streams.size() - 1];
}
- webrtc::RtcEventLogNullImpl event_log_;
+ webrtc::RtcEventLogNull event_log_;
FakeCall fake_call_;
cricket::FakeWebRtcVideoEncoderFactory* encoder_factory_;
cricket::FakeWebRtcVideoDecoderFactory* decoder_factory_;
diff --git a/media/engine/webrtc_voice_engine_unittest.cc b/media/engine/webrtc_voice_engine_unittest.cc
index b39872d..3eec446 100644
--- a/media/engine/webrtc_voice_engine_unittest.cc
+++ b/media/engine/webrtc_voice_engine_unittest.cc
@@ -18,11 +18,11 @@
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "api/media_transport_config.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/rtp_parameters.h"
#include "api/scoped_refptr.h"
#include "api/task_queue/default_task_queue_factory.h"
#include "call/call.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "media/base/fake_media_engine.h"
#include "media/base/fake_network_interface.h"
#include "media/base/fake_rtp.h"
@@ -3449,7 +3449,7 @@
webrtc::MockAudioEncoderFactory::CreateUnusedFactory(),
webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr, apm);
engine.Init();
- webrtc::RtcEventLogNullImpl event_log;
+ webrtc::RtcEventLogNull event_log;
webrtc::Call::Config call_config(&event_log);
call_config.task_queue_factory = task_queue_factory.get();
auto call = absl::WrapUnique(webrtc::Call::Create(call_config));
@@ -3477,7 +3477,7 @@
webrtc::MockAudioEncoderFactory::CreateUnusedFactory(),
webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr, apm);
engine.Init();
- webrtc::RtcEventLogNullImpl event_log;
+ webrtc::RtcEventLogNull event_log;
webrtc::Call::Config call_config(&event_log);
call_config.task_queue_factory = task_queue_factory.get();
auto call = absl::WrapUnique(webrtc::Call::Create(call_config));
@@ -3551,7 +3551,7 @@
webrtc::MockAudioEncoderFactory::CreateUnusedFactory(),
webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr, apm);
engine.Init();
- webrtc::RtcEventLogNullImpl event_log;
+ webrtc::RtcEventLogNull event_log;
webrtc::Call::Config call_config(&event_log);
call_config.task_queue_factory = task_queue_factory.get();
auto call = absl::WrapUnique(webrtc::Call::Create(call_config));
@@ -3594,7 +3594,7 @@
webrtc::MockAudioEncoderFactory::CreateUnusedFactory(),
webrtc::CreateBuiltinAudioDecoderFactory(), nullptr, apm);
engine.Init();
- webrtc::RtcEventLogNullImpl event_log;
+ webrtc::RtcEventLogNull event_log;
webrtc::Call::Config call_config(&event_log);
call_config.task_queue_factory = task_queue_factory.get();
auto call = absl::WrapUnique(webrtc::Call::Create(call_config));
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index bda346e..1bfd7fb 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -50,7 +50,6 @@
"../../api/audio_codecs:audio_codecs_api",
"../../common_audio",
"../../common_audio:common_audio_c",
- "../../logging:rtc_event_log_api",
"../../rtc_base:audio_format_to_string",
"../../rtc_base:checks",
"../../rtc_base:deprecation",
@@ -917,6 +916,7 @@
deps = [
"../../api/audio_codecs:audio_codecs_api",
+ "../../api/rtc_event_log",
"../../common_audio",
"../../logging:rtc_event_audio",
"../../logging:rtc_event_log_api",
diff --git a/modules/audio_coding/audio_network_adaptor/event_log_writer.cc b/modules/audio_coding/audio_network_adaptor/event_log_writer.cc
index 7aa522e..c1beac2 100644
--- a/modules/audio_coding/audio_network_adaptor/event_log_writer.cc
+++ b/modules/audio_coding/audio_network_adaptor/event_log_writer.cc
@@ -18,9 +18,9 @@
#include "absl/memory/memory.h"
#include "absl/types/optional.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/events/rtc_event.h"
#include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "rtc_base/checks.h"
namespace webrtc {
diff --git a/modules/bitrate_controller/BUILD.gn b/modules/bitrate_controller/BUILD.gn
index 8941e29..a9af8f4 100644
--- a/modules/bitrate_controller/BUILD.gn
+++ b/modules/bitrate_controller/BUILD.gn
@@ -24,6 +24,7 @@
}
deps = [
+ "../../api/rtc_event_log",
"../../api/transport:network_control",
"../../api/units:data_rate",
"../../api/units:time_delta",
diff --git a/modules/bitrate_controller/send_side_bandwidth_estimation.cc b/modules/bitrate_controller/send_side_bandwidth_estimation.cc
index 86ee24a..393ce94 100644
--- a/modules/bitrate_controller/send_side_bandwidth_estimation.cc
+++ b/modules/bitrate_controller/send_side_bandwidth_estimation.cc
@@ -16,9 +16,9 @@
#include <string>
#include "absl/memory/memory.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/events/rtc_event.h"
#include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/remote_bitrate_estimator/include/bwe_defines.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn
index 2cf2304..8786689 100644
--- a/modules/congestion_controller/goog_cc/BUILD.gn
+++ b/modules/congestion_controller/goog_cc/BUILD.gn
@@ -32,6 +32,7 @@
"../..:module_api",
"../../..:webrtc_common",
"../../../api:network_state_predictor_api",
+ "../../../api/rtc_event_log",
"../../../api/transport:field_trial_based_config",
"../../../api/transport:network_control",
"../../../api/transport:webrtc_key_value_config",
@@ -39,7 +40,6 @@
"../../../api/units:data_size",
"../../../api/units:time_delta",
"../../../api/units:timestamp",
- "../../../logging:rtc_event_log_api",
"../../../logging:rtc_event_pacing",
"../../../rtc_base:checks",
"../../../rtc_base:logging",
@@ -88,6 +88,7 @@
"alr_detector.h",
]
deps = [
+ "../../../api/rtc_event_log",
"../../../api/transport:field_trial_based_config",
"../../../api/transport:webrtc_key_value_config",
"../../../logging:rtc_event_log_api",
@@ -120,12 +121,12 @@
deps = [
"../../../api:network_state_predictor_api",
+ "../../../api/rtc_event_log",
"../../../api/transport:network_control",
"../../../api/transport:webrtc_key_value_config",
"../../../api/units:data_rate",
"../../../api/units:timestamp",
"../../../logging:rtc_event_bwe",
- "../../../logging:rtc_event_log_api",
"../../../rtc_base:checks",
"../../../rtc_base:logging",
"../../../rtc_base:macromagic",
@@ -149,6 +150,7 @@
deps = [
":estimators",
"../../../api:network_state_predictor_api",
+ "../../../api/rtc_event_log",
"../../../api/transport:network_control",
"../../../api/transport:network_control",
"../../../api/transport:webrtc_key_value_config",
@@ -172,13 +174,13 @@
]
deps = [
+ "../../../api/rtc_event_log",
"../../../api/transport:network_control",
"../../../api/transport:webrtc_key_value_config",
"../../../api/units:data_rate",
"../../../api/units:time_delta",
"../../../api/units:timestamp",
"../../../logging:rtc_event_bwe",
- "../../../logging:rtc_event_log_api",
"../../../logging:rtc_event_pacing",
"../../../rtc_base:checks",
"../../../rtc_base:logging",
@@ -204,10 +206,10 @@
":delay_based_bwe",
":estimators",
":goog_cc",
+ "../../../api/rtc_event_log",
"../../../api/transport:goog_cc",
"../../../api/transport:network_control",
"../../../api/units:timestamp",
- "../../../logging:rtc_event_log_api",
"../../../rtc_base:checks",
"../../../test/logging:log_writer",
"../../remote_bitrate_estimator",
diff --git a/modules/congestion_controller/goog_cc/alr_detector.cc b/modules/congestion_controller/goog_cc/alr_detector.cc
index 94118e4..8dfcb1a 100644
--- a/modules/congestion_controller/goog_cc/alr_detector.cc
+++ b/modules/congestion_controller/goog_cc/alr_detector.cc
@@ -14,9 +14,9 @@
#include <cstdio>
#include "absl/memory/memory.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/events/rtc_event.h"
#include "logging/rtc_event_log/events/rtc_event_alr_state.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "rtc_base/checks.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/time_utils.h"
diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe.cc b/modules/congestion_controller/goog_cc/delay_based_bwe.cc
index bd140f6..b718913 100644
--- a/modules/congestion_controller/goog_cc/delay_based_bwe.cc
+++ b/modules/congestion_controller/goog_cc/delay_based_bwe.cc
@@ -17,9 +17,9 @@
#include <utility>
#include "absl/memory/memory.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/events/rtc_event.h"
#include "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/congestion_controller/goog_cc/trendline_estimator.h"
#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h"
#include "rtc_base/checks.h"
diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.h b/modules/congestion_controller/goog_cc/goog_cc_network_control.h
index a2d52b2..3de04d1 100644
--- a/modules/congestion_controller/goog_cc/goog_cc_network_control.h
+++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.h
@@ -19,6 +19,7 @@
#include "absl/types/optional.h"
#include "api/network_state_predictor.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/transport/field_trial_based_config.h"
#include "api/transport/network_control.h"
#include "api/transport/network_types.h"
@@ -26,7 +27,6 @@
#include "api/units/data_rate.h"
#include "api/units/data_size.h"
#include "api/units/timestamp.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/bitrate_controller/send_side_bandwidth_estimation.h"
#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h"
#include "modules/congestion_controller/goog_cc/alr_detector.h"
diff --git a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc
index 7cbc061..23aec87 100644
--- a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc
+++ b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc
@@ -13,9 +13,9 @@
#include <algorithm>
#include "absl/memory/memory.h"
+#include "api/rtc_event_log/rtc_event_log.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/rtc_event_log.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
diff --git a/modules/congestion_controller/goog_cc/probe_controller.h b/modules/congestion_controller/goog_cc/probe_controller.h
index 3a8ef13..3d18f4c 100644
--- a/modules/congestion_controller/goog_cc/probe_controller.h
+++ b/modules/congestion_controller/goog_cc/probe_controller.h
@@ -17,9 +17,9 @@
#include <vector>
#include "absl/types/optional.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/transport/network_control.h"
#include "api/transport/webrtc_key_value_config.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "rtc_base/constructor_magic.h"
#include "rtc_base/experiments/field_trial_parser.h"
#include "rtc_base/system/unused.h"
diff --git a/modules/congestion_controller/goog_cc/test/goog_cc_printer.h b/modules/congestion_controller/goog_cc/test/goog_cc_printer.h
index 86dac47..3eee781 100644
--- a/modules/congestion_controller/goog_cc/test/goog_cc_printer.h
+++ b/modules/congestion_controller/goog_cc/test/goog_cc_printer.h
@@ -14,11 +14,11 @@
#include <memory>
#include <string>
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/transport/goog_cc_factory.h"
#include "api/transport/network_control.h"
#include "api/transport/network_types.h"
#include "api/units/timestamp.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/congestion_controller/goog_cc/goog_cc_network_control.h"
#include "test/logging/log_writer.h"
diff --git a/modules/pacing/BUILD.gn b/modules/pacing/BUILD.gn
index 2846524..ca33b12 100644
--- a/modules/pacing/BUILD.gn
+++ b/modules/pacing/BUILD.gn
@@ -30,6 +30,7 @@
":interval_budget",
"..:module_api",
"../../api:function_view",
+ "../../api/rtc_event_log",
"../../api/transport:field_trial_based_config",
"../../api/transport:network_control",
"../../api/transport:webrtc_key_value_config",
diff --git a/modules/pacing/bitrate_prober.cc b/modules/pacing/bitrate_prober.cc
index 404257e..eb4792b 100644
--- a/modules/pacing/bitrate_prober.cc
+++ b/modules/pacing/bitrate_prober.cc
@@ -13,9 +13,9 @@
#include <algorithm>
#include "absl/memory/memory.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/events/rtc_event.h"
#include "logging/rtc_event_log/events/rtc_event_probe_cluster_created.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "system_wrappers/include/metrics.h"
diff --git a/modules/pacing/paced_sender.cc b/modules/pacing/paced_sender.cc
index 8827cf0..3951cf0 100644
--- a/modules/pacing/paced_sender.cc
+++ b/modules/pacing/paced_sender.cc
@@ -15,7 +15,7 @@
#include <vector>
#include "absl/memory/memory.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "modules/pacing/bitrate_prober.h"
#include "modules/pacing/interval_budget.h"
#include "modules/utility/include/process_thread.h"
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index fc782c2..3608bae 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -221,6 +221,7 @@
"../../api:scoped_refptr",
"../../api:transport_api",
"../../api/audio_codecs:audio_codecs_api",
+ "../../api/rtc_event_log",
"../../api/transport:field_trial_based_config",
"../../api/transport:webrtc_key_value_config",
"../../api/video:video_bitrate_allocation",
@@ -231,7 +232,6 @@
"../../call:rtp_interfaces",
"../../common_video",
"../../logging:rtc_event_audio",
- "../../logging:rtc_event_log_api",
"../../logging:rtc_event_rtp_rtcp",
"../../modules/audio_coding:audio_coding_module_typedefs",
"../../rtc_base:checks",
diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc
index ffa5e90..aedca53 100644
--- a/modules/rtp_rtcp/source/rtcp_sender.cc
+++ b/modules/rtp_rtcp/source/rtcp_sender.cc
@@ -16,8 +16,8 @@
#include <utility>
#include "absl/memory/memory.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h"
-#include "logging/rtc_event_log/rtc_event_log.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/compound_packet.h"
diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc
index c381ce2..a29cb24 100644
--- a/modules/rtp_rtcp/source/rtp_sender.cc
+++ b/modules/rtp_rtcp/source/rtp_sender.cc
@@ -18,9 +18,9 @@
#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "api/array_view.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/transport/field_trial_based_config.h"
#include "logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/rtp_rtcp/include/rtp_cvo.h"
#include "modules/rtp_rtcp/source/byte_io.h"
#include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h"
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index 243cf4f..6ddabd6 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -90,9 +90,9 @@
deps = [
"../api:libjingle_peerconnection_api",
"../api:scoped_refptr",
+ "../api/rtc_event_log",
"../api/transport:enums",
"../logging:ice_log",
- "../logging:rtc_event_log_api",
"../rtc_base",
"../rtc_base:checks",
diff --git a/p2p/base/dtls_transport.cc b/p2p/base/dtls_transport.cc
index c12e7a8..ce78361 100644
--- a/p2p/base/dtls_transport.cc
+++ b/p2p/base/dtls_transport.cc
@@ -15,9 +15,9 @@
#include <utility>
#include "absl/memory/memory.h"
+#include "api/rtc_event_log/rtc_event_log.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/rtc_event_log.h"
#include "p2p/base/packet_transport_internal.h"
#include "rtc_base/buffer.h"
#include "rtc_base/checks.h"
diff --git a/p2p/base/no_op_dtls_transport.cc b/p2p/base/no_op_dtls_transport.cc
index 7ba27c4..8981158 100644
--- a/p2p/base/no_op_dtls_transport.cc
+++ b/p2p/base/no_op_dtls_transport.cc
@@ -15,9 +15,9 @@
#include <utility>
#include "absl/memory/memory.h"
+#include "api/rtc_event_log/rtc_event_log.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/rtc_event_log.h"
#include "p2p/base/packet_transport_internal.h"
#include "rtc_base/buffer.h"
#include "rtc_base/checks.h"
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 33024c8..ddb6c33 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -84,6 +84,7 @@
"../api:libjingle_peerconnection_api",
"../api:rtp_headers",
"../api:scoped_refptr",
+ "../api/rtc_event_log",
"../api/video:builtin_video_bitrate_allocator_factory",
"../api/video:video_frame",
"../api/video:video_rtp_headers",
@@ -92,7 +93,6 @@
"../call:rtp_receiver",
"../common_video",
"../logging:ice_log",
- "../logging:rtc_event_log_api",
"../media:rtc_data",
"../media:rtc_h264_profile_id",
"../media:rtc_media_base",
@@ -219,6 +219,7 @@
"../api:rtc_event_log_output_file",
"../api:rtc_stats_api",
"../api:scoped_refptr",
+ "../api/rtc_event_log",
"../api/task_queue",
"../api/video:builtin_video_bitrate_allocator_factory",
"../api/video:video_frame",
@@ -227,7 +228,6 @@
"../call:call_interfaces",
"../common_video",
"../logging:ice_log",
- "../logging:rtc_event_log_api",
"../media:rtc_data",
"../media:rtc_media_base",
"../modules/rtp_rtcp:rtp_rtcp_format",
@@ -307,7 +307,6 @@
"../api/video:builtin_video_bitrate_allocator_factory",
"../call:rtp_interfaces",
"../call:rtp_receiver",
- "../logging:rtc_event_log_api",
"../media:rtc_data",
"../media:rtc_media_base",
"../media:rtc_media_tests_utils",
@@ -443,7 +442,6 @@
"../api/video_codecs:builtin_video_encoder_factory",
"../api/video_codecs:video_codecs_api",
"../call:call_interfaces",
- "../logging:rtc_event_log_api",
"../media:rtc_data",
"../media:rtc_media",
"../media:rtc_media_base",
@@ -576,7 +574,6 @@
"../api/video_codecs:builtin_video_encoder_factory",
"../api/video_codecs:video_codecs_api",
"../call:call_interfaces",
- "../logging:rtc_event_log_api",
"../media:rtc_audio_video",
"../media:rtc_data", # TODO(phoglund): AFAIK only used for one sctp constant.
"../media:rtc_media_base",
diff --git a/pc/datagram_dtls_adaptor.cc b/pc/datagram_dtls_adaptor.cc
index 0b47078..190a2d3 100644
--- a/pc/datagram_dtls_adaptor.cc
+++ b/pc/datagram_dtls_adaptor.cc
@@ -18,9 +18,9 @@
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
#include "api/rtc_error.h"
+#include "api/rtc_event_log/rtc_event_log.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/rtc_event_log.h"
#include "modules/rtp_rtcp/include/rtp_header_parser.h"
#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
#include "modules/rtp_rtcp/source/rtp_packet.h"
diff --git a/pc/jsep_transport_controller.h b/pc/jsep_transport_controller.h
index 2919c71..69af457 100644
--- a/pc/jsep_transport_controller.h
+++ b/pc/jsep_transport_controller.h
@@ -22,7 +22,7 @@
#include "api/media_transport_config.h"
#include "api/media_transport_interface.h"
#include "api/peer_connection_interface.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "media/sctp/sctp_transport_internal.h"
#include "p2p/base/dtls_transport.h"
#include "p2p/base/p2p_transport_channel.h"
diff --git a/pc/peer_connection.cc b/pc/peer_connection.cc
index b1ec403..b321d5c 100644
--- a/pc/peer_connection.cc
+++ b/pc/peer_connection.cc
@@ -25,13 +25,13 @@
#include "api/media_stream_proxy.h"
#include "api/media_stream_track_proxy.h"
#include "api/rtc_error.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/rtc_event_log_output_file.h"
#include "api/rtp_parameters.h"
#include "api/uma_metrics.h"
#include "api/video/builtin_video_bitrate_allocator_factory.h"
#include "call/call.h"
#include "logging/rtc_event_log/ice_logger.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "media/base/rid_description.h"
#include "media/sctp/sctp_transport.h"
#include "pc/audio_rtp_receiver.h"
diff --git a/pc/peer_connection_factory.cc b/pc/peer_connection_factory.cc
index 36f9aac..52d1f82 100644
--- a/pc/peer_connection_factory.cc
+++ b/pc/peer_connection_factory.cc
@@ -22,9 +22,9 @@
#include "api/network_state_predictor.h"
#include "api/peer_connection_factory_proxy.h"
#include "api/peer_connection_proxy.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/turn_customizer.h"
#include "api/video_track_source_proxy.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "media/base/rtp_data_engine.h"
#include "media/sctp/sctp_transport.h"
#include "p2p/base/basic_packet_socket_factory.h"
@@ -327,7 +327,7 @@
encoding_type = RtcEventLog::EncodingType::NewFormat;
return event_log_factory_
? event_log_factory_->CreateRtcEventLog(encoding_type)
- : absl::make_unique<RtcEventLogNullImpl>();
+ : absl::make_unique<RtcEventLogNull>();
}
std::unique_ptr<Call> PeerConnectionFactory::CreateCall_w(
diff --git a/pc/rtp_sender_receiver_unittest.cc b/pc/rtp_sender_receiver_unittest.cc
index c6118b5..02d7452 100644
--- a/pc/rtp_sender_receiver_unittest.cc
+++ b/pc/rtp_sender_receiver_unittest.cc
@@ -26,12 +26,12 @@
#include "api/dtmf_sender_interface.h"
#include "api/media_stream_interface.h"
#include "api/rtc_error.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/rtp_parameters.h"
#include "api/scoped_refptr.h"
#include "api/test/fake_frame_decryptor.h"
#include "api/test/fake_frame_encryptor.h"
#include "api/video/builtin_video_bitrate_allocator_factory.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "media/base/codec.h"
#include "media/base/fake_media_engine.h"
#include "media/base/media_channel.h"
@@ -489,7 +489,7 @@
protected:
rtc::Thread* const network_thread_;
rtc::Thread* const worker_thread_;
- webrtc::RtcEventLogNullImpl event_log_;
+ webrtc::RtcEventLogNull event_log_;
// The |rtp_dtls_transport_| and |rtp_transport_| should be destroyed after
// the |channel_manager|.
std::unique_ptr<cricket::DtlsTransportInternal> rtp_dtls_transport_;
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 4cbd585..fb86ef8 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -155,6 +155,7 @@
deps = [
"../api:libjingle_peerconnection_api",
"../api:transport_api",
+ "../api/rtc_event_log",
"../api/task_queue:default_task_queue_factory",
"../api/task_queue:task_queue",
"../api/video:builtin_video_bitrate_allocator_factory",
@@ -169,7 +170,6 @@
"../call:simulated_network",
"../call:simulated_packet_receiver",
"../call:video_stream_api",
- "../logging:rtc_event_log_api",
"../media:rtc_audio_video",
"../media:rtc_media_base",
"../rtc_base",
@@ -289,7 +289,6 @@
"../api/transport:network_control",
"../call:call_interfaces",
"../call:video_stream_api",
- "../logging:rtc_event_log_api",
"../logging:rtc_event_log_parser",
"../logging:rtc_stream_config",
"../modules/audio_coding:ana_debug_dump_proto",
@@ -325,7 +324,7 @@
defines = [ "ENABLE_RTC_EVENT_LOG" ]
deps = [
":event_log_visualizer_utils",
- "../logging:rtc_event_log_api",
+ "../api/rtc_event_log",
"../logging:rtc_event_log_parser",
"../modules/audio_coding:neteq",
"../modules/rtp_rtcp:rtp_rtcp_format",
diff --git a/rtc_tools/rtc_event_log_visualizer/analyzer.cc b/rtc_tools/rtc_event_log_visualizer/analyzer.cc
index 2e66329..d2e6da2 100644
--- a/rtc_tools/rtc_event_log_visualizer/analyzer.cc
+++ b/rtc_tools/rtc_event_log_visualizer/analyzer.cc
@@ -1218,7 +1218,7 @@
SimulatedClock clock(0);
BitrateObserver observer;
- RtcEventLogNullImpl null_event_log;
+ RtcEventLogNull null_event_log;
PacketRouter packet_router;
PacedSender pacer(&clock, &packet_router, &null_event_log);
TransportFeedbackAdapter transport_feedback;
diff --git a/rtc_tools/rtc_event_log_visualizer/log_simulation.h b/rtc_tools/rtc_event_log_visualizer/log_simulation.h
index 480368d..15ed253 100644
--- a/rtc_tools/rtc_event_log_visualizer/log_simulation.h
+++ b/rtc_tools/rtc_event_log_visualizer/log_simulation.h
@@ -45,7 +45,7 @@
void OnFeedback(const LoggedRtcpPacketTransportFeedback& feedback);
void OnReceiverReport(const LoggedRtcpPacketReceiverReport& report);
void OnIceConfig(const LoggedIceCandidatePairConfig& candidate);
- RtcEventLogNullImpl null_event_log_;
+ RtcEventLogNull null_event_log_;
const std::function<void(const NetworkControlUpdate&, Timestamp)>
update_handler_;
diff --git a/rtc_tools/rtc_event_log_visualizer/main.cc b/rtc_tools/rtc_event_log_visualizer/main.cc
index 48adb5b..efc176c 100644
--- a/rtc_tools/rtc_event_log_visualizer/main.cc
+++ b/rtc_tools/rtc_event_log_visualizer/main.cc
@@ -24,7 +24,7 @@
#include "absl/flags/usage.h"
#include "absl/flags/usage_config.h"
#include "absl/strings/match.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/rtc_event_log_parser.h"
#include "modules/audio_coding/neteq/include/neteq.h"
#include "modules/rtp_rtcp/source/rtcp_packet/report_block.h"
diff --git a/rtc_tools/rtp_generator/rtp_generator.h b/rtc_tools/rtp_generator/rtp_generator.h
index 0a1a9f3..e857b60 100644
--- a/rtc_tools/rtp_generator/rtp_generator.h
+++ b/rtc_tools/rtp_generator/rtp_generator.h
@@ -17,6 +17,7 @@
#include "api/call/transport.h"
#include "api/media_types.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/task_queue/task_queue_factory.h"
#include "api/video/builtin_video_bitrate_allocator_factory.h"
#include "api/video_codecs/video_decoder_factory.h"
@@ -25,7 +26,6 @@
#include "call/call.h"
#include "call/rtp_config.h"
#include "call/video_send_stream.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "media/engine/webrtc_video_engine.h"
#include "rtc_base/constructor_magic.h"
#include "test/frame_generator.h"
diff --git a/test/BUILD.gn b/test/BUILD.gn
index a16c465..bd99b5d 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -740,6 +740,7 @@
"../api:transport_api",
"../api/audio_codecs:builtin_audio_decoder_factory",
"../api/audio_codecs:builtin_audio_encoder_factory",
+ "../api/rtc_event_log",
"../api/task_queue",
"../api/task_queue:default_task_queue_factory",
"../api/test/video:function_video_factory",
@@ -756,7 +757,6 @@
"../call:simulated_network",
"../call:simulated_packet_receiver",
"../call:video_stream_api",
- "../logging:rtc_event_log_api",
"../media:rtc_internal_video_codecs",
"../media:rtc_media_base",
"../modules/audio_device",
diff --git a/test/call_test.h b/test/call_test.h
index b154df0..7aa070f 100644
--- a/test/call_test.h
+++ b/test/call_test.h
@@ -16,12 +16,12 @@
#include <vector>
#include "absl/types/optional.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/task_queue/task_queue_factory.h"
#include "api/test/video/function_video_decoder_factory.h"
#include "api/test/video/function_video_encoder_factory.h"
#include "api/video/video_bitrate_allocator_factory.h"
#include "call/call.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/audio_device/include/test_audio_device.h"
#include "test/encoder_settings.h"
#include "test/fake_decoder.h"
diff --git a/test/fuzzers/utils/BUILD.gn b/test/fuzzers/utils/BUILD.gn
index 64bbb3e..307cbe1 100644
--- a/test/fuzzers/utils/BUILD.gn
+++ b/test/fuzzers/utils/BUILD.gn
@@ -15,13 +15,13 @@
"rtp_replayer.h",
]
deps = [
+ "../../../api/rtc_event_log",
"../../../api/task_queue:default_task_queue_factory",
"../../../api/test/video:function_video_factory",
"../../../api/video_codecs:video_codecs_api",
"../../../call",
"../../../call:call_interfaces",
"../../../common_video",
- "../../../logging:rtc_event_log_api",
"../../../media:rtc_internal_video_codecs",
"../../../modules/rtp_rtcp",
"../../../rtc_base:checks",
diff --git a/test/fuzzers/utils/rtp_replayer.cc b/test/fuzzers/utils/rtp_replayer.cc
index 05abe17..e430d40 100644
--- a/test/fuzzers/utils/rtp_replayer.cc
+++ b/test/fuzzers/utils/rtp_replayer.cc
@@ -51,7 +51,7 @@
}
// Setup the video streams based on the configuration.
- webrtc::RtcEventLogNullImpl event_log;
+ webrtc::RtcEventLogNull event_log;
std::unique_ptr<TaskQueueFactory> task_queue_factory =
CreateDefaultTaskQueueFactory();
Call::Config call_config(&event_log);
diff --git a/test/fuzzers/utils/rtp_replayer.h b/test/fuzzers/utils/rtp_replayer.h
index b77ac23..3217fc3 100644
--- a/test/fuzzers/utils/rtp_replayer.h
+++ b/test/fuzzers/utils/rtp_replayer.h
@@ -18,10 +18,10 @@
#include <string>
#include <vector>
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/test/video/function_video_decoder_factory.h"
#include "api/video_codecs/video_decoder.h"
#include "call/call.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "media/engine/internal_decoder_factory.h"
#include "rtc_base/time_utils.h"
#include "test/null_transport.h"
diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn
index beca4b2..6d24bbb 100644
--- a/test/pc/e2e/BUILD.gn
+++ b/test/pc/e2e/BUILD.gn
@@ -265,11 +265,11 @@
"../../../api:rtc_event_log_output_file",
"../../../api:scoped_refptr",
"../../../api:video_quality_analyzer_api",
+ "../../../api/rtc_event_log",
"../../../api/task_queue",
"../../../api/task_queue:default_task_queue_factory",
"../../../api/units:time_delta",
"../../../api/units:timestamp",
- "../../../logging:rtc_event_log_api",
"../../../pc:pc_test_utils",
"../../../pc:peerconnection",
"../../../rtc_base",
diff --git a/test/pc/e2e/peer_connection_quality_test.cc b/test/pc/e2e/peer_connection_quality_test.cc
index 697c6ce..03fa31f 100644
--- a/test/pc/e2e/peer_connection_quality_test.cc
+++ b/test/pc/e2e/peer_connection_quality_test.cc
@@ -17,12 +17,12 @@
#include "api/jsep.h"
#include "api/media_stream_interface.h"
#include "api/peer_connection_interface.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/rtc_event_log_output_file.h"
#include "api/scoped_refptr.h"
#include "api/task_queue/default_task_queue_factory.h"
#include "api/test/video_quality_analyzer_interface.h"
#include "api/units/time_delta.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "pc/sdp_utils.h"
#include "pc/test/mock_peer_connection_observers.h"
#include "rtc_base/bind.h"
diff --git a/test/scenario/BUILD.gn b/test/scenario/BUILD.gn
index 5f3aec8..2a7d883 100644
--- a/test/scenario/BUILD.gn
+++ b/test/scenario/BUILD.gn
@@ -105,7 +105,6 @@
"../../call:simulated_network",
"../../call:video_stream_api",
"../../common_video",
- "../../logging:rtc_event_log_api",
"../../media:rtc_audio_video",
"../../media:rtc_internal_video_codecs",
"../../media:rtc_media_base",
diff --git a/test/scenario/call_client.h b/test/scenario/call_client.h
index 3e51945..49939ed 100644
--- a/test/scenario/call_client.h
+++ b/test/scenario/call_client.h
@@ -16,8 +16,8 @@
#include <utility>
#include <vector>
+#include "api/rtc_event_log/rtc_event_log.h"
#include "call/call.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/audio_device/include/test_audio_device.h"
#include "modules/congestion_controller/goog_cc/test/goog_cc_printer.h"
#include "modules/rtp_rtcp/include/rtp_header_parser.h"
diff --git a/video/BUILD.gn b/video/BUILD.gn
index 6221053..e7f5a5b 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -57,6 +57,7 @@
"../api:libjingle_peerconnection_api",
"../api:scoped_refptr",
"../api:transport_api",
+ "../api/rtc_event_log",
"../api/task_queue",
"../api/video:encoded_image",
"../api/video:video_bitrate_allocation",
@@ -74,7 +75,6 @@
"../call:rtp_sender",
"../call:video_stream_api",
"../common_video",
- "../logging:rtc_event_log_api",
"../media:rtc_h264_profile_id",
"../modules:module_api",
"../modules:module_api_public",
@@ -269,7 +269,6 @@
"../call:fake_network",
"../call:simulated_network",
"../common_video",
- "../logging:rtc_event_log_api",
"../media:rtc_audio_video",
"../media:rtc_encoder_simulcast_proxy",
"../media:rtc_internal_video_codecs",
@@ -476,11 +475,11 @@
"video_replay.cc",
]
deps = [
+ "../api/rtc_event_log",
"../api/test/video:function_video_factory",
"../api/video_codecs:video_codecs_api",
"../call:call_interfaces",
"../common_video",
- "../logging:rtc_event_log_api",
"../media:rtc_internal_video_codecs",
"../modules/rtp_rtcp",
"../rtc_base:checks",
@@ -567,6 +566,7 @@
"../api:rtp_headers",
"../api:scoped_refptr",
"../api:simulated_network_api",
+ "../api/rtc_event_log",
"../api/task_queue:default_task_queue_factory",
"../api/test/video:function_video_factory",
"../api/units:data_rate",
@@ -592,7 +592,6 @@
"../call:video_stream_api",
"../common_video",
"../common_video/test:utilities",
- "../logging:rtc_event_log_api",
"../media:rtc_audio_video",
"../media:rtc_internal_video_codecs",
"../media:rtc_media",
diff --git a/video/end_to_end_tests/multi_stream_tester.cc b/video/end_to_end_tests/multi_stream_tester.cc
index ff25c70..b267e63 100644
--- a/video/end_to_end_tests/multi_stream_tester.cc
+++ b/video/end_to_end_tests/multi_stream_tester.cc
@@ -15,13 +15,13 @@
#include <vector>
#include "absl/memory/memory.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/task_queue/default_task_queue_factory.h"
#include "api/test/simulated_network.h"
#include "api/test/video/function_video_encoder_factory.h"
#include "api/video/builtin_video_bitrate_allocator_factory.h"
#include "call/fake_network_pipe.h"
#include "call/simulated_network.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "media/engine/internal_decoder_factory.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "test/call_test.h"
@@ -45,7 +45,7 @@
MultiStreamTester::~MultiStreamTester() {}
void MultiStreamTester::RunTest() {
- webrtc::RtcEventLogNullImpl event_log;
+ webrtc::RtcEventLogNull event_log;
auto task_queue_factory = CreateDefaultTaskQueueFactory();
Call::Config config(&event_log);
config.task_queue_factory = task_queue_factory.get();
diff --git a/video/video_replay.cc b/video/video_replay.cc
index 98b1196..86ed8bd 100644
--- a/video/video_replay.cc
+++ b/video/video_replay.cc
@@ -17,11 +17,11 @@
#include "absl/flags/flag.h"
#include "absl/flags/parse.h"
#include "absl/memory/memory.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/test/video/function_video_decoder_factory.h"
#include "api/video_codecs/video_decoder.h"
#include "call/call.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "media/engine/internal_decoder_factory.h"
#include "modules/rtp_rtcp/include/rtp_header_parser.h"
#include "rtc_base/checks.h"
@@ -262,7 +262,7 @@
// Replay a rtp dump with an optional json configuration.
static void Replay(const std::string& replay_config_path,
const std::string& rtp_dump_path) {
- webrtc::RtcEventLogNullImpl event_log;
+ webrtc::RtcEventLogNull event_log;
Call::Config call_config(&event_log);
std::unique_ptr<Call> call(Call::Create(call_config));
std::unique_ptr<StreamState> stream_state;
diff --git a/video/video_send_stream_impl.h b/video/video_send_stream_impl.h
index 64826a3..7b7136f 100644
--- a/video/video_send_stream_impl.h
+++ b/video/video_send_stream_impl.h
@@ -20,6 +20,7 @@
#include "absl/types/optional.h"
#include "api/fec_controller.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/video/encoded_image.h"
#include "api/video/video_bitrate_allocation.h"
#include "api/video/video_bitrate_allocator.h"
@@ -30,7 +31,6 @@
#include "call/rtp_config.h"
#include "call/rtp_transport_controller_send_interface.h"
#include "call/rtp_video_sender_interface.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/include/module_common_types.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "modules/utility/include/process_thread.h"
diff --git a/video/video_send_stream_impl_unittest.cc b/video/video_send_stream_impl_unittest.cc
index e6a291f..ed1f6e3 100644
--- a/video/video_send_stream_impl_unittest.cc
+++ b/video/video_send_stream_impl_unittest.cc
@@ -14,10 +14,10 @@
#include "absl/memory/memory.h"
#include "absl/types/optional.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "call/rtp_video_sender.h"
#include "call/test/mock_bitrate_allocator.h"
#include "call/test/mock_rtp_transport_controller_send.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/rtp_rtcp/source/rtp_sequence_number_map.h"
#include "modules/utility/include/process_thread.h"
#include "modules/video_coding/fec_controller_default.h"
@@ -142,7 +142,7 @@
bool rtp_video_sender_active_ = false;
SimulatedClock clock_;
- RtcEventLogNullImpl event_log_;
+ RtcEventLogNull event_log_;
VideoSendStream::Config config_;
SendDelayStats send_delay_stats_;
TaskQueueForTest test_queue_;
