From 99a81b613d754baad33f68a0c3f8fdd60ee8f186 Mon Sep 17 00:00:00 2001 From: Elad Alon Date: Thu, 21 Sep 2017 10:25:29 +0200 Subject: [PATCH] Remove #include of rtc_stream_config.h from rtc_event_log.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit StreamConfig is not integral to RTC-event logging in general, but rather to specific events. Therefore, the dependency on it should not be exported through rtc_event_log.h. BUG=webrtc:8111 TBR=stefan@webrtc.org Change-Id: I1ece0830cd05fd12220c8c717490e15942bacec9 Reviewed-on: https://webrtc-review.googlesource.com/1238 Commit-Queue: Elad Alon Reviewed-by: Björn Terelius Reviewed-by: Elad Alon Cr-Commit-Position: refs/heads/master@{#19911} --- call/call.cc | 1 + logging/rtc_event_log/mock/mock_rtc_event_log.h | 1 + logging/rtc_event_log/rtc_event_log.cc | 1 + logging/rtc_event_log/rtc_event_log.h | 4 ++-- logging/rtc_event_log/rtc_event_log_parser.h | 1 + logging/rtc_event_log/rtc_event_log_unittest.cc | 1 + rtc_tools/event_log_visualizer/analyzer.cc | 1 + 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/call/call.cc b/call/call.cc index 102df03817..1bfde2e692 100644 --- a/call/call.cc +++ b/call/call.cc @@ -28,6 +28,7 @@ #include "call/rtp_stream_receiver_controller.h" #include "call/rtp_transport_controller_send.h" #include "logging/rtc_event_log/rtc_event_log.h" +#include "logging/rtc_event_log/rtc_stream_config.h" #include "modules/bitrate_controller/include/bitrate_controller.h" #include "modules/congestion_controller/include/receive_side_congestion_controller.h" #include "modules/rtp_rtcp/include/flexfec_receiver.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 25cb52e964..eb0d9b9596 100644 --- a/logging/rtc_event_log/mock/mock_rtc_event_log.h +++ b/logging/rtc_event_log/mock/mock_rtc_event_log.h @@ -14,6 +14,7 @@ #include #include "logging/rtc_event_log/rtc_event_log.h" +#include "logging/rtc_event_log/rtc_stream_config.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" #include "test/gmock.h" diff --git a/logging/rtc_event_log/rtc_event_log.cc b/logging/rtc_event_log/rtc_event_log.cc index da4b41e340..c6d67f21e1 100644 --- a/logging/rtc_event_log/rtc_event_log.cc +++ b/logging/rtc_event_log/rtc_event_log.cc @@ -18,6 +18,7 @@ #include #include +#include "logging/rtc_event_log/rtc_stream_config.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" diff --git a/logging/rtc_event_log/rtc_event_log.h b/logging/rtc_event_log/rtc_event_log.h index 34b6c7ab13..b5336007d2 100644 --- a/logging/rtc_event_log/rtc_event_log.h +++ b/logging/rtc_event_log/rtc_event_log.h @@ -18,14 +18,14 @@ // TODO(eladalon): Get rid of this later in the CL-stack. #include "api/rtpparameters.h" #include "common_types.h" // NOLINT(build/include) -// TODO(eladalon): Get rid of this later in the CL-stack. -#include "logging/rtc_event_log/rtc_stream_config.h" #include "rtc_base/platform_file.h" namespace webrtc { namespace rtclog { class EventStream; // Storage class automatically generated from protobuf. +// TODO(eladalon): Get rid of this when deprecated methods are removed. +struct StreamConfig; } // namespace rtclog class Clock; diff --git a/logging/rtc_event_log/rtc_event_log_parser.h b/logging/rtc_event_log/rtc_event_log_parser.h index 85d2e3af1c..9f87c99a26 100644 --- a/logging/rtc_event_log/rtc_event_log_parser.h +++ b/logging/rtc_event_log/rtc_event_log_parser.h @@ -18,6 +18,7 @@ #include "call/video_receive_stream.h" #include "call/video_send_stream.h" #include "logging/rtc_event_log/rtc_event_log.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/byte_io.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 3878b582ae..7624420ede 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 "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_log_unittest_helper.h" +#include "logging/rtc_event_log/rtc_stream_config.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" diff --git a/rtc_tools/event_log_visualizer/analyzer.cc b/rtc_tools/event_log_visualizer/analyzer.cc index 236e05d83c..bd8cb99c1b 100644 --- a/rtc_tools/event_log_visualizer/analyzer.cc +++ b/rtc_tools/event_log_visualizer/analyzer.cc @@ -23,6 +23,7 @@ #include "call/video_receive_stream.h" #include "call/video_send_stream.h" #include "common_types.h" // NOLINT(build/include) +#include "logging/rtc_event_log/rtc_stream_config.h" #include "modules/audio_coding/neteq/tools/audio_sink.h" #include "modules/audio_coding/neteq/tools/fake_decode_from_file.h" #include "modules/audio_coding/neteq/tools/neteq_delay_analyzer.h"