Include module_common_types.h only where needed

Bug: None
Change-Id: I73d493f8f186b429c7be808f4dfac0398f150931
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153891
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29277}

modules/audio_coding/BUILD.gn

@@ -1125,7 +1125,7 @@ rtc_source_set("neteq_tools") {
   ]
 
   deps = [
-    "..:module_api",
+    "..:module_api_public",
     "../../api:array_view",
     "../../api/audio_codecs:audio_codecs_api",
     "../../rtc_base:checks",
@@ -1293,6 +1293,7 @@ if (rtc_include_tests) {
       ":red",
       ":webrtc_opus_c",
       "..:module_api",
+      "../../api:rtp_headers",
       "../../api/audio:audio_frame_api",
       "../../api/audio_codecs:audio_codecs_api",
       "../../api/audio_codecs:builtin_audio_decoder_factory",

modules/audio_coding/acm2/acm_receive_test.cc

@@ -19,7 +19,6 @@
 #include "modules/audio_coding/neteq/tools/audio_sink.h"
 #include "modules/audio_coding/neteq/tools/packet.h"
 #include "modules/audio_coding/neteq/tools/packet_source.h"
-#include "modules/include/module_common_types.h"
 #include "test/gtest.h"
 
 namespace webrtc {

modules/audio_coding/acm2/acm_receiver.cc

@@ -22,7 +22,6 @@
 #include "modules/audio_coding/acm2/acm_resampler.h"
 #include "modules/audio_coding/acm2/call_statistics.h"
 #include "modules/audio_coding/neteq/include/neteq.h"
-#include "modules/include/module_common_types.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"

modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc

@@ -18,7 +18,7 @@
 #include <utility>
 
 #include "absl/strings/string_view.h"
-#include "modules/include/module_common_types.h"
+#include "modules/include/module_common_types_public.h"
 #include "rtc_base/checks.h"
 
 namespace webrtc {

modules/audio_coding/test/RTPFile.cc

@@ -20,7 +20,6 @@
 #include <arpa/inet.h>
 #endif
 
-#include "modules/include/module_common_types.h"
 // TODO(tlegrand): Consider removing usage of gtest.
 #include "test/gtest.h"
 

modules/audio_coding/test/RTPFile.h

@@ -15,8 +15,7 @@
 
 #include <queue>
 
-#include "modules/audio_coding/include/audio_coding_module.h"
+#include "api/rtp_headers.h"
-#include "modules/include/module_common_types.h"
 #include "rtc_base/synchronization/rw_lock_wrapper.h"
 
 namespace webrtc {

modules/audio_coding/test/target_delay_unittest.cc

@@ -12,10 +12,10 @@
 
 #include "api/audio/audio_frame.h"
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "api/rtp_headers.h"
 #include "modules/audio_coding/acm2/acm_receiver.h"
 #include "modules/audio_coding/codecs/pcm16b/pcm16b.h"
 #include "modules/audio_coding/include/audio_coding_module.h"
-#include "modules/include/module_common_types.h"
 #include "test/gtest.h"
 #include "test/testsupport/file_utils.h"
 

modules/congestion_controller/rtp/BUILD.gn

@@ -50,7 +50,7 @@ rtc_static_library("transport_feedback") {
   ]
 
   deps = [
-    "../..:module_api",
+    "../..:module_api_public",
     "../../../api/transport:network_control",
     "../../../api/units:data_size",
     "../../../api/units:timestamp",
@@ -60,6 +60,7 @@ rtc_static_library("transport_feedback") {
     "../../../system_wrappers",
     "../../../system_wrappers:field_trial",
     "../../rtp_rtcp:rtp_rtcp_format",
+    "//third_party/abseil-cpp/absl/types:optional",
   ]
 }
 

modules/congestion_controller/rtp/send_time_history.h

@@ -14,8 +14,9 @@
 #include <map>
 #include <utility>
 
+#include "absl/types/optional.h"
 #include "api/units/data_size.h"
-#include "modules/include/module_common_types.h"
+#include "modules/include/module_common_types_public.h"
 #include "rtc_base/constructor_magic.h"
 
 namespace webrtc {

modules/rtp_rtcp/BUILD.gn

@@ -237,6 +237,7 @@ rtc_static_library("rtp_rtcp") {
     "../../api/video:video_bitrate_allocation",
     "../../api/video:video_bitrate_allocator",
     "../../api/video:video_frame",
+    "../../api/video:video_frame_type",
     "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../call:rtp_interfaces",

modules/rtp_rtcp/include/flexfec_sender.h

@@ -16,7 +16,7 @@
 #include <vector>
 
 #include "api/array_view.h"
-#include "modules/include/module_common_types.h"
+#include "api/rtp_parameters.h"
 #include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/rtp_header_extension_size.h"

modules/rtp_rtcp/include/receive_statistics.h

@@ -18,7 +18,6 @@
 #include "absl/types/optional.h"
 #include "call/rtp_packet_sink_interface.h"
 #include "modules/include/module.h"
-#include "modules/include/module_common_types.h"
 #include "modules/rtp_rtcp/include/rtcp_statistics.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/report_block.h"

modules/rtp_rtcp/include/rtp_rtcp_defines.h

@@ -23,7 +23,6 @@
 #include "api/audio_codecs/audio_format.h"
 #include "api/rtp_headers.h"
 #include "api/transport/network_types.h"
-#include "modules/include/module_common_types.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/remote_estimate.h"
 #include "system_wrappers/include/clock.h"
 

modules/rtp_rtcp/source/rtp_header_extensions.cc

@@ -19,6 +19,7 @@
 #include "modules/rtp_rtcp/source/byte_io.h"
 // TODO(bug:9855) Move kNoSpatialIdx from vp9_globals.h to common_constants
 #include "modules/video_coding/codecs/interface/common_constants.h"
+#include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
 #include "rtc_base/checks.h"
 
 namespace webrtc {

modules/rtp_rtcp/source/rtp_packet_history.cc

@@ -15,6 +15,7 @@
 #include <memory>
 #include <utility>
 
+#include "modules/include/module_common_types_public.h"
 #include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"

modules/rtp_rtcp/source/rtp_rtcp_impl.h

@@ -22,7 +22,6 @@
 #include "absl/types/optional.h"
 #include "api/rtp_headers.h"
 #include "api/video/video_bitrate_allocation.h"
-#include "modules/include/module_common_types.h"
 #include "modules/include/module_fec_types.h"
 #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp.h"

modules/rtp_rtcp/source/rtp_sender_video.h

@@ -18,6 +18,8 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "api/array_view.h"
+#include "api/video/video_frame_type.h"
+#include "modules/include/module_common_types.h"
 #include "modules/rtp_rtcp/include/flexfec_sender.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/playout_delay_oracle.h"

modules/video_capture/video_capture_defines.h

@@ -13,7 +13,6 @@
 
 #include "api/video/video_frame.h"
 #include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "modules/include/module_common_types.h"
 
 namespace webrtc {
 

modules/video_coding/BUILD.gn

@@ -226,6 +226,7 @@ rtc_source_set("video_coding_legacy") {
     "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
+    "../../modules/rtp_rtcp:rtp_video_header",
     "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",

modules/video_coding/codec_timer.h

@@ -13,7 +13,6 @@
 
 #include <queue>
 
-#include "modules/include/module_common_types.h"
 #include "rtc_base/numerics/percentile_filter.h"
 
 namespace webrtc {

modules/video_coding/codecs/vp8/default_temporal_layers.cc

@@ -18,7 +18,6 @@
 #include <utility>
 #include <vector>
 
-#include "modules/include/module_common_types.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"

modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h

@@ -16,7 +16,6 @@
 #include "api/video/encoded_image.h"
 #include "api/video_codecs/video_decoder.h"
 #include "common_video/include/i420_buffer_pool.h"
-#include "modules/include/module_common_types.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "vpx/vp8dx.h"

modules/video_coding/decoding_state.cc

@@ -11,7 +11,6 @@
 #include "modules/video_coding/decoding_state.h"
 
 #include "common_video/h264/h264_common.h"
-#include "modules/include/module_common_types.h"
 #include "modules/video_coding/frame_buffer.h"
 #include "modules/video_coding/jitter_buffer_common.h"
 #include "modules/video_coding/packet.h"

modules/video_coding/encoded_frame.h

@@ -14,7 +14,6 @@
 #include <vector>
 
 #include "api/video/encoded_image.h"
-#include "modules/include/module_common_types.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_coding_defines.h"
 

modules/video_coding/frame_object.h

@@ -13,7 +13,6 @@
 
 #include "absl/types/optional.h"
 #include "api/video/encoded_frame.h"
-#include "modules/include/module_common_types.h"
 #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h"
 
 namespace webrtc {

modules/video_coding/generic_decoder.h

@@ -14,7 +14,6 @@
 #include <memory>
 
 #include "api/units/time_delta.h"
-#include "modules/include/module_common_types.h"
 #include "modules/video_coding/encoded_frame.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/timestamp_map.h"

modules/video_coding/h264_sps_pps_tracker.h

@@ -16,8 +16,6 @@
 #include <memory>
 #include <vector>
 
-#include "modules/include/module_common_types.h"
-
 namespace webrtc {
 
 class VCMPacket;

modules/video_coding/include/video_coding.h

@@ -14,7 +14,7 @@
 #include "api/video/video_frame.h"
 #include "api/video_codecs/video_codec.h"
 #include "modules/include/module.h"
-#include "modules/include/module_common_types.h"
+#include "modules/rtp_rtcp/source/rtp_video_header.h"
 #include "modules/video_coding/include/video_coding_defines.h"
 
 namespace webrtc {

modules/video_coding/packet_buffer.h

@@ -17,7 +17,6 @@
 #include <vector>
 
 #include "api/video/encoded_image.h"
-#include "modules/include/module_common_types.h"
 #include "modules/video_coding/packet.h"
 #include "rtc_base/critical_section.h"
 #include "rtc_base/numerics/sequence_number_util.h"

modules/video_coding/rtp_frame_reference_finder.h

@@ -18,8 +18,9 @@
 #include <set>
 #include <utility>
 
-#include "modules/include/module_common_types.h"
+#include "modules/include/module_common_types_public.h"
 #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h"
+#include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
 #include "rtc_base/critical_section.h"
 #include "rtc_base/numerics/sequence_number_util.h"
 #include "rtc_base/thread_annotations.h"

modules/video_coding/session_info_unittest.cc

@@ -12,7 +12,6 @@
 
 #include <string.h>
 
-#include "modules/include/module_common_types.h"
 #include "modules/video_coding/packet.h"
 #include "test/gtest.h"
 

modules/video_coding/test/stream_generator.cc

@@ -14,7 +14,6 @@
 
 #include <list>
 
-#include "modules/include/module_common_types.h"
 #include "modules/video_coding/packet.h"
 #include "test/gtest.h"
 

modules/video_coding/timing.h

@@ -13,6 +13,8 @@
 
 #include <memory>
 
+#include "absl/types/optional.h"
+#include "api/video/video_timing.h"
 #include "modules/video_coding/codec_timer.h"
 #include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"

sdk/objc/native/src/objc_video_decoder_factory.mm

@@ -22,7 +22,6 @@
 
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_decoder.h"
-#include "modules/include/module_common_types.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_error_codes.h"
 #include "rtc_base/logging.h"

sdk/objc/unittests/objc_video_decoder_factory_tests.mm

@@ -16,7 +16,6 @@
 #import "base/RTCVideoDecoder.h"
 #import "base/RTCVideoDecoderFactory.h"
 #include "media/base/codec.h"
-#include "modules/include/module_common_types.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_error_codes.h"
 #include "rtc_base/gunit.h"

video/buffered_frame_decryptor.h

@@ -16,7 +16,6 @@
 
 #include "api/crypto/crypto_options.h"
 #include "api/crypto/frame_decryptor_interface.h"
-#include "modules/include/module_common_types.h"
 #include "modules/video_coding/frame_object.h"
 
 namespace webrtc {

video/call_stats.h

@@ -15,6 +15,7 @@
 #include <memory>
 
 #include "modules/include/module.h"
+#include "modules/include/module_common_types.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/critical_section.h"
@@ -23,8 +24,6 @@
 
 namespace webrtc {
 
-class CallStatsObserver;
-
 // CallStats keeps track of statistics for a call.
 class CallStats : public Module, public RtcpRttStats {
  public:

video/receive_statistics_proxy.h

@@ -18,6 +18,7 @@
 
 #include "absl/types/optional.h"
 #include "call/video_receive_stream.h"
+#include "modules/include/module_common_types.h"
 #include "modules/video_coding/include/video_coding_defines.h"
 #include "rtc_base/critical_section.h"
 #include "rtc_base/numerics/histogram_percentile_counter.h"