From 7c06777ab088a2c5bcdddd1c80aff515fd894e17 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Mon, 7 Oct 2019 12:56:24 +0200 Subject: [PATCH] Cleanup includes in modules/include/module_common_types.h Add missing includes to files that were transactivly depending on removed includes. Bug: None Change-Id: Id5923bb8dc3e1d8fbb664e460278ad3e5993be7e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/155963 Reviewed-by: Karl Wiberg Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/master@{#29396} --- logging/BUILD.gn | 1 + logging/rtc_event_log/rtc_event_log_parser.cc | 1 + modules/BUILD.gn | 6 ------ modules/include/DEPS | 3 --- modules/include/module_common_types.h | 5 ----- modules/rtp_rtcp/source/rtp_sender_video.h | 2 ++ modules/video_coding/BUILD.gn | 2 ++ modules/video_coding/decoding_state.cc | 1 + modules/video_coding/encoded_frame.h | 1 + modules/video_coding/include/video_codec_interface.h | 2 ++ modules/video_coding/jitter_buffer.h | 1 + video/BUILD.gn | 1 + video/end_to_end_tests/fec_tests.cc | 1 + video/end_to_end_tests/multi_codec_receive_tests.cc | 1 + video/end_to_end_tests/rtp_rtcp_tests.cc | 1 + video/end_to_end_tests/transport_feedback_tests.cc | 1 + video/send_statistics_proxy.h | 1 + 17 files changed, 17 insertions(+), 14 deletions(-) delete mode 100644 modules/include/DEPS diff --git a/logging/BUILD.gn b/logging/BUILD.gn index 2876899e23..079cd3ac5a 100644 --- a/logging/BUILD.gn +++ b/logging/BUILD.gn @@ -319,6 +319,7 @@ if (rtc_enable_protobuf) { "../api/units:timestamp", "../call:video_stream_api", "../modules:module_api", + "../modules:module_api_public", "../modules/audio_coding:audio_network_adaptor", "../modules/remote_bitrate_estimator", "../modules/rtp_rtcp", diff --git a/logging/rtc_event_log/rtc_event_log_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc index 6b9f9d85c2..565922b84e 100644 --- a/logging/rtc_event_log/rtc_event_log_parser.cc +++ b/logging/rtc_event_log/rtc_event_log_parser.cc @@ -31,6 +31,7 @@ #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" +#include "modules/include/module_common_types_public.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/rtp_rtcp/include/rtp_cvo.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" diff --git a/modules/BUILD.gn b/modules/BUILD.gn index b4794e3b10..621e64d0f2 100644 --- a/modules/BUILD.gn +++ b/modules/BUILD.gn @@ -47,12 +47,6 @@ rtc_source_set("module_api") { "include/module_common_types.h", ] deps = [ - ":module_api_public", - ":module_fec_api", - "..:webrtc_common", - "../api:rtp_headers", - "../api/video:video_frame_type", - "../modules/rtp_rtcp:rtp_video_header", "../rtc_base:safe_conversions", "../rtc_base/system:rtc_export", ] diff --git a/modules/include/DEPS b/modules/include/DEPS deleted file mode 100644 index 1b4439dfc7..0000000000 --- a/modules/include/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - "+common_video", -] diff --git a/modules/include/module_common_types.h b/modules/include/module_common_types.h index 052b2d6b8f..3afd7b7d7a 100644 --- a/modules/include/module_common_types.h +++ b/modules/include/module_common_types.h @@ -16,11 +16,6 @@ #include -#include "api/rtp_headers.h" -#include "api/video/video_frame_type.h" -#include "modules/include/module_common_types_public.h" -#include "modules/include/module_fec_types.h" -#include "modules/rtp_rtcp/source/rtp_video_header.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_sender_video.h b/modules/rtp_rtcp/source/rtp_sender_video.h index 1b956fd9f0..d3323334b8 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video.h +++ b/modules/rtp_rtcp/source/rtp_sender_video.h @@ -18,6 +18,7 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "api/array_view.h" +#include "api/video/video_codec_type.h" #include "api/video/video_frame_type.h" #include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/include/flexfec_sender.h" @@ -26,6 +27,7 @@ #include "modules/rtp_rtcp/source/rtp_rtcp_config.h" #include "modules/rtp_rtcp/source/rtp_sender.h" #include "modules/rtp_rtcp/source/rtp_sequence_number_map.h" +#include "modules/rtp_rtcp/source/rtp_video_header.h" #include "modules/rtp_rtcp/source/ulpfec_generator.h" #include "rtc_base/critical_section.h" #include "rtc_base/one_time_event.h" diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index eaedf5786c..fbd66ddf7b 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -23,6 +23,7 @@ rtc_static_library("encoded_frame") { "../../api/video:video_rtp_headers", "../../modules:module_api", "../../modules:module_api_public", + "../../modules/rtp_rtcp:rtp_video_header", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../rtc_base/experiments:alr_experiment", @@ -182,6 +183,7 @@ rtc_source_set("video_codec_interface") { "video_coding_defines.cc", ] deps = [ + ":codec_globals_headers", "..:module_api", "../../api/video:video_frame", "../../api/video:video_rtp_headers", diff --git a/modules/video_coding/decoding_state.cc b/modules/video_coding/decoding_state.cc index 0aab07b901..f769ed0cee 100644 --- a/modules/video_coding/decoding_state.cc +++ b/modules/video_coding/decoding_state.cc @@ -11,6 +11,7 @@ #include "modules/video_coding/decoding_state.h" #include "common_video/h264/h264_common.h" +#include "modules/include/module_common_types_public.h" #include "modules/video_coding/frame_buffer.h" #include "modules/video_coding/jitter_buffer_common.h" #include "modules/video_coding/packet.h" diff --git a/modules/video_coding/encoded_frame.h b/modules/video_coding/encoded_frame.h index b29ff632e5..028c19ba1e 100644 --- a/modules/video_coding/encoded_frame.h +++ b/modules/video_coding/encoded_frame.h @@ -14,6 +14,7 @@ #include #include "api/video/encoded_image.h" +#include "modules/rtp_rtcp/source/rtp_video_header.h" #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_coding_defines.h" diff --git a/modules/video_coding/include/video_codec_interface.h b/modules/video_coding/include/video_codec_interface.h index e66dea7a95..54839e1e1d 100644 --- a/modules/video_coding/include/video_codec_interface.h +++ b/modules/video_coding/include/video_codec_interface.h @@ -19,6 +19,8 @@ #include "api/video_codecs/video_encoder.h" #include "common_video/generic_frame_descriptor/generic_frame_info.h" #include "modules/include/module_common_types.h" +#include "modules/video_coding/codecs/h264/include/h264_globals.h" +#include "modules/video_coding/codecs/vp9/include/vp9_globals.h" #include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/system/rtc_export.h" diff --git a/modules/video_coding/jitter_buffer.h b/modules/video_coding/jitter_buffer.h index dc169c627e..1070c379bb 100644 --- a/modules/video_coding/jitter_buffer.h +++ b/modules/video_coding/jitter_buffer.h @@ -18,6 +18,7 @@ #include #include "modules/include/module_common_types.h" +#include "modules/include/module_common_types_public.h" #include "modules/utility/include/process_thread.h" #include "modules/video_coding/decoding_state.h" #include "modules/video_coding/include/video_coding.h" diff --git a/video/BUILD.gn b/video/BUILD.gn index 4cb3d6dda6..06c0c49107 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -603,6 +603,7 @@ if (rtc_include_tests) { "../media:rtc_media_tests_utils", "../media:rtc_simulcast_encoder_adapter", "../modules:module_api", + "../modules:module_api_public", "../modules/pacing", "../modules/rtp_rtcp", "../modules/rtp_rtcp:mock_rtp_rtcp", diff --git a/video/end_to_end_tests/fec_tests.cc b/video/end_to_end_tests/fec_tests.cc index 801f91cba5..b20ec29b73 100644 --- a/video/end_to_end_tests/fec_tests.cc +++ b/video/end_to_end_tests/fec_tests.cc @@ -16,6 +16,7 @@ #include "call/fake_network_pipe.h" #include "call/simulated_network.h" #include "media/engine/internal_decoder_factory.h" +#include "modules/include/module_common_types_public.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/video_coding/codecs/vp8/include/vp8.h" #include "test/call_test.h" diff --git a/video/end_to_end_tests/multi_codec_receive_tests.cc b/video/end_to_end_tests/multi_codec_receive_tests.cc index c12b3933ea..b80975115a 100644 --- a/video/end_to_end_tests/multi_codec_receive_tests.cc +++ b/video/end_to_end_tests/multi_codec_receive_tests.cc @@ -14,6 +14,7 @@ #include "api/test/video/function_video_encoder_factory.h" #include "call/fake_network_pipe.h" #include "call/simulated_network.h" +#include "modules/include/module_common_types_public.h" #include "modules/video_coding/codecs/h264/include/h264.h" #include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp9/include/vp9.h" diff --git a/video/end_to_end_tests/rtp_rtcp_tests.cc b/video/end_to_end_tests/rtp_rtcp_tests.cc index a22badae93..bc92b25c62 100644 --- a/video/end_to_end_tests/rtp_rtcp_tests.cc +++ b/video/end_to_end_tests/rtp_rtcp_tests.cc @@ -13,6 +13,7 @@ #include "api/test/simulated_network.h" #include "call/fake_network_pipe.h" #include "call/simulated_network.h" +#include "modules/include/module_common_types_public.h" #include "modules/video_coding/codecs/vp8/include/vp8.h" #include "test/call_test.h" #include "test/gtest.h" diff --git a/video/end_to_end_tests/transport_feedback_tests.cc b/video/end_to_end_tests/transport_feedback_tests.cc index 2ea092b296..0d55fbfbe1 100644 --- a/video/end_to_end_tests/transport_feedback_tests.cc +++ b/video/end_to_end_tests/transport_feedback_tests.cc @@ -14,6 +14,7 @@ #include "call/call.h" #include "call/fake_network_pipe.h" #include "call/simulated_network.h" +#include "modules/include/module_common_types_public.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "test/call_test.h" #include "test/field_trial.h" diff --git a/video/send_statistics_proxy.h b/video/send_statistics_proxy.h index bc7655679e..6955ef6de9 100644 --- a/video/send_statistics_proxy.h +++ b/video/send_statistics_proxy.h @@ -21,6 +21,7 @@ #include "api/video/video_stream_encoder_observer.h" #include "api/video_codecs/video_encoder_config.h" #include "call/video_send_stream.h" +#include "modules/include/module_common_types_public.h" #include "modules/rtp_rtcp/include/report_block_data.h" #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_coding_defines.h"