diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn index 1fb8d6b95d..9351dea4f7 100644 --- a/api/video/BUILD.gn +++ b/api/video/BUILD.gn @@ -73,6 +73,8 @@ rtc_library("video_frame") { "../../rtc_base:timeutils", "../../rtc_base/memory:aligned_malloc", "../../rtc_base/system:rtc_export", + "../units:time_delta", + "../units:timestamp", "//third_party/abseil-cpp/absl/types:optional", "//third_party/libyuv", ] @@ -102,6 +104,7 @@ rtc_library("video_frame_i010") { "../../rtc_base:checks", "../../rtc_base:refcount", "../../rtc_base/memory:aligned_malloc", + "../../rtc_base/system:rtc_export", "//third_party/libyuv", ] } @@ -118,6 +121,7 @@ rtc_source_set("recordable_encoded_frame") { "..:make_ref_counted", "..:scoped_refptr", "../units:timestamp", + "//third_party/abseil-cpp/absl/types:optional", ] } @@ -152,6 +156,8 @@ rtc_library("encoded_image") { ":video_frame", ":video_frame_type", ":video_rtp_headers", + "..:make_ref_counted", + "..:ref_count", "..:refcountedbase", "..:rtp_packet_info", "..:scoped_refptr", @@ -174,9 +180,11 @@ rtc_library("encoded_frame") { ":encoded_image", ":video_frame", "../../modules/rtp_rtcp:rtp_video_header", + "../../modules/video_coding:codec_globals_headers", "../../modules/video_coding:video_codec_interface", "../units:timestamp", "//third_party/abseil-cpp/absl/types:optional", + "//third_party/abseil-cpp/absl/types:variant", ] } @@ -189,12 +197,21 @@ rtc_library("rtp_video_frame_assembler") { deps = [ ":encoded_frame", + ":encoded_image", + ":video_frame_type", + ":video_rtp_headers", + "..:array_view", + "..:rtp_packet_info", + "..:scoped_refptr", "../../modules/rtp_rtcp:rtp_rtcp", "../../modules/rtp_rtcp:rtp_rtcp_format", + "../../modules/rtp_rtcp:rtp_video_header", "../../modules/video_coding:packet_buffer", "../../modules/video_coding:video_coding", + "../../rtc_base:checks", "../../rtc_base:logging", "../../rtc_base:rtc_numerics", + "../transport/rtp:dependency_descriptor", "//third_party/abseil-cpp/absl/container:inlined_vector", "//third_party/abseil-cpp/absl/types:optional", ] @@ -205,12 +222,20 @@ rtc_library("rtp_video_frame_assembler_unittests") { sources = [ "rtp_video_frame_assembler_unittests.cc" ] deps = [ + ":encoded_frame", ":rtp_video_frame_assembler", + ":video_frame", + ":video_frame_type", "..:array_view", "../../modules/rtp_rtcp:rtp_packetizer_av1_test_helper", "../../modules/rtp_rtcp:rtp_rtcp", "../../modules/rtp_rtcp:rtp_rtcp_format", + "../../modules/rtp_rtcp:rtp_video_header", + "../../modules/video_coding:codec_globals_headers", + "../../rtc_base:checks", "../../test:test_support", + "../transport/rtp:dependency_descriptor", + "//third_party/abseil-cpp/absl/types:optional", ] } @@ -334,10 +359,12 @@ rtc_library("builtin_video_bitrate_allocator_factory") { ":video_bitrate_allocation", ":video_bitrate_allocator", ":video_bitrate_allocator_factory", + ":video_frame", "../../api:scoped_refptr", "../../media:rtc_media_base", "../../modules/video_coding:video_coding_utility", "../../modules/video_coding/svc:svc_rate_allocator", + "../environment", "../video_codecs:video_codecs_api", "//third_party/abseil-cpp/absl/base:core_headers", ] @@ -350,6 +377,7 @@ rtc_library("frame_buffer") { "frame_buffer.h", ] deps = [ + "..:array_view", "../../api:field_trials_view", "../../api/units:timestamp", "../../api/video:encoded_frame", @@ -373,6 +401,7 @@ rtc_library("frame_buffer_unittest") { "../../test:field_trial", "../../test:scoped_key_value_config", "../../test:test_support", + "//third_party/abseil-cpp/absl/types:optional", ] } diff --git a/api/video/builtin_video_bitrate_allocator_factory.cc b/api/video/builtin_video_bitrate_allocator_factory.cc index bfc41efe1b..e7ccada9d3 100644 --- a/api/video/builtin_video_bitrate_allocator_factory.cc +++ b/api/video/builtin_video_bitrate_allocator_factory.cc @@ -12,9 +12,10 @@ #include -#include "absl/base/attributes.h" -#include "absl/base/macros.h" +#include "api/environment/environment.h" #include "api/video/video_bitrate_allocator.h" +#include "api/video/video_bitrate_allocator_factory.h" +#include "api/video/video_codec_type.h" #include "api/video_codecs/video_codec.h" #include "modules/video_coding/svc/svc_rate_allocator.h" #include "modules/video_coding/utility/simulcast_rate_allocator.h" diff --git a/api/video/color_space.cc b/api/video/color_space.cc index dcb9c67da5..05c0135dc5 100644 --- a/api/video/color_space.cc +++ b/api/video/color_space.cc @@ -10,6 +10,12 @@ #include "api/video/color_space.h" +#include +#include +#include + +#include "absl/types/optional.h" +#include "api/video/hdr_metadata.h" #include "rtc_base/strings/string_builder.h" namespace webrtc { diff --git a/api/video/encoded_frame.cc b/api/video/encoded_frame.cc index cf3d4a20e5..023e233135 100644 --- a/api/video/encoded_frame.cc +++ b/api/video/encoded_frame.cc @@ -10,8 +10,17 @@ #include "api/video/encoded_frame.h" +#include +#include + #include "absl/types/optional.h" +#include "absl/types/variant.h" +#include "api/units/timestamp.h" +#include "api/video/video_codec_type.h" #include "modules/rtp_rtcp/source/rtp_video_header.h" +#include "modules/video_coding/codecs/interface/common_constants.h" +#include "modules/video_coding/codecs/vp8/include/vp8_globals.h" +#include "modules/video_coding/codecs/vp9/include/vp9_globals.h" namespace webrtc { diff --git a/api/video/encoded_frame.h b/api/video/encoded_frame.h index 1e626f0800..8905c365c3 100644 --- a/api/video/encoded_frame.h +++ b/api/video/encoded_frame.h @@ -20,7 +20,6 @@ #include "api/video/video_codec_type.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" namespace webrtc { diff --git a/api/video/encoded_image.cc b/api/video/encoded_image.cc index aad94b12a6..a85925095d 100644 --- a/api/video/encoded_image.cc +++ b/api/video/encoded_image.cc @@ -13,6 +13,13 @@ #include #include +#include + +#include "absl/types/optional.h" +#include "api/make_ref_counted.h" +#include "api/scoped_refptr.h" +#include "api/units/timestamp.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/api/video/encoded_image.h b/api/video/encoded_image.h index 3d0dd90f28..f3a0ecac88 100644 --- a/api/video/encoded_image.h +++ b/api/video/encoded_image.h @@ -13,10 +13,12 @@ #include +#include #include #include #include "absl/types/optional.h" +#include "api/ref_count.h" #include "api/rtp_packet_infos.h" #include "api/scoped_refptr.h" #include "api/units/timestamp.h" @@ -27,7 +29,6 @@ #include "api/video/video_rotation.h" #include "api/video/video_timing.h" #include "rtc_base/checks.h" -#include "rtc_base/ref_count.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { diff --git a/api/video/frame_buffer.cc b/api/video/frame_buffer.cc index 5e8fc0ff44..b99ab0cd52 100644 --- a/api/video/frame_buffer.cc +++ b/api/video/frame_buffer.cc @@ -11,9 +11,18 @@ #include "api/video/frame_buffer.h" #include +#include +#include +#include +#include +#include #include "absl/algorithm/container.h" #include "absl/container/inlined_vector.h" +#include "absl/types/optional.h" +#include "api/array_view.h" +#include "api/field_trials_view.h" +#include "api/video/encoded_frame.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/sequence_number_util.h" diff --git a/api/video/frame_buffer.h b/api/video/frame_buffer.h index 94edf64d5a..7791770f52 100644 --- a/api/video/frame_buffer.h +++ b/api/video/frame_buffer.h @@ -11,9 +11,10 @@ #ifndef API_VIDEO_FRAME_BUFFER_H_ #define API_VIDEO_FRAME_BUFFER_H_ +#include +#include #include #include -#include #include "absl/container/inlined_vector.h" #include "absl/types/optional.h" diff --git a/api/video/frame_buffer_unittest.cc b/api/video/frame_buffer_unittest.cc index 92e2f67540..5d3341ccc2 100644 --- a/api/video/frame_buffer_unittest.cc +++ b/api/video/frame_buffer_unittest.cc @@ -11,7 +11,7 @@ #include -#include "api/video/encoded_frame.h" +#include "absl/types/optional.h" #include "test/fake_encoded_frame.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/api/video/i010_buffer.cc b/api/video/i010_buffer.cc index d78e854eb9..b38b511c75 100644 --- a/api/video/i010_buffer.cc +++ b/api/video/i010_buffer.cc @@ -9,12 +9,19 @@ */ #include "api/video/i010_buffer.h" +#include #include #include "api/make_ref_counted.h" +#include "api/scoped_refptr.h" #include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" #include "rtc_base/checks.h" +#include "rtc_base/memory/aligned_malloc.h" #include "third_party/libyuv/include/libyuv/convert.h" +#include "third_party/libyuv/include/libyuv/convert_from.h" +#include "third_party/libyuv/include/libyuv/rotate.h" #include "third_party/libyuv/include/libyuv/scale.h" // Aligning pointer to 64 bytes for improved performance, e.g. use SIMD. diff --git a/api/video/i210_buffer.cc b/api/video/i210_buffer.cc index c83c8a0c0b..bb9095fbb8 100644 --- a/api/video/i210_buffer.cc +++ b/api/video/i210_buffer.cc @@ -9,13 +9,20 @@ */ #include "api/video/i210_buffer.h" +#include #include #include "api/make_ref_counted.h" +#include "api/scoped_refptr.h" #include "api/video/i420_buffer.h" #include "api/video/i422_buffer.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" #include "rtc_base/checks.h" +#include "rtc_base/memory/aligned_malloc.h" #include "third_party/libyuv/include/libyuv/convert.h" +#include "third_party/libyuv/include/libyuv/planar_functions.h" +#include "third_party/libyuv/include/libyuv/rotate.h" #include "third_party/libyuv/include/libyuv/scale.h" // Aligning pointer to 64 bytes for improved performance, e.g. use SIMD. diff --git a/api/video/i410_buffer.cc b/api/video/i410_buffer.cc index 1b0d4fdb5c..07f53ce0d1 100644 --- a/api/video/i410_buffer.cc +++ b/api/video/i410_buffer.cc @@ -12,13 +12,19 @@ #include #include +#include #include #include "api/make_ref_counted.h" +#include "api/scoped_refptr.h" #include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" #include "rtc_base/checks.h" +#include "rtc_base/memory/aligned_malloc.h" #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/planar_functions.h" +#include "third_party/libyuv/include/libyuv/rotate.h" #include "third_party/libyuv/include/libyuv/scale.h" // Aligning pointer to 64 bytes for improved performance, e.g. use SIMD. diff --git a/api/video/i410_buffer.h b/api/video/i410_buffer.h index 1c0cd86c12..c28f3518b3 100644 --- a/api/video/i410_buffer.h +++ b/api/video/i410_buffer.h @@ -19,6 +19,7 @@ #include "api/video/video_frame_buffer.h" #include "api/video/video_rotation.h" #include "rtc_base/memory/aligned_malloc.h" +#include "rtc_base/system/rtc_export.h" namespace webrtc { diff --git a/api/video/i420_buffer.cc b/api/video/i420_buffer.cc index bf7fc06ee9..c2ddd26a27 100644 --- a/api/video/i420_buffer.cc +++ b/api/video/i420_buffer.cc @@ -12,12 +12,18 @@ #include #include +#include #include #include "api/make_ref_counted.h" +#include "api/scoped_refptr.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" #include "rtc_base/checks.h" +#include "rtc_base/memory/aligned_malloc.h" #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/planar_functions.h" +#include "third_party/libyuv/include/libyuv/rotate.h" #include "third_party/libyuv/include/libyuv/scale.h" // Aligning pointer to 64 bytes for improved performance, e.g. use SIMD. diff --git a/api/video/i422_buffer.cc b/api/video/i422_buffer.cc index fddc1b57fd..a624c19049 100644 --- a/api/video/i422_buffer.cc +++ b/api/video/i422_buffer.cc @@ -12,13 +12,20 @@ #include #include +#include #include #include "api/make_ref_counted.h" +#include "api/scoped_refptr.h" #include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" #include "rtc_base/checks.h" +#include "rtc_base/memory/aligned_malloc.h" #include "third_party/libyuv/include/libyuv/convert.h" +#include "third_party/libyuv/include/libyuv/convert_from.h" #include "third_party/libyuv/include/libyuv/planar_functions.h" +#include "third_party/libyuv/include/libyuv/rotate.h" #include "third_party/libyuv/include/libyuv/scale.h" // Aligning pointer to 64 bytes for improved performance, e.g. use SIMD. diff --git a/api/video/i444_buffer.cc b/api/video/i444_buffer.cc index 98e892308f..9120dcc842 100644 --- a/api/video/i444_buffer.cc +++ b/api/video/i444_buffer.cc @@ -12,13 +12,19 @@ #include #include +#include #include #include "api/make_ref_counted.h" +#include "api/scoped_refptr.h" #include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" #include "rtc_base/checks.h" +#include "rtc_base/memory/aligned_malloc.h" #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/planar_functions.h" +#include "third_party/libyuv/include/libyuv/rotate.h" #include "third_party/libyuv/include/libyuv/scale.h" // Aligning pointer to 64 bytes for improved performance, e.g. use SIMD. diff --git a/api/video/nv12_buffer.cc b/api/video/nv12_buffer.cc index ca9dcd8677..93ea0e4789 100644 --- a/api/video/nv12_buffer.cc +++ b/api/video/nv12_buffer.cc @@ -10,9 +10,16 @@ #include "api/video/nv12_buffer.h" +#include +#include +#include + #include "api/make_ref_counted.h" +#include "api/scoped_refptr.h" #include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" #include "rtc_base/checks.h" +#include "rtc_base/memory/aligned_malloc.h" #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/scale.h" diff --git a/api/video/nv12_buffer.h b/api/video/nv12_buffer.h index 46a85f82e1..1fc0efec44 100644 --- a/api/video/nv12_buffer.h +++ b/api/video/nv12_buffer.h @@ -11,8 +11,9 @@ #ifndef API_VIDEO_NV12_BUFFER_H_ #define API_VIDEO_NV12_BUFFER_H_ +#include +#include #include -#include #include "api/scoped_refptr.h" #include "api/video/video_frame_buffer.h" diff --git a/api/video/recordable_encoded_frame.h b/api/video/recordable_encoded_frame.h index 47ea23f119..5b56561efb 100644 --- a/api/video/recordable_encoded_frame.h +++ b/api/video/recordable_encoded_frame.h @@ -11,7 +11,7 @@ #ifndef API_VIDEO_RECORDABLE_ENCODED_FRAME_H_ #define API_VIDEO_RECORDABLE_ENCODED_FRAME_H_ -#include "api/array_view.h" +#include "absl/types/optional.h" #include "api/scoped_refptr.h" #include "api/units/timestamp.h" #include "api/video/color_space.h" diff --git a/api/video/rtp_video_frame_assembler.cc b/api/video/rtp_video_frame_assembler.cc index c53789a959..4631824c26 100644 --- a/api/video/rtp_video_frame_assembler.cc +++ b/api/video/rtp_video_frame_assembler.cc @@ -10,19 +10,27 @@ #include "api/video/rtp_video_frame_assembler.h" -#include #include -#include #include #include #include #include "absl/container/inlined_vector.h" #include "absl/types/optional.h" +#include "api/array_view.h" +#include "api/rtp_packet_infos.h" +#include "api/scoped_refptr.h" +#include "api/transport/rtp/dependency_descriptor.h" +#include "api/video/encoded_image.h" +#include "api/video/video_frame_type.h" +#include "api/video/video_timing.h" #include "modules/rtp_rtcp/source/frame_object.h" #include "modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.h" +#include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h" #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "modules/rtp_rtcp/source/rtp_video_header.h" +#include "modules/rtp_rtcp/source/video_rtp_depacketizer.h" #include "modules/rtp_rtcp/source/video_rtp_depacketizer_av1.h" #include "modules/rtp_rtcp/source/video_rtp_depacketizer_generic.h" #include "modules/rtp_rtcp/source/video_rtp_depacketizer_h264.h" @@ -31,6 +39,7 @@ #include "modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.h" #include "modules/video_coding/packet_buffer.h" #include "modules/video_coding/rtp_frame_reference_finder.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/sequence_number_unwrapper.h" diff --git a/api/video/rtp_video_frame_assembler_unittests.cc b/api/video/rtp_video_frame_assembler_unittests.cc index 50d1aaae12..0becb9f752 100644 --- a/api/video/rtp_video_frame_assembler_unittests.cc +++ b/api/video/rtp_video_frame_assembler_unittests.cc @@ -8,15 +8,29 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include +#include +#include #include +#include "absl/types/optional.h" #include "api/array_view.h" +#include "api/transport/rtp/dependency_descriptor.h" +#include "api/video/encoded_frame.h" #include "api/video/rtp_video_frame_assembler.h" +#include "api/video/video_codec_type.h" +#include "api/video/video_frame_type.h" #include "modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.h" #include "modules/rtp_rtcp/source/rtp_format.h" +#include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h" #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "modules/rtp_rtcp/source/rtp_packetizer_av1_test_helper.h" +#include "modules/rtp_rtcp/source/rtp_video_header.h" +#include "modules/video_coding/codecs/vp8/include/vp8_globals.h" +#include "modules/video_coding/codecs/vp9/include/vp9_globals.h" +#include "rtc_base/checks.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/api/video/test/BUILD.gn b/api/video/test/BUILD.gn index deb882af16..4450a0a19c 100644 --- a/api/video/test/BUILD.gn +++ b/api/video/test/BUILD.gn @@ -26,6 +26,7 @@ rtc_library("rtc_api_video_unittests") { "..:video_frame", "..:video_frame_i010", "..:video_rtp_headers", + "../..:scoped_refptr", "../../../test:frame_utils", "../../../test:test_support", "//third_party/abseil-cpp/absl/types:optional", diff --git a/api/video/test/i210_buffer_unittest.cc b/api/video/test/i210_buffer_unittest.cc index aaa231b6d2..e344819b15 100644 --- a/api/video/test/i210_buffer_unittest.cc +++ b/api/video/test/i210_buffer_unittest.cc @@ -11,9 +11,13 @@ #include "api/video/i210_buffer.h" +#include +#include + +#include "api/scoped_refptr.h" #include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" #include "test/frame_utils.h" -#include "test/gmock.h" #include "test/gtest.h" namespace webrtc { diff --git a/api/video/test/i410_buffer_unittest.cc b/api/video/test/i410_buffer_unittest.cc index c5d2d5bf2d..daa36d41ed 100644 --- a/api/video/test/i410_buffer_unittest.cc +++ b/api/video/test/i410_buffer_unittest.cc @@ -11,9 +11,13 @@ #include "api/video/i410_buffer.h" +#include +#include + +#include "api/scoped_refptr.h" #include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" #include "test/frame_utils.h" -#include "test/gmock.h" #include "test/gtest.h" namespace webrtc { diff --git a/api/video/test/i422_buffer_unittest.cc b/api/video/test/i422_buffer_unittest.cc index 499b268546..74e2f39da6 100644 --- a/api/video/test/i422_buffer_unittest.cc +++ b/api/video/test/i422_buffer_unittest.cc @@ -11,9 +11,13 @@ #include "api/video/i422_buffer.h" +#include +#include + +#include "api/scoped_refptr.h" #include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" #include "test/frame_utils.h" -#include "test/gmock.h" #include "test/gtest.h" namespace webrtc { diff --git a/api/video/test/i444_buffer_unittest.cc b/api/video/test/i444_buffer_unittest.cc index 9a1a9315aa..9034504391 100644 --- a/api/video/test/i444_buffer_unittest.cc +++ b/api/video/test/i444_buffer_unittest.cc @@ -11,9 +11,13 @@ #include "api/video/i444_buffer.h" +#include +#include + +#include "api/scoped_refptr.h" #include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" #include "test/frame_utils.h" -#include "test/gmock.h" #include "test/gtest.h" namespace webrtc { diff --git a/api/video/test/nv12_buffer_unittest.cc b/api/video/test/nv12_buffer_unittest.cc index d84adb5bf5..5d197d9dfa 100644 --- a/api/video/test/nv12_buffer_unittest.cc +++ b/api/video/test/nv12_buffer_unittest.cc @@ -10,9 +10,13 @@ #include "api/video/nv12_buffer.h" +#include +#include + +#include "api/scoped_refptr.h" #include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" #include "test/frame_utils.h" -#include "test/gmock.h" #include "test/gtest.h" namespace webrtc { diff --git a/api/video/video_adaptation_counters.cc b/api/video/video_adaptation_counters.cc index df1769d5d4..a548c02aff 100644 --- a/api/video/video_adaptation_counters.cc +++ b/api/video/video_adaptation_counters.cc @@ -10,6 +10,8 @@ #include "api/video/video_adaptation_counters.h" +#include + #include "rtc_base/strings/string_builder.h" namespace webrtc { diff --git a/api/video/video_bitrate_allocation.cc b/api/video/video_bitrate_allocation.cc index e189db1c19..af5ce82ec0 100644 --- a/api/video/video_bitrate_allocation.cc +++ b/api/video/video_bitrate_allocation.cc @@ -10,8 +10,13 @@ #include "api/video/video_bitrate_allocation.h" +#include #include +#include +#include +#include "absl/types/optional.h" +#include "api/video/video_codec_constants.h" #include "rtc_base/checks.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/strings/string_builder.h" diff --git a/api/video/video_bitrate_allocator.cc b/api/video/video_bitrate_allocator.cc index f4e843b348..7de8451b21 100644 --- a/api/video/video_bitrate_allocator.cc +++ b/api/video/video_bitrate_allocator.cc @@ -10,6 +10,11 @@ #include "api/video/video_bitrate_allocator.h" +#include + +#include "api/units/data_rate.h" +#include "api/video/video_bitrate_allocation.h" + namespace webrtc { VideoBitrateAllocationParameters::VideoBitrateAllocationParameters( diff --git a/api/video/video_bitrate_allocator.h b/api/video/video_bitrate_allocator.h index fdc86dbc57..61d74ae490 100644 --- a/api/video/video_bitrate_allocator.h +++ b/api/video/video_bitrate_allocator.h @@ -11,6 +11,8 @@ #ifndef API_VIDEO_VIDEO_BITRATE_ALLOCATOR_H_ #define API_VIDEO_VIDEO_BITRATE_ALLOCATOR_H_ +#include + #include "api/units/data_rate.h" #include "api/video/video_bitrate_allocation.h" diff --git a/api/video/video_content_type.cc b/api/video/video_content_type.cc index 79da9ff273..75beb5c935 100644 --- a/api/video/video_content_type.cc +++ b/api/video/video_content_type.cc @@ -10,6 +10,8 @@ #include "api/video/video_content_type.h" +#include + #include "rtc_base/checks.h" namespace webrtc { diff --git a/api/video/video_frame.cc b/api/video/video_frame.cc index d23a16cfd0..cb40c89b6b 100644 --- a/api/video/video_frame.cc +++ b/api/video/video_frame.cc @@ -11,8 +11,16 @@ #include "api/video/video_frame.h" #include +#include #include +#include "absl/types/optional.h" +#include "api/rtp_packet_infos.h" +#include "api/scoped_refptr.h" +#include "api/units/timestamp.h" +#include "api/video/color_space.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" #include "rtc_base/checks.h" #include "rtc_base/time_utils.h" diff --git a/api/video/video_frame.h b/api/video/video_frame.h index d50c2d3aa6..ef01e5ff76 100644 --- a/api/video/video_frame.h +++ b/api/video/video_frame.h @@ -18,8 +18,9 @@ #include "absl/types/optional.h" #include "api/rtp_packet_infos.h" #include "api/scoped_refptr.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "api/video/color_space.h" -#include "api/video/hdr_metadata.h" #include "api/video/video_frame_buffer.h" #include "api/video/video_rotation.h" #include "rtc_base/checks.h" diff --git a/api/video/video_frame_buffer.cc b/api/video/video_frame_buffer.cc index 7297ee6051..30d7e87b3d 100644 --- a/api/video/video_frame_buffer.cc +++ b/api/video/video_frame_buffer.cc @@ -12,6 +12,8 @@ #include +#include "api/array_view.h" +#include "api/scoped_refptr.h" #include "api/video/i420_buffer.h" #include "api/video/i422_buffer.h" #include "api/video/i444_buffer.h" diff --git a/api/video/video_frame_metadata.cc b/api/video/video_frame_metadata.cc index c5f880848c..ca14fae6d2 100644 --- a/api/video/video_frame_metadata.cc +++ b/api/video/video_frame_metadata.cc @@ -10,7 +10,17 @@ #include "api/video/video_frame_metadata.h" +#include #include +#include + +#include "absl/types/optional.h" +#include "api/array_view.h" +#include "api/transport/rtp/dependency_descriptor.h" +#include "api/video/video_codec_type.h" +#include "api/video/video_content_type.h" +#include "api/video/video_frame_type.h" +#include "api/video/video_rotation.h" namespace webrtc { diff --git a/api/video/video_frame_metadata_unittest.cc b/api/video/video_frame_metadata_unittest.cc index 4ebf7435dd..d12ff1f106 100644 --- a/api/video/video_frame_metadata_unittest.cc +++ b/api/video/video_frame_metadata_unittest.cc @@ -10,11 +10,9 @@ #include "api/video/video_frame_metadata.h" -#include "api/video/video_frame.h" #include "modules/video_coding/codecs/h264/include/h264_globals.h" #include "modules/video_coding/codecs/vp9/include/vp9_globals.h" #include "test/gtest.h" -#include "video/video_receive_stream2.h" namespace webrtc { namespace { diff --git a/api/video/video_sink_interface.h b/api/video/video_sink_interface.h index 9c1f5f3214..f661248c2a 100644 --- a/api/video/video_sink_interface.h +++ b/api/video/video_sink_interface.h @@ -11,9 +11,7 @@ #ifndef API_VIDEO_VIDEO_SINK_INTERFACE_H_ #define API_VIDEO_VIDEO_SINK_INTERFACE_H_ -#include "absl/types/optional.h" #include "api/video_track_source_constraints.h" -#include "rtc_base/checks.h" namespace rtc { diff --git a/api/video/video_stream_encoder_settings.h b/api/video/video_stream_encoder_settings.h index 3aee5b7050..a8f2c7b6ff 100644 --- a/api/video/video_stream_encoder_settings.h +++ b/api/video/video_stream_encoder_settings.h @@ -11,9 +11,9 @@ #ifndef API_VIDEO_VIDEO_STREAM_ENCODER_SETTINGS_H_ #define API_VIDEO_VIDEO_STREAM_ENCODER_SETTINGS_H_ -#include #include "api/video/video_bitrate_allocator_factory.h" +#include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_encoder.h" #include "api/video_codecs/video_encoder_factory.h" diff --git a/api/video/video_timing.cc b/api/video/video_timing.cc index d16911fb58..8e9e9f0e36 100644 --- a/api/video/video_timing.cc +++ b/api/video/video_timing.cc @@ -11,6 +11,8 @@ #include "api/video/video_timing.h" #include +#include +#include #include "api/array_view.h" #include "api/units/time_delta.h"