Clean up visibility and dependencies of RTC event log build targets.

- Remove visibility of encoder target.
- Remove unnecessary dependency on task_queue.
- Remove CreateRtcEventLogFactory() declaration from the rtc_event_log_api target
  since the function is not defined in that target.

Bug: None
Change-Id: Id9edee86f358d08ea063d62bd96e9653c5b06d55
Reviewed-on: https://webrtc-review.googlesource.com/c/116060
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26215}
This commit is contained in:
Bjorn Terelius 2019-01-09 11:15:34 +01:00 committed by Commit Bot
parent e4ed6ea63b
commit b8b3c9918f
18 changed files with 17 additions and 9 deletions

View file

@ -1,6 +1,7 @@
include_rules = [ include_rules = [
"+api", "+api",
"+common_video", "+common_video",
"+logging/rtc_event_log/rtc_event_log_factory.h",
"+media", "+media",
"+modules/audio_device", "+modules/audio_device",
"+modules/video_capture", "+modules/video_capture",

View file

@ -1,4 +1,5 @@
include_rules = [ include_rules = [
"+logging/rtc_event_log/rtc_event_log_factory.h",
"+modules/utility/include", "+modules/utility/include",
"+sdk/android/native_api", "+sdk/android/native_api",
] ]

View file

@ -18,6 +18,7 @@
#include "api/peerconnectioninterface.h" #include "api/peerconnectioninterface.h"
#include "api/video/builtin_video_bitrate_allocator_factory.h" #include "api/video/builtin_video_bitrate_allocator_factory.h"
#include "examples/androidnativeapi/generated_jni/jni/CallClient_jni.h" #include "examples/androidnativeapi/generated_jni/jni/CallClient_jni.h"
#include "logging/rtc_event_log/rtc_event_log_factory.h"
#include "media/engine/internaldecoderfactory.h" #include "media/engine/internaldecoderfactory.h"
#include "media/engine/internalencoderfactory.h" #include "media/engine/internalencoderfactory.h"
#include "media/engine/webrtcmediaengine.h" #include "media/engine/webrtcmediaengine.h"

View file

@ -22,6 +22,7 @@
#include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "api/peerconnectioninterface.h" #include "api/peerconnectioninterface.h"
#include "api/video/builtin_video_bitrate_allocator_factory.h" #include "api/video/builtin_video_bitrate_allocator_factory.h"
#include "logging/rtc_event_log/rtc_event_log_factory.h"
#include "media/engine/webrtcmediaengine.h" #include "media/engine/webrtcmediaengine.h"
#include "modules/audio_processing/include/audio_processing.h" #include "modules/audio_processing/include/audio_processing.h"
#include "sdk/objc/native/api/video_capturer.h" #include "sdk/objc/native/api/video_capturer.h"

View file

@ -41,7 +41,6 @@ rtc_source_set("rtc_event_log_api") {
"../api:libjingle_logging_api", "../api:libjingle_logging_api",
"../rtc_base:ptr_util", "../rtc_base:ptr_util",
"../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_approved",
"../rtc_base:rtc_task_queue",
"//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/memory",
] ]
} }
@ -158,7 +157,6 @@ rtc_source_set("rtc_event_video") {
# TODO(eladalon): Break down into (1) encoder and (2) decoder; we don't need # TODO(eladalon): Break down into (1) encoder and (2) decoder; we don't need
# the decoder code in the WebRTC library, only in unit tests and tools. # the decoder code in the WebRTC library, only in unit tests and tools.
rtc_static_library("rtc_event_log_impl_encoder") { rtc_static_library("rtc_event_log_impl_encoder") {
visibility = [ "*" ]
sources = [ sources = [
"rtc_event_log/encoder/blob_encoding.cc", "rtc_event_log/encoder/blob_encoding.cc",
"rtc_event_log/encoder/blob_encoding.h", "rtc_event_log/encoder/blob_encoding.h",
@ -225,6 +223,8 @@ rtc_source_set("rtc_event_log_impl_output") {
} }
rtc_static_library("rtc_event_log_impl_base") { rtc_static_library("rtc_event_log_impl_base") {
# TODO(terelius): Should this really be visible? Currently used to instantiate
# the default event log factory.
visibility = [ "*" ] visibility = [ "*" ]
sources = [ sources = [
"rtc_event_log/rtc_event_log_factory.cc", "rtc_event_log/rtc_event_log_factory.cc",

View file

@ -16,7 +16,6 @@
#include "api/rtceventlogoutput.h" #include "api/rtceventlogoutput.h"
#include "logging/rtc_event_log/events/rtc_event.h" #include "logging/rtc_event_log/events/rtc_event.h"
#include "rtc_base/task_queue.h"
namespace webrtc { namespace webrtc {

View file

@ -15,7 +15,6 @@
#include "logging/rtc_event_log/rtc_event_log.h" #include "logging/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/rtc_event_log_factory_interface.h" #include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
#include "rtc_base/task_queue.h"
namespace webrtc { namespace webrtc {

View file

@ -14,7 +14,6 @@
#include <memory> #include <memory>
#include "logging/rtc_event_log/rtc_event_log.h" #include "logging/rtc_event_log/rtc_event_log.h"
#include "rtc_base/task_queue.h"
namespace webrtc { namespace webrtc {
@ -29,8 +28,6 @@ class RtcEventLogFactoryInterface {
RtcEventLog::EncodingType encoding_type) = 0; RtcEventLog::EncodingType encoding_type) = 0;
}; };
std::unique_ptr<RtcEventLogFactoryInterface> CreateRtcEventLogFactory();
} // namespace webrtc } // namespace webrtc
#endif // LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_FACTORY_INTERFACE_H_ #endif // LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_FACTORY_INTERFACE_H_

View file

@ -36,6 +36,7 @@
#include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/sdp_video_format.h"
#include "call/call.h" #include "call/call.h"
#include "logging/rtc_event_log/fake_rtc_event_log_factory.h" #include "logging/rtc_event_log/fake_rtc_event_log_factory.h"
#include "logging/rtc_event_log/rtc_event_log_factory.h"
#include "logging/rtc_event_log/rtc_event_log_factory_interface.h" #include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
#include "media/engine/fakewebrtcvideoengine.h" #include "media/engine/fakewebrtcvideoengine.h"
#include "media/engine/webrtcmediaengine.h" #include "media/engine/webrtcmediaengine.h"

View file

@ -42,6 +42,7 @@
#include "api/video_codecs/video_encoder_factory.h" #include "api/video_codecs/video_encoder_factory.h"
#include "logging/rtc_event_log/output/rtc_event_log_output_file.h" #include "logging/rtc_event_log/output/rtc_event_log_output_file.h"
#include "logging/rtc_event_log/rtc_event_log.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_factory_interface.h" #include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
#include "media/base/codec.h" #include "media/base/codec.h"
#include "media/base/fakevideocapturer.h" #include "media/base/fakevideocapturer.h"

View file

@ -918,6 +918,7 @@ if (is_ios || is_mac) {
"../api/video:video_frame", "../api/video:video_frame",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../common_video", "../common_video",
"../logging:rtc_event_log_impl_base",
"../media:rtc_media_base", "../media:rtc_media_base",
"../modules:module_api", "../modules:module_api",
"../modules/audio_device:audio_device_api", "../modules/audio_device:audio_device_api",

View file

@ -1021,6 +1021,7 @@ if (is_android) {
"../../api/video_codecs:video_codecs_api", "../../api/video_codecs:video_codecs_api",
"../../call:call_interfaces", "../../call:call_interfaces",
"../../logging:rtc_event_log_api", "../../logging:rtc_event_log_api",
"../../logging:rtc_event_log_impl_base",
"../../media:rtc_audio_video", "../../media:rtc_audio_video",
"../../modules/audio_device:audio_device", "../../modules/audio_device:audio_device",
"../../modules/audio_processing:api", "../../modules/audio_processing:api",
@ -1502,6 +1503,7 @@ if (is_android) {
"../../api/audio_codecs:builtin_audio_decoder_factory", "../../api/audio_codecs:builtin_audio_decoder_factory",
"../../api/audio_codecs:builtin_audio_encoder_factory", "../../api/audio_codecs:builtin_audio_encoder_factory",
"../../api/video:video_frame", "../../api/video:video_frame",
"../../logging:rtc_event_log_impl_base",
"../../media:rtc_audio_video", "../../media:rtc_audio_video",
"../../media:rtc_internal_video_codecs", "../../media:rtc_internal_video_codecs",
"../../media:rtc_media_base", "../../media:rtc_media_base",

View file

@ -1,4 +1,5 @@
include_rules = [ include_rules = [
"+logging/rtc_event_log/rtc_event_log_factory.h",
"+media/base", "+media/base",
"+media/engine", "+media/engine",
"+modules/audio_processing/include/audio_processing.h", "+modules/audio_processing/include/audio_processing.h",

View file

@ -12,6 +12,7 @@
#include "absl/memory/memory.h" #include "absl/memory/memory.h"
#include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "logging/rtc_event_log/rtc_event_log_factory.h"
#include "media/base/mediaengine.h" #include "media/base/mediaengine.h"
#include "media/engine/internaldecoderfactory.h" #include "media/engine/internaldecoderfactory.h"
#include "media/engine/internalencoderfactory.h" #include "media/engine/internalencoderfactory.h"

View file

@ -2,7 +2,7 @@ include_rules = [
"+third_party/libyuv", "+third_party/libyuv",
"+call/callfactoryinterface.h", "+call/callfactoryinterface.h",
"+common_video", "+common_video",
"+logging/rtc_event_log/rtc_event_log_factory_interface.h", "+logging/rtc_event_log/rtc_event_log_factory.h",
"+media/base", "+media/base",
"+media/engine", "+media/engine",
"+modules/audio_device/include/audio_device.h", "+modules/audio_device/include/audio_device.h",

View file

@ -14,7 +14,7 @@
#include "api/call/callfactoryinterface.h" #include "api/call/callfactoryinterface.h"
#include "api/video_codecs/video_decoder_factory.h" #include "api/video_codecs/video_decoder_factory.h"
#include "api/video_codecs/video_encoder_factory.h" #include "api/video_codecs/video_encoder_factory.h"
#include "logging/rtc_event_log/rtc_event_log_factory_interface.h" #include "logging/rtc_event_log/rtc_event_log_factory.h"
#include "media/engine/webrtcmediaengine.h" #include "media/engine/webrtcmediaengine.h"
#include "modules/audio_device/include/audio_device.h" #include "modules/audio_device/include/audio_device.h"
#include "modules/audio_processing/include/audio_processing.h" #include "modules/audio_processing/include/audio_processing.h"

View file

@ -7,6 +7,7 @@ include_rules = [
"+common_video/h264", "+common_video/h264",
"+common_video/include", "+common_video/include",
"+common_video/libyuv/include", "+common_video/libyuv/include",
"+logging/rtc_event_log/rtc_event_log_factory.h",
"+media", "+media",
"+modules/video_coding", "+modules/video_coding",
"+pc", "+pc",

View file

@ -30,6 +30,7 @@
// is not smart enough to take the #ifdef into account. // is not smart enough to take the #ifdef into account.
#include "api/audio_codecs/builtin_audio_decoder_factory.h" // nogncheck #include "api/audio_codecs/builtin_audio_decoder_factory.h" // nogncheck
#include "api/audio_codecs/builtin_audio_encoder_factory.h" // nogncheck #include "api/audio_codecs/builtin_audio_encoder_factory.h" // nogncheck
#include "logging/rtc_event_log/rtc_event_log_factory.h"
#include "media/engine/convert_legacy_video_factory.h" // nogncheck #include "media/engine/convert_legacy_video_factory.h" // nogncheck
#include "modules/audio_device/include/audio_device.h" // nogncheck #include "modules/audio_device/include/audio_device.h" // nogncheck
#include "modules/audio_processing/include/audio_processing.h" // nogncheck #include "modules/audio_processing/include/audio_processing.h" // nogncheck