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}
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index ae7e32a..eaedf57 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -226,6 +226,7 @@
"../../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",
diff --git a/modules/video_coding/codec_timer.h b/modules/video_coding/codec_timer.h
index e5d6839..412e4cc 100644
--- a/modules/video_coding/codec_timer.h
+++ b/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 {
diff --git a/modules/video_coding/codecs/vp8/default_temporal_layers.cc b/modules/video_coding/codecs/vp8/default_temporal_layers.cc
index 84e948e..426ee76 100644
--- a/modules/video_coding/codecs/vp8/default_temporal_layers.cc
+++ b/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"
diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h
index abe87c3..d9bfee8 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h
+++ b/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"
diff --git a/modules/video_coding/decoding_state.cc b/modules/video_coding/decoding_state.cc
index 16266cb..0aab07b 100644
--- a/modules/video_coding/decoding_state.cc
+++ b/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"
diff --git a/modules/video_coding/encoded_frame.h b/modules/video_coding/encoded_frame.h
index 75b4b5b..ac9cf50 100644
--- a/modules/video_coding/encoded_frame.h
+++ b/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"
diff --git a/modules/video_coding/frame_object.h b/modules/video_coding/frame_object.h
index 614128f..17d0994 100644
--- a/modules/video_coding/frame_object.h
+++ b/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 {
diff --git a/modules/video_coding/generic_decoder.h b/modules/video_coding/generic_decoder.h
index d51ff48..a9d9698 100644
--- a/modules/video_coding/generic_decoder.h
+++ b/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"
diff --git a/modules/video_coding/h264_sps_pps_tracker.h b/modules/video_coding/h264_sps_pps_tracker.h
index 45720e6..88fc8ca 100644
--- a/modules/video_coding/h264_sps_pps_tracker.h
+++ b/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;
diff --git a/modules/video_coding/include/video_coding.h b/modules/video_coding/include/video_coding.h
index 549f303..acaa73b 100644
--- a/modules/video_coding/include/video_coding.h
+++ b/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 {
diff --git a/modules/video_coding/packet_buffer.h b/modules/video_coding/packet_buffer.h
index ebbd974..7ef23d1 100644
--- a/modules/video_coding/packet_buffer.h
+++ b/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"
diff --git a/modules/video_coding/rtp_frame_reference_finder.h b/modules/video_coding/rtp_frame_reference_finder.h
index e6f7aa8..176bb66 100644
--- a/modules/video_coding/rtp_frame_reference_finder.h
+++ b/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"
diff --git a/modules/video_coding/session_info_unittest.cc b/modules/video_coding/session_info_unittest.cc
index 07b43df..8679977 100644
--- a/modules/video_coding/session_info_unittest.cc
+++ b/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"
diff --git a/modules/video_coding/test/stream_generator.cc b/modules/video_coding/test/stream_generator.cc
index 7b3a4b9..98a0cf1 100644
--- a/modules/video_coding/test/stream_generator.cc
+++ b/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"
diff --git a/modules/video_coding/timing.h b/modules/video_coding/timing.h
index 764f0be..c9efcb1 100644
--- a/modules/video_coding/timing.h
+++ b/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"