diff --git a/BUILD.gn b/BUILD.gn index aaf60ebcd4..28ad562887 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -392,12 +392,12 @@ if (!build_with_chromium) { ":webrtc_common", "api:libjingle_peerconnection_api", "api:transport_api", + "api/rtc_event_log:rtc_event_log_factory", "audio", "call", "common_audio", "common_video", "logging:rtc_event_log_api", - "logging:rtc_event_log_impl_base", "media", "modules", "modules/video_capture:video_capture_internal_impl", diff --git a/call/BUILD.gn b/call/BUILD.gn index df10933512..694a2ebf3a 100644 --- a/call/BUILD.gn +++ b/call/BUILD.gn @@ -377,7 +377,6 @@ if (rtc_include_tests) { "../api/video:video_rtp_headers", "../audio", "../logging:rtc_event_log_api", - "../logging:rtc_event_log_impl_base", "../modules/audio_device:mock_audio_device", "../modules/audio_mixer", "../modules/audio_mixer:audio_mixer_impl", @@ -428,13 +427,13 @@ if (rtc_include_tests) { "../api:rtc_event_log_output_file", "../api:simulated_network_api", "../api/audio_codecs:builtin_audio_encoder_factory", + "../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", - "../logging:rtc_event_log_impl_base", "../modules/audio_coding", "../modules/audio_device", "../modules/audio_device:audio_device_impl", diff --git a/call/rampup_tests.cc b/call/rampup_tests.cc index 71a22f9040..914160ed81 100644 --- a/call/rampup_tests.cc +++ b/call/rampup_tests.cc @@ -13,11 +13,11 @@ #include #include "absl/memory/memory.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" #include "api/task_queue/task_queue_factory.h" #include "call/fake_network_pipe.h" -#include "logging/rtc_event_log/rtc_event_log_factory.h" #include "rtc_base/checks.h" #include "rtc_base/flags.h" #include "rtc_base/logging.h" diff --git a/examples/BUILD.gn b/examples/BUILD.gn index a6ab7fab28..60efbedf3d 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -464,8 +464,8 @@ if (is_ios || (is_mac && target_cpu != "x86")) { "../api:scoped_refptr", "../api/audio_codecs:builtin_audio_decoder_factory", "../api/audio_codecs:builtin_audio_encoder_factory", + "../api/rtc_event_log:rtc_event_log_factory", "../api/task_queue:default_task_queue_factory", - "../logging:rtc_event_log_impl_base", "../media:rtc_audio_video", "../modules/audio_processing", "../modules/audio_processing:api", diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn index 58d7b93d11..1d452ee24d 100644 --- a/examples/androidnativeapi/BUILD.gn +++ b/examples/androidnativeapi/BUILD.gn @@ -50,8 +50,8 @@ if (is_android) { ":generated_jni", "../../api:scoped_refptr", "//api:libjingle_peerconnection_api", + "//api/rtc_event_log:rtc_event_log_factory", "//api/task_queue:default_task_queue_factory", - "//logging:rtc_event_log_impl_base", "//media:rtc_audio_video", "//media:rtc_internal_video_codecs", "//media:rtc_media_engine_defaults", diff --git a/examples/androidnativeapi/jni/android_call_client.cc b/examples/androidnativeapi/jni/android_call_client.cc index b0ba596f7a..3e995c3425 100644 --- a/examples/androidnativeapi/jni/android_call_client.cc +++ b/examples/androidnativeapi/jni/android_call_client.cc @@ -14,9 +14,9 @@ #include "absl/memory/memory.h" #include "api/peer_connection_interface.h" +#include "api/rtc_event_log/rtc_event_log_factory.h" #include "api/task_queue/default_task_queue_factory.h" #include "examples/androidnativeapi/generated_jni/CallClient_jni.h" -#include "logging/rtc_event_log/rtc_event_log_factory.h" #include "media/engine/internal_decoder_factory.h" #include "media/engine/internal_encoder_factory.h" #include "media/engine/webrtc_media_engine.h" diff --git a/examples/objcnativeapi/objc/objc_call_client.mm b/examples/objcnativeapi/objc/objc_call_client.mm index 294f0814c9..3d07cd022b 100644 --- a/examples/objcnativeapi/objc/objc_call_client.mm +++ b/examples/objcnativeapi/objc/objc_call_client.mm @@ -21,8 +21,8 @@ #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/peer_connection_interface.h" +#include "api/rtc_event_log/rtc_event_log_factory.h" #include "api/task_queue/default_task_queue_factory.h" -#include "logging/rtc_event_log/rtc_event_log_factory.h" #include "media/engine/webrtc_media_engine.h" #include "modules/audio_processing/include/audio_processing.h" #include "sdk/objc/native/api/video_capturer.h" diff --git a/logging/BUILD.gn b/logging/BUILD.gn index ca1d2c9eba..9e0b82e65a 100644 --- a/logging/BUILD.gn +++ b/logging/BUILD.gn @@ -19,7 +19,6 @@ group("logging") { deps = [ ":rtc_event_audio", ":rtc_event_bwe", - ":rtc_event_log_impl_base", ":rtc_event_log_impl_encoder", ":rtc_event_pacing", ":rtc_event_rtp_rtcp", @@ -266,23 +265,6 @@ if (rtc_enable_protobuf) { } } -rtc_static_library("rtc_event_log_impl_base") { - # TODO(bugs.webrtc.org/10206): Remove this target when all users switch to - # using target api/rtc_event_log:rtc_event_log_factory directly. - visibility = [ "*" ] - sources = [ - "rtc_event_log/rtc_event_log_factory.cc", - "rtc_event_log/rtc_event_log_factory.h", - ] - - deps = [ - "../api/rtc_event_log", - "../api/rtc_event_log:rtc_event_log_factory", - "../api/task_queue:global_task_queue_factory", - "//third_party/abseil-cpp/absl/memory", - ] -} - rtc_source_set("fake_rtc_event_log") { testonly = true sources = [ @@ -380,7 +362,6 @@ if (rtc_enable_protobuf) { ":rtc_event_generic_packet_events", ":rtc_event_log2_proto", ":rtc_event_log_api", - ":rtc_event_log_impl_base", ":rtc_event_log_impl_encoder", ":rtc_event_log_parser", ":rtc_event_log_proto", @@ -392,6 +373,7 @@ if (rtc_enable_protobuf) { "../api:libjingle_peerconnection_api", "../api:rtc_event_log_output_file", "../api:rtp_headers", + "../api/rtc_event_log:rtc_event_log_factory", "../api/task_queue:default_task_queue_factory", "../call", "../call:call_interfaces", diff --git a/logging/rtc_event_log/rtc_event_log_factory.cc b/logging/rtc_event_log/rtc_event_log_factory.cc deleted file mode 100644 index ff6e4e549a..0000000000 --- a/logging/rtc_event_log/rtc_event_log_factory.cc +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2017 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. - */ - -#include "logging/rtc_event_log/rtc_event_log_factory.h" - -#include "absl/memory/memory.h" -#include "api/task_queue/global_task_queue_factory.h" - -namespace webrtc { - -std::unique_ptr CreateRtcEventLogFactory() { - return absl::make_unique(&GlobalTaskQueueFactory()); -} - -} // namespace webrtc diff --git a/logging/rtc_event_log/rtc_event_log_factory.h b/logging/rtc_event_log/rtc_event_log_factory.h deleted file mode 100644 index 63b1b609c3..0000000000 --- a/logging/rtc_event_log/rtc_event_log_factory.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2017 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_FACTORY_H_ -#define LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_FACTORY_H_ - -#include - -#include "api/rtc_event_log/rtc_event_log_factory.h" -#include "api/rtc_event_log/rtc_event_log_factory_interface.h" - -namespace webrtc { - -// TODO(bugs.webrtc.org/10284): Stop using the RtcEventLogFactory factory. -std::unique_ptr CreateRtcEventLogFactory(); -} // namespace webrtc - -#endif // LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_FACTORY_H_ diff --git a/logging/rtc_event_log/rtc_event_log_unittest.cc b/logging/rtc_event_log/rtc_event_log_unittest.cc index 896a76df66..4d01dad9d4 100644 --- a/logging/rtc_event_log/rtc_event_log_unittest.cc +++ b/logging/rtc_event_log/rtc_event_log_unittest.cc @@ -18,6 +18,7 @@ #include #include "absl/memory/memory.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" #include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h" @@ -41,7 +42,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 "logging/rtc_event_log/rtc_event_log.h" -#include "logging/rtc_event_log/rtc_event_log_factory.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" diff --git a/media/BUILD.gn b/media/BUILD.gn index 6dee916f3d..3e338fe076 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -535,7 +535,6 @@ if (rtc_include_tests) { "../call:call_interfaces", "../common_video", "../logging:rtc_event_log_api", - "../logging:rtc_event_log_impl_base", "../modules/audio_device:mock_audio_device", "../modules/audio_processing", "../modules/audio_processing:api", diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn index d0ae7518b2..ff3097aef6 100644 --- a/rtc_tools/BUILD.gn +++ b/rtc_tools/BUILD.gn @@ -184,7 +184,6 @@ if (!build_with_chromium) { "../call:simulated_packet_receiver", "../call:video_stream_api", "../logging:rtc_event_log_api", - "../logging:rtc_event_log_impl_base", "../media:rtc_audio_video", "../media:rtc_media_base", "../rtc_base", @@ -324,7 +323,6 @@ if (!build_with_chromium) { "../call:call_interfaces", "../call:video_stream_api", "../logging:rtc_event_log_api", - "../logging:rtc_event_log_impl_base", "../logging:rtc_event_log_parser", "../logging:rtc_stream_config", "../modules/audio_coding:ana_debug_dump_proto", diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index 6036a4d781..f255e7bf28 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -917,12 +917,12 @@ if (is_ios || is_mac) { "../api/audio_codecs:audio_codecs_api", "../api/audio_codecs:builtin_audio_decoder_factory", "../api/audio_codecs:builtin_audio_encoder_factory", + "../api/rtc_event_log:rtc_event_log_factory", "../api/task_queue:default_task_queue_factory", "../api/video:video_frame", "../api/video:video_rtp_headers", "../api/video_codecs:video_codecs_api", "../common_video", - "../logging:rtc_event_log_impl_base", "../media:rtc_media_base", "../modules:module_api", "../modules/audio_device:audio_device_api", diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index 2253f5330b..d92d666988 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -1476,10 +1476,10 @@ if (is_android) { ":opensles_audio_device_module", ":video_jni", "../../api:scoped_refptr", + "../../api/rtc_event_log:rtc_event_log_factory", "../../api/task_queue:default_task_queue_factory", "../../api/video:video_frame", "../../api/video:video_rtp_headers", - "../../logging:rtc_event_log_impl_base", "../../media:rtc_audio_video", "../../media:rtc_internal_video_codecs", "../../media:rtc_media_base", diff --git a/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc b/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc index 199ef14d39..6e1e46402a 100644 --- a/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc +++ b/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc @@ -10,8 +10,8 @@ #include "sdk/android/native_api/peerconnection/peer_connection_factory.h" #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event_log_factory.h" #include "api/task_queue/default_task_queue_factory.h" -#include "logging/rtc_event_log/rtc_event_log_factory.h" #include "media/base/media_engine.h" #include "media/engine/internal_decoder_factory.h" #include "media/engine/internal_encoder_factory.h" diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm index 366c56acdb..bb695b57c0 100644 --- a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm +++ b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm @@ -31,8 +31,8 @@ #include "absl/memory/memory.h" #include "api/audio_codecs/builtin_audio_decoder_factory.h" // nogncheck #include "api/audio_codecs/builtin_audio_encoder_factory.h" // nogncheck +#include "api/rtc_event_log/rtc_event_log_factory.h" #include "api/task_queue/default_task_queue_factory.h" -#include "logging/rtc_event_log/rtc_event_log_factory.h" #include "modules/audio_device/include/audio_device.h" // nogncheck #include "modules/audio_processing/include/audio_processing.h" // nogncheck diff --git a/test/BUILD.gn b/test/BUILD.gn index 6c6e1d3ec0..233d0efee9 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -748,7 +748,6 @@ rtc_source_set("test_common") { "../call:simulated_packet_receiver", "../call:video_stream_api", "../logging:rtc_event_log_api", - "../logging:rtc_event_log_impl_base", "../media:rtc_internal_video_codecs", "../media:rtc_media_base", "../modules/audio_device", diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn index 06b96e8fcc..a6c180f181 100644 --- a/test/fuzzers/BUILD.gn +++ b/test/fuzzers/BUILD.gn @@ -255,7 +255,6 @@ webrtc_fuzzer_test("congestion_controller_feedback_fuzzer") { ] deps = [ "../../logging:rtc_event_log_api", - "../../logging:rtc_event_log_impl_base", "../../modules/congestion_controller", "../../modules/pacing", "../../modules/remote_bitrate_estimator", diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn index 6fbc1caf0c..beca4b25de 100644 --- a/test/pc/e2e/BUILD.gn +++ b/test/pc/e2e/BUILD.gn @@ -350,7 +350,6 @@ if (rtc_include_tests) { "../../../api/video_codecs:builtin_video_decoder_factory", "../../../api/video_codecs:builtin_video_encoder_factory", "../../../call:simulated_network", - "../../../logging:rtc_event_log_impl_base", "../../../media:rtc_audio_video", "../../../modules/audio_device:audio_device_impl", "../../../p2p:rtc_p2p", diff --git a/video/BUILD.gn b/video/BUILD.gn index ea09c16946..8ecdd984e1 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -256,6 +256,7 @@ if (rtc_include_tests) { "../api:rtc_event_log_output_file", "../api:test_dependency_factory", "../api:video_quality_test_fixture_api", + "../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", @@ -267,7 +268,6 @@ if (rtc_include_tests) { "../call:simulated_network", "../common_video", "../logging:rtc_event_log_api", - "../logging:rtc_event_log_impl_base", "../media:rtc_audio_video", "../media:rtc_encoder_simulcast_proxy", "../media:rtc_internal_video_codecs", diff --git a/video/video_quality_test.h b/video/video_quality_test.h index 92e511f2de..a8bb8a496e 100644 --- a/video/video_quality_test.h +++ b/video/video_quality_test.h @@ -16,11 +16,11 @@ #include #include "api/fec_controller.h" +#include "api/rtc_event_log/rtc_event_log_factory.h" #include "api/task_queue/task_queue_factory.h" #include "api/test/video_quality_test_fixture.h" #include "api/video/video_bitrate_allocator_factory.h" #include "call/fake_network_pipe.h" -#include "logging/rtc_event_log/rtc_event_log_factory.h" #include "media/engine/internal_decoder_factory.h" #include "media/engine/internal_encoder_factory.h" #include "test/call_test.h"