Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Maintenance:9613
chromium.openSUSE_Backports_SLE-12-SP2
chromium-webrtc-includes.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File chromium-webrtc-includes.patch of Package chromium.openSUSE_Backports_SLE-12-SP2
From 3e70781361ed0666b925fe4333a567025de211bb Mon Sep 17 00:00:00 2001 From: Yves Gerey <yvesg@webrtc.org> Date: Wed, 28 Nov 2018 16:47:49 +0100 Subject: [PATCH] [Cleanup] Add missing #include. Remove useless ones. IWYU part 2. This is a follow-up to https://webrtc-review.googlesource.com/c/src/+/106280. This time the whole code base is covered. Some files may have not been fixed though, whenever the IWYU tool was breaking the build. Bug: webrtc:8311 Change-Id: I2c31f552a87e887d33931d46e87b6208b1e483ef Reviewed-on: https://webrtc-review.googlesource.com/c/111965 Commit-Queue: Yves Gerey <yvesg@google.com> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25830} --- Index: chromium-72.0.3626.53/third_party/webrtc/api/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/api/BUILD.gn @@ -58,6 +58,7 @@ rtc_static_library("create_peerconnectio "../logging:rtc_event_log_api", "../logging:rtc_event_log_impl_base", "../media:rtc_audio_video", + "../media:rtc_media_base", "../modules/audio_device:audio_device_api", "../modules/audio_processing:api", "../pc:peerconnection", @@ -202,6 +203,7 @@ rtc_source_set("test_dependency_factory" ] deps = [ ":video_quality_test_fixture_api", + "../rtc_base:checks", "../rtc_base:thread_checker", "//third_party/abseil-cpp/absl/memory", ] @@ -279,6 +281,7 @@ rtc_source_set("audio_options_api") { ] deps = [ + ":array_view", "../rtc_base:stringutils", "//third_party/abseil-cpp/absl/types:optional", ] @@ -636,7 +639,7 @@ if (rtc_include_tests) { deps = [ ":libjingle_peerconnection_api", "../rtc_base:checks", - "//third_party/abseil-cpp/absl/memory:memory", + "//third_party/abseil-cpp/absl/memory", ] } Index: chromium-72.0.3626.53/third_party/webrtc/api/DEPS =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/DEPS +++ chromium-72.0.3626.53/third_party/webrtc/api/DEPS @@ -110,6 +110,12 @@ specific_include_rules = { "+rtc_base/bind.h", ], + "proxy\.h": [ + "+rtc_base/messagehandler.h", # Inherits from it. + "+rtc_base/messagequeue.h", # Inherits from MessageData. + "+rtc_base/scoped_ref_ptr.h", + ], + "refcountedbase\.h": [ "+rtc_base/constructormagic.h", "+rtc_base/refcount.h", @@ -258,7 +264,8 @@ specific_include_rules = { ], "i010_buffer\.h": [ - "+rtc_base/memory/aligned_malloc.h" + "+rtc_base/memory/aligned_malloc.h", + "+rtc_base/scoped_ref_ptr.h", ], "i420_buffer\.h": [ Index: chromium-72.0.3626.53/third_party/webrtc/api/audio/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/audio/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/api/audio/BUILD.gn @@ -55,6 +55,7 @@ rtc_source_set("aec3_config_json") { ] deps = [ ":aec3_config", + "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_json", "../../rtc_base/system:rtc_export", Index: chromium-72.0.3626.53/third_party/webrtc/api/audio/echo_canceller3_config_json.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/audio/echo_canceller3_config_json.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/audio/echo_canceller3_config_json.cc @@ -9,9 +9,11 @@ */ #include "api/audio/echo_canceller3_config_json.h" +#include <stddef.h> #include <string> #include <vector> +#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/strings/json.h" #include "rtc_base/strings/string_builder.h" Index: chromium-72.0.3626.53/third_party/webrtc/api/audio/test/audio_frame_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/audio/test/audio_frame_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/audio/test/audio_frame_unittest.cc @@ -8,6 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> #include <string.h> // memcmp #include "api/audio/audio_frame.h" Index: chromium-72.0.3626.53/third_party/webrtc/api/audio/test/echo_canceller3_config_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/audio/test/echo_canceller3_config_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/audio/test/echo_canceller3_config_unittest.cc @@ -8,8 +8,6 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <string> - #include "api/audio/echo_canceller3_config.h" #include "api/audio/echo_canceller3_config_json.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/api/audio_options.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/audio_options.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/audio_options.cc @@ -10,6 +10,7 @@ #include "api/audio_options.h" +#include "api/array_view.h" #include "rtc_base/strings/string_builder.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/api/create_peerconnection_factory.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/create_peerconnection_factory.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/create_peerconnection_factory.cc @@ -13,16 +13,21 @@ #include <memory> #include <utility> +#include "api/audio/audio_mixer.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "api/audio_codecs/audio_encoder_factory.h" #include "api/call/callfactoryinterface.h" +#include "api/fec_controller.h" #include "api/peerconnectioninterface.h" +#include "api/transport/network_control.h" #include "api/video_codecs/video_decoder_factory.h" #include "api/video_codecs/video_encoder_factory.h" #include "logging/rtc_event_log/rtc_event_log_factory.h" #include "logging/rtc_event_log/rtc_event_log_factory_interface.h" +#include "media/base/mediaengine.h" #include "media/engine/webrtcmediaengine.h" #include "modules/audio_device/include/audio_device.h" #include "modules/audio_processing/include/audio_processing.h" -#include "rtc_base/bind.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread.h" Index: chromium-72.0.3626.53/third_party/webrtc/api/mediastreaminterface.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/mediastreaminterface.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/mediastreaminterface.cc @@ -9,8 +9,6 @@ */ #include "api/mediastreaminterface.h" -#include "rtc_base/checks.h" -#include "rtc_base/logging.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/api/proxy.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/proxy.h +++ chromium-72.0.3626.53/third_party/webrtc/api/proxy.h @@ -53,12 +53,20 @@ #define API_PROXY_H_ #include <memory> +#include <string> #include <utility> #include "rtc_base/event.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" #include "rtc_base/refcountedobject.h" +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread.h" +namespace rtc { +class Location; +} + namespace webrtc { template <typename R> Index: chromium-72.0.3626.53/third_party/webrtc/api/rtpparameters_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/rtpparameters_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/rtpparameters_unittest.cc @@ -8,8 +8,6 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <utility> - #include "api/rtpparameters.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/api/stats/rtcstats.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/stats/rtcstats.h +++ chromium-72.0.3626.53/third_party/webrtc/api/stats/rtcstats.h @@ -11,7 +11,8 @@ #ifndef API_STATS_RTCSTATS_H_ #define API_STATS_RTCSTATS_H_ -#include <map> +#include <stddef.h> +#include <stdint.h> #include <memory> #include <string> #include <utility> Index: chromium-72.0.3626.53/third_party/webrtc/api/stats/rtcstats_objects.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/stats/rtcstats_objects.h +++ chromium-72.0.3626.53/third_party/webrtc/api/stats/rtcstats_objects.h @@ -11,6 +11,7 @@ #ifndef API_STATS_RTCSTATS_OBJECTS_H_ #define API_STATS_RTCSTATS_OBJECTS_H_ +#include <stdint.h> #include <memory> #include <string> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/api/stats/rtcstatsreport.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/stats/rtcstatsreport.h +++ chromium-72.0.3626.53/third_party/webrtc/api/stats/rtcstatsreport.h @@ -11,6 +11,8 @@ #ifndef API_STATS_RTCSTATSREPORT_H_ #define API_STATS_RTCSTATSREPORT_H_ +#include <stddef.h> +#include <stdint.h> #include <map> #include <memory> #include <string> Index: chromium-72.0.3626.53/third_party/webrtc/api/test/fake_frame_decryptor.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/test/fake_frame_decryptor.h +++ chromium-72.0.3626.53/third_party/webrtc/api/test/fake_frame_decryptor.h @@ -11,9 +11,13 @@ #ifndef API_TEST_FAKE_FRAME_DECRYPTOR_H_ #define API_TEST_FAKE_FRAME_DECRYPTOR_H_ +#include <stddef.h> +#include <stdint.h> #include <vector> +#include "api/array_view.h" #include "api/crypto/framedecryptorinterface.h" +#include "api/mediatypes.h" #include "rtc_base/refcountedobject.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/api/test/fake_frame_encryptor.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/test/fake_frame_encryptor.h +++ chromium-72.0.3626.53/third_party/webrtc/api/test/fake_frame_encryptor.h @@ -11,7 +11,12 @@ #ifndef API_TEST_FAKE_FRAME_ENCRYPTOR_H_ #define API_TEST_FAKE_FRAME_ENCRYPTOR_H_ +#include <stddef.h> +#include <stdint.h> + +#include "api/array_view.h" #include "api/crypto/frameencryptorinterface.h" +#include "api/mediatypes.h" #include "rtc_base/refcountedobject.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/api/test/test_dependency_factory.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/test/test_dependency_factory.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/test/test_dependency_factory.cc @@ -13,6 +13,7 @@ #include "absl/memory/memory.h" #include "api/test/test_dependency_factory.h" +#include "rtc_base/checks.h" #include "rtc_base/thread_checker.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/api/test/test_dependency_factory.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/test/test_dependency_factory.h +++ chromium-72.0.3626.53/third_party/webrtc/api/test/test_dependency_factory.h @@ -14,7 +14,6 @@ #include <memory> #include "api/test/video_quality_test_fixture.h" -#include "rtc_base/thread_checker.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/api/test/videocodec_test_stats.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/test/videocodec_test_stats.h +++ chromium-72.0.3626.53/third_party/webrtc/api/test/videocodec_test_stats.h @@ -11,7 +11,8 @@ #ifndef API_TEST_VIDEOCODEC_TEST_STATS_H_ #define API_TEST_VIDEOCODEC_TEST_STATS_H_ -#include <map> +#include <stddef.h> +#include <stdint.h> #include <string> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/api/transport/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/transport/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/api/transport/BUILD.gn @@ -69,6 +69,10 @@ if (rtc_include_tests) { "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../test:test_support", + "../units:data_rate", + "../units:data_size", + "../units:time_delta", + "../units:timestamp", "//third_party/abseil-cpp/absl/types:optional", ] } Index: chromium-72.0.3626.53/third_party/webrtc/api/transport/goog_cc_factory.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/transport/goog_cc_factory.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/transport/goog_cc_factory.cc @@ -10,8 +10,11 @@ #include "api/transport/goog_cc_factory.h" +#include <stdint.h> + #include "absl/memory/memory.h" #include "modules/congestion_controller/goog_cc/goog_cc_network_control.h" + namespace webrtc { GoogCcNetworkControllerFactory::GoogCcNetworkControllerFactory( RtcEventLog* event_log) Index: chromium-72.0.3626.53/third_party/webrtc/api/transport/test/network_control_tester.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/transport/test/network_control_tester.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/transport/test/network_control_tester.cc @@ -11,8 +11,13 @@ #include "api/transport/test/network_control_tester.h" #include <algorithm> +#include <string> +#include <vector> +#include "absl/types/optional.h" #include "api/transport/network_control.h" +#include "api/units/data_size.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/api/transport/test/network_control_tester.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/transport/test/network_control_tester.h +++ chromium-72.0.3626.53/third_party/webrtc/api/transport/test/network_control_tester.h @@ -11,12 +11,16 @@ #ifndef API_TRANSPORT_TEST_NETWORK_CONTROL_TESTER_H_ #define API_TRANSPORT_TEST_NETWORK_CONTROL_TESTER_H_ +#include <stdint.h> #include <deque> #include <functional> #include <memory> -#include "absl/types/optional.h" #include "api/transport/network_control.h" +#include "api/transport/network_types.h" +#include "api/units/data_rate.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/api/units/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/units/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/api/units/BUILD.gn @@ -18,6 +18,7 @@ rtc_source_set("data_rate") { deps = [ ":data_size", ":time_delta", + "..:array_view", "../../rtc_base:checks", "../../rtc_base:stringutils", "../../rtc_base/units:unit_base", @@ -32,6 +33,7 @@ rtc_source_set("data_size") { ] deps = [ + "..:array_view", "../../rtc_base:checks", "../../rtc_base:stringutils", "../../rtc_base/units:unit_base", @@ -46,6 +48,7 @@ rtc_source_set("time_delta") { ] deps = [ + "..:array_view", "../../rtc_base:checks", "../../rtc_base:stringutils", "../../rtc_base/units:unit_base", @@ -61,6 +64,7 @@ rtc_source_set("timestamp") { deps = [ ":time_delta", + "..:array_view", "../../rtc_base:checks", "../../rtc_base:stringutils", "../../rtc_base/units:unit_base", Index: chromium-72.0.3626.53/third_party/webrtc/api/units/data_rate.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/units/data_rate.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/units/data_rate.cc @@ -10,6 +10,7 @@ #include "api/units/data_rate.h" +#include "api/array_view.h" #include "rtc_base/strings/string_builder.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/api/units/data_size.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/units/data_size.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/units/data_size.cc @@ -10,6 +10,7 @@ #include "api/units/data_size.h" +#include "api/array_view.h" #include "rtc_base/strings/string_builder.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/api/units/time_delta.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/units/time_delta.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/units/time_delta.cc @@ -10,6 +10,7 @@ #include "api/units/time_delta.h" +#include "api/array_view.h" #include "rtc_base/strings/string_builder.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/api/units/timestamp.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/units/timestamp.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/units/timestamp.cc @@ -10,6 +10,7 @@ #include "api/units/timestamp.h" +#include "api/array_view.h" #include "rtc_base/strings/string_builder.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/api/video/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/api/video/BUILD.gn @@ -32,6 +32,7 @@ rtc_source_set("video_frame") { ] deps = [ + "..:array_view", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../rtc_base/system:rtc_export", @@ -199,6 +200,7 @@ rtc_source_set("video_stream_encoder_cre } deps = [ + ":video_frame", ":video_stream_encoder", "../../rtc_base:ptr_util", "../../video:video_stream_encoder_impl", @@ -216,12 +218,15 @@ rtc_static_library("builtin_video_bitrat deps = [ ":video_bitrate_allocation", + ":video_bitrate_allocator", ":video_bitrate_allocator_factory", + "../../:webrtc_common", "../../media:rtc_media_base", "../../modules/video_coding:video_coding_utility", "../../modules/video_coding:webrtc_vp9_helpers", "../../rtc_base:ptr_util", "../../rtc_base/system:fallthrough", + "../video_codecs:video_codecs_api", "//third_party/abseil-cpp/absl/memory", ] } Index: chromium-72.0.3626.53/third_party/webrtc/api/video/builtin_video_bitrate_allocator_factory.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video/builtin_video_bitrate_allocator_factory.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/video/builtin_video_bitrate_allocator_factory.cc @@ -11,7 +11,9 @@ #include "api/video/builtin_video_bitrate_allocator_factory.h" #include "absl/memory/memory.h" -#include "media/base/codec.h" +#include "api/video/video_bitrate_allocator.h" +#include "api/video_codecs/video_codec.h" +#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/vp9/svc_rate_allocator.h" #include "modules/video_coding/utility/default_video_bitrate_allocator.h" #include "modules/video_coding/utility/simulcast_rate_allocator.h" Index: chromium-72.0.3626.53/third_party/webrtc/api/video/encoded_frame.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video/encoded_frame.h +++ chromium-72.0.3626.53/third_party/webrtc/api/video/encoded_frame.h @@ -13,6 +13,9 @@ #include "modules/video_coding/encoded_frame.h" +#include <stddef.h> +#include <stdint.h> + namespace webrtc { namespace video_coding { Index: chromium-72.0.3626.53/third_party/webrtc/api/video/i010_buffer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video/i010_buffer.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/video/i010_buffer.cc @@ -9,14 +9,12 @@ */ #include "api/video/i010_buffer.h" -#include <algorithm> #include <utility> #include "api/video/i420_buffer.h" #include "rtc_base/checks.h" #include "rtc_base/refcountedobject.h" #include "third_party/libyuv/include/libyuv/convert.h" -#include "third_party/libyuv/include/libyuv/planar_functions.h" #include "third_party/libyuv/include/libyuv/scale.h" // Aligning pointer to 64 bytes for improved performance, e.g. use SIMD. Index: chromium-72.0.3626.53/third_party/webrtc/api/video/i010_buffer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video/i010_buffer.h +++ chromium-72.0.3626.53/third_party/webrtc/api/video/i010_buffer.h @@ -11,11 +11,13 @@ #ifndef API_VIDEO_I010_BUFFER_H_ #define API_VIDEO_I010_BUFFER_H_ +#include <stdint.h> #include <memory> #include "api/video/video_frame_buffer.h" #include "api/video/video_rotation.h" #include "rtc_base/memory/aligned_malloc.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/api/video/i420_buffer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video/i420_buffer.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/video/i420_buffer.cc @@ -10,12 +10,11 @@ #include "api/video/i420_buffer.h" #include <string.h> - #include <algorithm> #include <utility> #include "rtc_base/checks.h" -#include "rtc_base/keep_ref_until_done.h" +#include "rtc_base/refcountedobject.h" #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/planar_functions.h" #include "third_party/libyuv/include/libyuv/scale.h" Index: chromium-72.0.3626.53/third_party/webrtc/api/video/test/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video/test/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/api/video/test/BUILD.gn @@ -18,5 +18,6 @@ rtc_source_set("rtc_api_video_unittests" "..:video_bitrate_allocation", "..:video_frame", "../../../test:test_support", + "//third_party/abseil-cpp/absl/types:optional", ] } Index: chromium-72.0.3626.53/third_party/webrtc/api/video/test/video_bitrate_allocation_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video/test/video_bitrate_allocation_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/video/test/video_bitrate_allocation_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <memory> -#include <string> +#include <vector> +#include "absl/types/optional.h" #include "api/video/video_bitrate_allocation.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/api/video/video_stream_encoder_create.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video/video_stream_encoder_create.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/video/video_stream_encoder_create.cc @@ -11,6 +11,7 @@ #include "api/video/video_stream_encoder_create.h" #include "absl/memory/memory.h" +#include "video/overuse_frame_detector.h" #include "video/video_stream_encoder.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/api/video/video_stream_encoder_create.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video/video_stream_encoder_create.h +++ chromium-72.0.3626.53/third_party/webrtc/api/video/video_stream_encoder_create.h @@ -11,10 +11,11 @@ #ifndef API_VIDEO_VIDEO_STREAM_ENCODER_CREATE_H_ #define API_VIDEO_VIDEO_STREAM_ENCODER_CREATE_H_ -#include <map> +#include <stdint.h> #include <memory> -#include <utility> +#include "api/video/video_frame.h" +#include "api/video/video_sink_interface.h" #include "api/video/video_stream_encoder_interface.h" #include "api/video/video_stream_encoder_observer.h" #include "api/video/video_stream_encoder_settings.h" Index: chromium-72.0.3626.53/third_party/webrtc/api/video/video_timing.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video/video_timing.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/video/video_timing.cc @@ -10,6 +10,7 @@ #include "api/video/video_timing.h" +#include "api/array_view.h" #include "rtc_base/strings/string_builder.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/api/video_codecs/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video_codecs/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/api/video_codecs/BUILD.gn @@ -80,6 +80,7 @@ rtc_static_library("builtin_video_encode "../../media:rtc_internal_video_codecs", "../../media:rtc_media_base", "../../media:rtc_vp8_encoder_simulcast_proxy", + "../../rtc_base:checks", "../../rtc_base:ptr_util", "../../rtc_base/system:rtc_export", "//third_party/abseil-cpp/absl/memory", @@ -101,7 +102,7 @@ rtc_static_library("create_vp8_temporal_ "../../modules/video_coding:video_codec_interface", "../../modules/video_coding:webrtc_vp8_temporal_layers", "../../system_wrappers:system_wrappers", - "//third_party/abseil-cpp/absl/memory:memory", + "//third_party/abseil-cpp/absl/memory", ] } @@ -122,6 +123,7 @@ rtc_static_library("rtc_software_fallbac deps = [ ":video_codecs_api", + "../../:webrtc_common", "../../media:rtc_h264_profile_id", "../../media:rtc_media_base", "../../modules/video_coding:video_codec_interface", @@ -129,7 +131,10 @@ rtc_static_library("rtc_software_fallbac "../../rtc_base:rtc_base_approved", "../../rtc_base/system:fallthrough", "../../system_wrappers:field_trial", + "../video:encoded_image", "../video:video_bitrate_allocation", + "../video:video_frame", "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/types:optional", ] } Index: chromium-72.0.3626.53/third_party/webrtc/api/video_codecs/builtin_video_encoder_factory.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video_codecs/builtin_video_encoder_factory.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/video_codecs/builtin_video_encoder_factory.cc @@ -15,10 +15,12 @@ #include "absl/memory/memory.h" #include "absl/strings/match.h" #include "api/video_codecs/sdp_video_format.h" +#include "api/video_codecs/video_encoder.h" #include "media/base/codec.h" #include "media/base/mediaconstants.h" #include "media/engine/internalencoderfactory.h" #include "media/engine/vp8_encoder_simulcast_proxy.h" +#include "rtc_base/checks.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/api/video_codecs/test/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video_codecs/test/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/api/video_codecs/test/BUILD.gn @@ -22,14 +22,19 @@ if (rtc_include_tests) { "..:rtc_software_fallback_wrappers", "..:video_codecs_api", "../..:mock_video_encoder", + "../../../:webrtc_common", + "../../../modules:module_api", "../../../modules/video_coding:video_codec_interface", "../../../modules/video_coding:video_coding_utility", "../../../modules/video_coding:webrtc_vp8", "../../../rtc_base:checks", + "../../../rtc_base:ptr_util", "../../../rtc_base:rtc_base_tests_utils", "../../../test:field_trial", "../../../test:test_support", + "../../video:encoded_image", "../../video:video_bitrate_allocation", + "../../video:video_frame", "../../video:video_frame_i420", "//testing/gtest", ] Index: chromium-72.0.3626.53/third_party/webrtc/api/video_codecs/test/builtin_video_encoder_factory_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video_codecs/test/builtin_video_encoder_factory_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/video_codecs/test/builtin_video_encoder_factory_unittest.cc @@ -11,9 +11,11 @@ #include "api/video_codecs/builtin_video_encoder_factory.h" #include <memory> +#include <string> +#include <vector> #include "api/video_codecs/sdp_video_format.h" -#include "test/gmock.h" +#include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/api/video_codecs/test/video_decoder_software_fallback_wrapper_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video_codecs/test/video_decoder_software_fallback_wrapper_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/video_codecs/test/video_decoder_software_fallback_wrapper_unittest.cc @@ -9,8 +9,17 @@ */ #include "api/video_codecs/video_decoder_software_fallback_wrapper.h" + +#include <stdint.h> + +#include "absl/types/optional.h" +#include "api/video/encoded_image.h" +#include "api/video/video_frame.h" +#include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_decoder.h" +#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/vp8/include/vp8.h" +#include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/checks.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc @@ -8,19 +8,31 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <utility> +#include <stddef.h> +#include <stdint.h> +#include <memory> +#include <string> +#include <vector> +#include "absl/types/optional.h" #include "api/test/mock_video_encoder.h" +#include "api/video/encoded_image.h" #include "api/video/i420_buffer.h" #include "api/video/video_bitrate_allocation.h" +#include "api/video/video_frame.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" +#include "api/video_codecs/video_codec.h" +#include "api/video_codecs/video_encoder.h" #include "api/video_codecs/video_encoder_software_fallback_wrapper.h" -#include "api/video_codecs/vp8_temporal_layers.h" +#include "common_types.h" // NOLINT(build/include) +#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 "modules/video_coding/include/video_error_codes.h" #include "modules/video_coding/utility/simulcast_rate_allocator.h" -#include "rtc_base/checks.h" #include "rtc_base/fakeclock.h" +#include "rtc_base/scoped_ref_ptr.h" #include "test/field_trial.h" #include "test/gmock.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/api/video_codecs/video_decoder_software_fallback_wrapper.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video_codecs/video_decoder_software_fallback_wrapper.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/video_codecs/video_decoder_software_fallback_wrapper.cc @@ -10,10 +10,13 @@ #include "api/video_codecs/video_decoder_software_fallback_wrapper.h" +#include <stdint.h> #include <string> #include <utility> #include "absl/memory/memory.h" +#include "api/video/encoded_image.h" +#include "api/video_codecs/video_codec.h" #include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc +++ chromium-72.0.3626.53/third_party/webrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc @@ -10,18 +10,21 @@ #include "api/video_codecs/video_encoder_software_fallback_wrapper.h" +#include <stdint.h> #include <cstdio> #include <string> #include <utility> #include <vector> #include "absl/memory/memory.h" -#include "media/base/codec.h" -#include "media/base/h264_profile_level_id.h" +#include "absl/types/optional.h" +#include "api/video/video_bitrate_allocation.h" +#include "api/video/video_frame.h" +#include "api/video_codecs/video_codec.h" +#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/call/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/call/BUILD.gn @@ -124,6 +124,10 @@ rtc_source_set("rtp_sender") { "../api:fec_controller_api", "../api:transport_api", "../api/transport:network_control", + "../api/units:data_rate", + "../api/units:time_delta", + "../api/units:timestamp", + "../api/video:video_frame", "../api/video_codecs:video_codecs_api", "../logging:rtc_event_log_api", "../modules/congestion_controller", @@ -133,6 +137,7 @@ rtc_source_set("rtp_sender") { "../modules/rtp_rtcp:rtp_rtcp_format", "../modules/rtp_rtcp:rtp_video_header", "../modules/utility", + "../modules/video_coding:codec_globals_headers", "../modules/video_coding:video_codec_interface", "../rtc_base:checks", "../rtc_base:rate_limiter", @@ -140,7 +145,10 @@ rtc_source_set("rtp_sender") { "../rtc_base:rtc_base_approved", "../rtc_base:rtc_task_queue", "../system_wrappers:field_trial", + "//third_party/abseil-cpp/absl/container:inlined_vector", "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/types:optional", + "//third_party/abseil-cpp/absl/types:variant", ] } @@ -155,6 +163,7 @@ rtc_source_set("bitrate_configurator") { "../api/transport:bitrate_settings", "../rtc_base:checks", "../rtc_base:rtc_base_approved", + "//third_party/abseil-cpp/absl/types:optional", ] } @@ -199,10 +208,16 @@ rtc_static_library("call") { ":rtp_sender", ":simulated_network", ":video_stream_api", + "..:webrtc_common", + "../api:array_view", "../api:callfactory_api", + "../api:fec_controller_api", + "../api:libjingle_peerconnection_api", "../api:simulated_network_api", "../api:transport_api", "../api/transport:network_control", + "../api/units:time_delta", + "../api/video_codecs:video_codecs_api", "../audio", "../logging:rtc_event_audio", "../logging:rtc_event_log_api", @@ -223,6 +238,7 @@ rtc_static_library("call") { "../rtc_base:safe_minmax", "../rtc_base:sequenced_task_checker", "../rtc_base/experiments:field_trial_parser", + "../rtc_base/network:sent_packet", "../rtc_base/synchronization:rw_lock_wrapper", "../system_wrappers", "../system_wrappers:field_trial", @@ -265,6 +281,7 @@ rtc_source_set("simulated_network") { "../api/units:data_rate", "../api/units:data_size", "../api/units:time_delta", + "../rtc_base:checks", "../rtc_base:rtc_base_approved", "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/types:optional", @@ -291,10 +308,13 @@ rtc_source_set("fake_network") { ":call_interfaces", ":simulated_network", ":simulated_packet_receiver", + "..:webrtc_common", + "../api:libjingle_peerconnection_api", "../api:simulated_network_api", "../api:transport_api", "../modules:module_api", "../modules/utility", + "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../rtc_base:sequenced_task_checker", "../system_wrappers", @@ -330,12 +350,15 @@ if (rtc_include_tests) { ":rtp_receiver", ":rtp_sender", ":simulated_network", + "../:webrtc_common", "../api:array_view", "../api:fake_media_transport", "../api:fake_media_transport", "../api:libjingle_peerconnection_api", "../api:mock_audio_mixer", + "../api:transport_api", "../api/audio_codecs:builtin_audio_decoder_factory", + "../api/video:video_frame", "../audio:audio", "../logging:rtc_event_log_api", "../logging:rtc_event_log_impl_base", @@ -351,6 +374,7 @@ if (rtc_include_tests) { "../modules/rtp_rtcp:mock_rtp_rtcp", "../modules/rtp_rtcp:rtp_rtcp_format", "../modules/utility:mock_process_thread", + "../modules/video_coding:codec_globals_headers", "../modules/video_coding:video_codec_interface", "../modules/video_coding:video_coding", "../rtc_base:checks", @@ -367,6 +391,7 @@ if (rtc_include_tests) { "../video:video", "//testing/gmock", "//testing/gtest", + "//third_party/abseil-cpp/absl/container:inlined_vector", "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/types:optional", ] Index: chromium-72.0.3626.53/third_party/webrtc/call/callfactory.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/callfactory.cc +++ chromium-72.0.3626.53/third_party/webrtc/call/callfactory.cc @@ -10,14 +10,15 @@ #include "call/callfactory.h" +#include <stdio.h> #include <memory> #include <string> -#include <utility> #include "absl/types/optional.h" +#include "api/test/simulated_network.h" #include "call/call.h" #include "call/degraded_call.h" -#include "call/fake_network_pipe.h" +#include "rtc_base/checks.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/call/callfactory.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/callfactory.h +++ chromium-72.0.3626.53/third_party/webrtc/call/callfactory.h @@ -12,6 +12,8 @@ #define CALL_CALLFACTORY_H_ #include "api/call/callfactoryinterface.h" +#include "call/call.h" +#include "call/call_config.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/call/degraded_call.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/degraded_call.cc +++ chromium-72.0.3626.53/third_party/webrtc/call/degraded_call.cc @@ -10,9 +10,9 @@ #include <utility> -#include "call/degraded_call.h" - #include "absl/memory/memory.h" +#include "call/degraded_call.h" +#include "rtc_base/location.h" namespace webrtc { DegradedCall::DegradedCall( Index: chromium-72.0.3626.53/third_party/webrtc/call/degraded_call.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/degraded_call.h +++ chromium-72.0.3626.53/third_party/webrtc/call/degraded_call.h @@ -11,15 +11,31 @@ #ifndef CALL_DEGRADED_CALL_H_ #define CALL_DEGRADED_CALL_H_ +#include <stddef.h> +#include <stdint.h> #include <memory> #include "absl/types/optional.h" #include "api/call/transport.h" +#include "api/fec_controller.h" +#include "api/mediatypes.h" +#include "api/rtp_headers.h" #include "api/test/simulated_network.h" +#include "api/video_codecs/video_encoder_config.h" +#include "call/audio_receive_stream.h" +#include "call/audio_send_stream.h" #include "call/call.h" #include "call/fake_network_pipe.h" +#include "call/flexfec_receive_stream.h" +#include "call/packet_receiver.h" +#include "call/rtp_transport_controller_send_interface.h" #include "call/simulated_network.h" +#include "call/video_receive_stream.h" +#include "call/video_send_stream.h" #include "modules/utility/include/process_thread.h" +#include "rtc_base/bitrateallocationstrategy.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/network/sent_packet.h" #include "system_wrappers/include/clock.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/call/fake_network_pipe.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/fake_network_pipe.cc +++ chromium-72.0.3626.53/third_party/webrtc/call/fake_network_pipe.cc @@ -8,17 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <math.h> #include <string.h> - #include <algorithm> +#include <queue> #include <utility> +#include <vector> -#include "absl/memory/memory.h" -#include "call/call.h" +#include "api/mediatypes.h" #include "call/fake_network_pipe.h" -#include "call/simulated_network.h" #include "modules/utility/include/process_thread.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "system_wrappers/include/clock.h" Index: chromium-72.0.3626.53/third_party/webrtc/call/flexfec_receive_stream_impl.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/flexfec_receive_stream_impl.cc +++ chromium-72.0.3626.53/third_party/webrtc/call/flexfec_receive_stream_impl.cc @@ -10,8 +10,14 @@ #include "call/flexfec_receive_stream_impl.h" +#include <stddef.h> +#include <cstdint> #include <string> +#include <vector> +#include "api/array_view.h" +#include "api/call/transport.h" +#include "api/rtpparameters.h" #include "call/rtp_stream_receiver_controller_interface.h" #include "modules/rtp_rtcp/include/flexfec_receiver.h" #include "modules/rtp_rtcp/include/receive_statistics.h" Index: chromium-72.0.3626.53/third_party/webrtc/call/flexfec_receive_stream_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/flexfec_receive_stream_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/call/flexfec_receive_stream_unittest.cc @@ -8,20 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "call/flexfec_receive_stream_impl.h" - -#include <stdint.h> +#include <cstdint> #include <memory> +#include <vector> #include "absl/memory/memory.h" #include "api/array_view.h" +#include "api/call/transport.h" +#include "api/rtp_headers.h" +#include "api/rtpparameters.h" +#include "call/flexfec_receive_stream.h" +#include "call/flexfec_receive_stream_impl.h" #include "call/rtp_stream_receiver_controller.h" -#include "modules/pacing/packet_router.h" -#include "modules/rtp_rtcp/include/flexfec_receiver.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h" #include "modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" #include "modules/utility/include/mock/mock_process_thread.h" #include "test/gmock.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/call/receive_time_calculator.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/receive_time_calculator.cc +++ chromium-72.0.3626.53/third_party/webrtc/call/receive_time_calculator.cc @@ -11,10 +11,10 @@ #include "call/receive_time_calculator.h" #include <string> +#include <type_traits> #include "absl/memory/memory.h" #include "rtc_base/experiments/field_trial_parser.h" -#include "rtc_base/logging.h" #include "rtc_base/numerics/safe_minmax.h" #include "system_wrappers/include/field_trial.h" Index: chromium-72.0.3626.53/third_party/webrtc/call/receive_time_calculator.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/receive_time_calculator.h +++ chromium-72.0.3626.53/third_party/webrtc/call/receive_time_calculator.h @@ -10,9 +10,11 @@ #ifndef CALL_RECEIVE_TIME_CALCULATOR_H_ #define CALL_RECEIVE_TIME_CALCULATOR_H_ +#include <stdint.h> #include <memory> -#include "rtc_base/experiments/field_trial_units.h" +#include "api/units/time_delta.h" +#include "rtc_base/experiments/field_trial_parser.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/call/receive_time_calculator_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/receive_time_calculator_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/call/receive_time_calculator_unittest.cc @@ -10,12 +10,12 @@ #include "call/receive_time_calculator.h" +#include <stdlib.h> #include <algorithm> -#include <iostream> -#include <tuple> +#include <cmath> +#include <cstdint> #include <vector> -#include "absl/memory/memory.h" #include "absl/types/optional.h" #include "rtc_base/random.h" #include "rtc_base/timeutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/call/rtcp_demuxer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/rtcp_demuxer.cc +++ chromium-72.0.3626.53/third_party/webrtc/call/rtcp_demuxer.cc @@ -10,6 +10,11 @@ #include "call/rtcp_demuxer.h" +#include <stddef.h> +#include <algorithm> +#include <utility> + +#include "absl/types/optional.h" #include "api/rtp_headers.h" #include "call/rtcp_packet_sink_interface.h" #include "call/rtp_rtcp_demuxer_helper.h" Index: chromium-72.0.3626.53/third_party/webrtc/call/rtcp_demuxer_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/rtcp_demuxer_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/call/rtcp_demuxer_unittest.cc @@ -10,14 +10,14 @@ #include "call/rtcp_demuxer.h" -#include <memory> +#include <stddef.h> #include <set> -#include "absl/memory/memory.h" #include "api/rtp_headers.h" #include "call/rtcp_packet_sink_interface.h" #include "modules/rtp_rtcp/source/rtcp_packet/bye.h" #include "rtc_base/arraysize.h" +#include "rtc_base/buffer.h" #include "rtc_base/checks.h" #include "test/gmock.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/call/rtp_bitrate_configurator.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/rtp_bitrate_configurator.h +++ chromium-72.0.3626.53/third_party/webrtc/call/rtp_bitrate_configurator.h @@ -11,6 +11,7 @@ #ifndef CALL_RTP_BITRATE_CONFIGURATOR_H_ #define CALL_RTP_BITRATE_CONFIGURATOR_H_ +#include "absl/types/optional.h" #include "api/bitrate_constraints.h" #include "api/transport/bitrate_settings.h" #include "rtc_base/constructormagic.h" Index: chromium-72.0.3626.53/third_party/webrtc/call/rtp_payload_params.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/rtp_payload_params.cc +++ chromium-72.0.3626.53/third_party/webrtc/call/rtp_payload_params.cc @@ -10,7 +10,17 @@ #include "call/rtp_payload_params.h" -#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include <stddef.h> + +#include "absl/container/inlined_vector.h" +#include "absl/types/optional.h" +#include "absl/types/variant.h" +#include "api/video/video_timing.h" +#include "common_types.h" // NOLINT(build/include) +#include "modules/video_coding/codecs/h264/include/h264_globals.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" #include "modules/video_coding/include/video_codec_interface.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/call/rtp_payload_params_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/rtp_payload_params_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/call/rtp_payload_params_unittest.cc @@ -8,10 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <memory> +#include <string.h> +#include <map> #include <set> +#include "absl/container/inlined_vector.h" +#include "absl/types/optional.h" +#include "absl/types/variant.h" +#include "api/video/video_content_type.h" +#include "api/video/video_rotation.h" #include "call/rtp_payload_params.h" +#include "common_types.h" // NOLINT(build/include) +#include "modules/video_coding/codecs/h264/include/h264_globals.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" #include "modules/video_coding/include/video_codec_interface.h" #include "test/field_trial.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/call/rtp_rtcp_demuxer_helper.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/rtp_rtcp_demuxer_helper.h +++ chromium-72.0.3626.53/third_party/webrtc/call/rtp_rtcp_demuxer_helper.h @@ -11,9 +11,8 @@ #ifndef CALL_RTP_RTCP_DEMUXER_HELPER_H_ #define CALL_RTP_RTCP_DEMUXER_HELPER_H_ -#include <algorithm> -#include <map> -#include <utility> +#include <stddef.h> +#include <stdint.h> #include "absl/types/optional.h" #include "api/array_view.h" Index: chromium-72.0.3626.53/third_party/webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <string.h> #include <cstdio> #include "call/rtp_rtcp_demuxer_helper.h" - #include "modules/rtp_rtcp/source/rtcp_packet/bye.h" #include "modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" #include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" Index: chromium-72.0.3626.53/third_party/webrtc/call/rtp_transport_controller_send.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/rtp_transport_controller_send.cc +++ chromium-72.0.3626.53/third_party/webrtc/call/rtp_transport_controller_send.cc @@ -11,9 +11,16 @@ #include <vector> #include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/transport/network_types.h" +#include "api/units/data_rate.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "call/rtp_transport_controller_send.h" +#include "call/rtp_video_sender.h" #include "modules/congestion_controller/include/send_side_congestion_controller.h" #include "modules/congestion_controller/rtp/include/send_side_congestion_controller.h" +#include "rtc_base/checks.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" #include "rtc_base/rate_limiter.h" Index: chromium-72.0.3626.53/third_party/webrtc/call/rtx_receive_stream.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/rtx_receive_stream.cc +++ chromium-72.0.3626.53/third_party/webrtc/call/rtx_receive_stream.cc @@ -8,11 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <string.h> #include <utility> +#include "api/array_view.h" #include "call/rtx_receive_stream.h" #include "modules/rtp_rtcp/include/receive_statistics.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/call/simulated_network.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/simulated_network.cc +++ chromium-72.0.3626.53/third_party/webrtc/call/simulated_network.cc @@ -13,7 +13,11 @@ #include <algorithm> #include <cmath> #include <utility> + #include "api/units/data_rate.h" +#include "api/units/data_size.h" +#include "api/units/time_delta.h" +#include "rtc_base/checks.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/call/simulated_network.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/call/simulated_network.h +++ chromium-72.0.3626.53/third_party/webrtc/call/simulated_network.h @@ -10,11 +10,11 @@ #ifndef CALL_SIMULATED_NETWORK_H_ #define CALL_SIMULATED_NETWORK_H_ +#include <stdint.h> #include <deque> #include <queue> #include <vector> -#include "absl/memory/memory.h" #include "absl/types/optional.h" #include "api/test/simulated_network.h" #include "rtc_base/criticalsection.h" Index: chromium-72.0.3626.53/third_party/webrtc/common_audio/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/common_audio/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/common_audio/BUILD.gn @@ -58,7 +58,7 @@ rtc_static_library("common_audio") { "../system_wrappers:cpu_features_api", "third_party/fft4g:fft4g", "//third_party/abseil-cpp/absl/container:inlined_vector", - "//third_party/abseil-cpp/absl/memory:memory", + "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/types:optional", ] Index: chromium-72.0.3626.53/third_party/webrtc/common_video/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/common_video/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/common_video/BUILD.gn @@ -86,10 +86,14 @@ if (rtc_include_tests) { deps = [ ":common_video", + "../:webrtc_common", + "../api/units:time_delta", "../api/video:video_frame", "../api/video:video_frame_i010", "../api/video:video_frame_i420", + "../media:rtc_h264_profile_id", "../modules/video_capture:video_capture", + "../rtc_base:checks", "../rtc_base:rtc_base", "../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_tests_utils", Index: chromium-72.0.3626.53/third_party/webrtc/common_video/bitrate_adjuster_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/common_video/bitrate_adjuster_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/common_video/bitrate_adjuster_unittest.cc @@ -9,6 +9,8 @@ */ #include "common_video/include/bitrate_adjuster.h" + +#include "api/units/time_delta.h" #include "rtc_base/fakeclock.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/common_video/h264/pps_parser_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/common_video/h264/pps_parser_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/common_video/h264/pps_parser_unittest.cc @@ -10,12 +10,10 @@ #include "common_video/h264/pps_parser.h" -#include <limits> -#include <memory> - #include "common_video/h264/h264_common.h" #include "rtc_base/bitbuffer.h" #include "rtc_base/buffer.h" +#include "rtc_base/checks.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/common_video/h264/profile_level_id_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/common_video/h264/profile_level_id_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/common_video/h264/profile_level_id_unittest.cc @@ -10,6 +10,12 @@ #include "common_video/h264/profile_level_id.h" +#include <map> +#include <string> + +#include "absl/types/optional.h" +#include "common_types.h" // NOLINT(build/include) +#include "media/base/h264_profile_level_id.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc @@ -8,6 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <cstdint> #include <vector> #include "common_video/h264/h264_common.h" Index: chromium-72.0.3626.53/third_party/webrtc/common_video/i420_buffer_pool_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/common_video/i420_buffer_pool_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/common_video/i420_buffer_pool_unittest.cc @@ -8,9 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <string> +#include <stdint.h> +#include <string.h> +#include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" #include "common_video/include/i420_buffer_pool.h" +#include "rtc_base/scoped_ref_ptr.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/common_video/libyuv/webrtc_libyuv.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/common_video/libyuv/webrtc_libyuv.cc +++ chromium-72.0.3626.53/third_party/webrtc/common_video/libyuv/webrtc_libyuv.cc @@ -10,7 +10,7 @@ #include "common_video/libyuv/include/webrtc_libyuv.h" -#include <string.h> +#include <cstdint> #include "api/video/i420_buffer.h" #include "common_video/include/video_frame_buffer.h" Index: chromium-72.0.3626.53/third_party/webrtc/common_video/video_frame_buffer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/common_video/video_frame_buffer.cc +++ chromium-72.0.3626.53/third_party/webrtc/common_video/video_frame_buffer.cc @@ -9,16 +9,10 @@ */ #include "common_video/include/video_frame_buffer.h" -#include <string.h> - -#include <algorithm> - #include "api/video/i420_buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/keep_ref_until_done.h" +#include "rtc_base/refcountedobject.h" #include "third_party/libyuv/include/libyuv/convert.h" -#include "third_party/libyuv/include/libyuv/planar_functions.h" -#include "third_party/libyuv/include/libyuv/scale.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/examples/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/examples/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/examples/BUILD.gn @@ -681,14 +681,21 @@ if (is_linux || is_win) { suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] } deps = [ + "../api:audio_options_api", "../api:create_peerconnection_factory", "../api:libjingle_peerconnection_api", + "../api/audio:audio_mixer_api", + "../api/audio_codecs:audio_codecs_api", "../api/video:video_frame_i420", + "../api/video_codecs:video_codecs_api", + "../media:rtc_media_base", + "../p2p:rtc_p2p", "../rtc_base:checks", "../rtc_base:stringutils", "../rtc_base/third_party/sigslot", "../system_wrappers:field_trial", "../test:field_trial", + "//third_party/abseil-cpp/absl/types:optional", ] if (is_win) { sources += [ Index: chromium-72.0.3626.53/third_party/webrtc/examples/peerconnection/client/conductor.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/examples/peerconnection/client/conductor.cc +++ chromium-72.0.3626.53/third_party/webrtc/examples/peerconnection/client/conductor.cc @@ -10,22 +10,37 @@ #include "examples/peerconnection/client/conductor.h" +#include <stddef.h> +#include <stdint.h> #include <memory> #include <utility> #include <vector> +#include "absl/types/optional.h" +#include "api/audio/audio_mixer.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "api/audio_codecs/audio_encoder_factory.h" #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" +#include "api/audio_options.h" #include "api/create_peerconnection_factory.h" +#include "api/rtpsenderinterface.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" +#include "api/video_codecs/video_decoder_factory.h" +#include "api/video_codecs/video_encoder_factory.h" #include "examples/peerconnection/client/defaults.h" +#include "media/base/device.h" #include "media/engine/webrtcvideocapturerfactory.h" #include "modules/audio_device/include/audio_device.h" #include "modules/audio_processing/include/audio_processing.h" +#include "modules/video_capture/video_capture.h" #include "modules/video_capture/video_capture_factory.h" +#include "p2p/base/portallocator.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/rtccertificategenerator.h" #include "rtc_base/strings/json.h" // Names used for a IceCandidate JSON object. Index: chromium-72.0.3626.53/third_party/webrtc/examples/peerconnection/client/defaults.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/examples/peerconnection/client/defaults.cc +++ chromium-72.0.3626.53/third_party/webrtc/examples/peerconnection/client/defaults.cc @@ -11,7 +11,6 @@ #include "examples/peerconnection/client/defaults.h" #include <stdlib.h> -#include <string.h> #ifdef WIN32 #include <winsock2.h> Index: chromium-72.0.3626.53/third_party/webrtc/examples/peerconnection/client/linux/main.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/examples/peerconnection/client/linux/main.cc +++ chromium-72.0.3626.53/third_party/webrtc/examples/peerconnection/client/linux/main.cc @@ -8,13 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <glib.h> #include <gtk/gtk.h> +#include <stdio.h> #include "examples/peerconnection/client/conductor.h" #include "examples/peerconnection/client/flagdefs.h" #include "examples/peerconnection/client/linux/main_wnd.h" #include "examples/peerconnection/client/peer_connection_client.h" - +#include "rtc_base/flags.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/physicalsocketserver.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/ssladapter.h" #include "rtc_base/thread.h" #include "system_wrappers/include/field_trial.h" Index: chromium-72.0.3626.53/third_party/webrtc/examples/peerconnection/client/linux/main_wnd.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/examples/peerconnection/client/linux/main_wnd.cc +++ chromium-72.0.3626.53/third_party/webrtc/examples/peerconnection/client/linux/main_wnd.cc @@ -10,12 +10,25 @@ #include "examples/peerconnection/client/linux/main_wnd.h" +#include <cairo.h> +#include <gdk/gdk.h> #include <gdk/gdkkeysyms.h> +#include <glib-object.h> +#include <glib.h> +#include <gobject/gclosure.h> #include <gtk/gtk.h> #include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <cstdint> +#include <map> +#include <utility> #include "api/video/i420_buffer.h" -#include "examples/peerconnection/client/defaults.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" +#include "api/video/video_source_interface.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "third_party/libyuv/include/libyuv/convert_from.h" Index: chromium-72.0.3626.53/third_party/webrtc/examples/peerconnection/client/linux/main_wnd.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/examples/peerconnection/client/linux/main_wnd.h +++ chromium-72.0.3626.53/third_party/webrtc/examples/peerconnection/client/linux/main_wnd.h @@ -11,11 +11,16 @@ #ifndef EXAMPLES_PEERCONNECTION_CLIENT_LINUX_MAIN_WND_H_ #define EXAMPLES_PEERCONNECTION_CLIENT_LINUX_MAIN_WND_H_ +#include <stdint.h> #include <memory> #include <string> +#include "api/mediastreaminterface.h" +#include "api/video/video_frame.h" +#include "api/video/video_sink_interface.h" #include "examples/peerconnection/client/main_wnd.h" #include "examples/peerconnection/client/peer_connection_client.h" +#include "rtc_base/scoped_ref_ptr.h" // Forward declarations. typedef struct _GtkWidget GtkWidget; Index: chromium-72.0.3626.53/third_party/webrtc/examples/peerconnection/server/main.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/examples/peerconnection/server/main.cc +++ chromium-72.0.3626.53/third_party/webrtc/examples/peerconnection/server/main.cc @@ -11,13 +11,15 @@ #include <assert.h> #include <stdio.h> #include <stdlib.h> -#include <string.h> - +#if defined(WEBRTC_POSIX) +#include <sys/select.h> +#endif +#include <time.h> +#include <string> #include <vector> #include "examples/peerconnection/server/data_socket.h" #include "examples/peerconnection/server/peer_channel.h" -#include "examples/peerconnection/server/utils.h" #include "rtc_base/flags.h" #include "rtc_tools/simple_command_line_parser.h" #include "system_wrappers/include/field_trial.h" Index: chromium-72.0.3626.53/third_party/webrtc/examples/peerconnection/server/peer_channel.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/examples/peerconnection/server/peer_channel.cc +++ chromium-72.0.3626.53/third_party/webrtc/examples/peerconnection/server/peer_channel.cc @@ -10,10 +10,9 @@ #include "examples/peerconnection/server/peer_channel.h" +#include <assert.h> #include <stdio.h> #include <stdlib.h> -#include <string.h> - #include <algorithm> #include "examples/peerconnection/server/data_socket.h" Index: chromium-72.0.3626.53/third_party/webrtc/examples/peerconnection/server/utils.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/examples/peerconnection/server/utils.h +++ chromium-72.0.3626.53/third_party/webrtc/examples/peerconnection/server/utils.h @@ -11,6 +11,7 @@ #ifndef EXAMPLES_PEERCONNECTION_SERVER_UTILS_H_ #define EXAMPLES_PEERCONNECTION_SERVER_UTILS_H_ +#include <stddef.h> #include <string> #ifndef ARRAYSIZE Index: chromium-72.0.3626.53/third_party/webrtc/examples/relayserver/relayserver_main.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/examples/relayserver/relayserver_main.cc +++ chromium-72.0.3626.53/third_party/webrtc/examples/relayserver/relayserver_main.cc @@ -12,6 +12,9 @@ #include <memory> #include "p2p/base/relayserver.h" +#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/socketserver.h" #include "rtc_base/thread.h" int main(int argc, char** argv) { Index: chromium-72.0.3626.53/third_party/webrtc/examples/stunprober/main.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/examples/stunprober/main.cc +++ chromium-72.0.3626.53/third_party/webrtc/examples/stunprober/main.cc @@ -8,25 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include <map> #include <memory> +#include <set> #include <sstream> +#include <string> +#include <vector> #include "p2p/base/basicpacketsocketfactory.h" #include "p2p/stunprober/stunprober.h" -#include "rtc_base/checks.h" #include "rtc_base/flags.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" -#include "rtc_base/nethelpers.h" #include "rtc_base/network.h" +#include "rtc_base/socketaddress.h" #include "rtc_base/ssladapter.h" -#include "rtc_base/strings/string_builder.h" -#include "rtc_base/stringutils.h" #include "rtc_base/thread.h" #include "rtc_base/timeutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/examples/stunserver/stunserver_main.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/examples/stunserver/stunserver_main.cc +++ chromium-72.0.3626.53/third_party/webrtc/examples/stunserver/stunserver_main.cc @@ -7,14 +7,12 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ - -#if defined(WEBRTC_POSIX) -#include <errno.h> -#endif // WEBRTC_POSIX - #include <iostream> #include "p2p/base/stunserver.h" +#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/socketserver.h" #include "rtc_base/thread.h" using cricket::StunServer; Index: chromium-72.0.3626.53/third_party/webrtc/examples/turnserver/read_auth_file.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/examples/turnserver/read_auth_file.cc +++ chromium-72.0.3626.53/third_party/webrtc/examples/turnserver/read_auth_file.cc @@ -9,6 +9,9 @@ */ #include "examples/turnserver/read_auth_file.h" + +#include <stddef.h> + #include "rtc_base/stringencode.h" namespace webrtc_examples { Index: chromium-72.0.3626.53/third_party/webrtc/examples/turnserver/turnserver_main.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/examples/turnserver/turnserver_main.cc +++ chromium-72.0.3626.53/third_party/webrtc/examples/turnserver/turnserver_main.cc @@ -12,12 +12,16 @@ #include <iostream> #include <map> #include <string> +#include <utility> #include "examples/turnserver/read_auth_file.h" #include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/portinterface.h" #include "p2p/base/turnserver.h" #include "rtc_base/asyncudpsocket.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/ipaddress.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/socketserver.h" #include "rtc_base/thread.h" namespace { Index: chromium-72.0.3626.53/third_party/webrtc/logging/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/logging/BUILD.gn @@ -173,6 +173,8 @@ rtc_static_library("rtc_event_log_impl_e defines = [] deps = [ + "../api:libjingle_peerconnection_api", + "../api/transport:network_control", "../rtc_base:checks", "../rtc_base:rtc_base_approved", "//third_party/abseil-cpp/absl/memory", @@ -346,6 +348,7 @@ if (rtc_enable_protobuf) { ":rtc_event_rtp_rtcp", ":rtc_event_video", ":rtc_stream_config", + "../api:array_view", "../api:libjingle_peerconnection_api", "../call", "../call:call_interfaces", @@ -355,6 +358,7 @@ if (rtc_enable_protobuf) { "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_tests_utils", + "../system_wrappers:system_wrappers", "../test:fileutils", "../test:test_support", "//testing/gtest", @@ -375,13 +379,15 @@ if (rtc_enable_protobuf) { deps = [ ":rtc_event_log_api", ":rtc_event_log_parser", + "../api:array_view", + "../api:libjingle_peerconnection_api", "../modules/rtp_rtcp", "../modules/rtp_rtcp:rtp_rtcp_format", "../rtc_base:checks", "../rtc_base:protobuf_utils", "../rtc_base:rtc_base_approved", "../test:rtp_test_utils", - "//third_party/abseil-cpp/absl/memory:memory", + "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/types:optional", ] if (!build_with_chromium && is_clang) { Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/DEPS =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/DEPS +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/DEPS @@ -4,4 +4,5 @@ include_rules = [ "+modules/congestion_controller", "+modules/remote_bitrate_estimator/include", "+modules/rtp_rtcp", + "+system_wrappers", ] Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/encoder/blob_encoding.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/encoder/blob_encoding.cc +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/encoder/blob_encoding.cc @@ -10,9 +10,10 @@ #include "logging/rtc_event_log/encoder/blob_encoding.h" -#include <algorithm> +#include <cstdint> #include "logging/rtc_event_log/encoder/varint.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/encoder/blob_encoding.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/encoder/blob_encoding.h +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/encoder/blob_encoding.h @@ -11,6 +11,7 @@ #ifndef LOGGING_RTC_EVENT_LOG_ENCODER_BLOB_ENCODING_H_ #define LOGGING_RTC_EVENT_LOG_ENCODER_BLOB_ENCODING_H_ +#include <stddef.h> #include <string> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/encoder/delta_encoding.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/encoder/delta_encoding.h +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/encoder/delta_encoding.h @@ -11,6 +11,8 @@ #ifndef LOGGING_RTC_EVENT_LOG_ENCODER_DELTA_ENCODING_H_ #define LOGGING_RTC_EVENT_LOG_ENCODER_DELTA_ENCODING_H_ +#include <stddef.h> +#include <stdint.h> #include <string> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/encoder/rtc_event_log_encoder_common_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/encoder/rtc_event_log_encoder_common_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/encoder/rtc_event_log_encoder_common_unittest.cc @@ -10,6 +10,7 @@ #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_common.h" +#include <cstdint> #include <limits> #include <type_traits> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc @@ -10,6 +10,13 @@ #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.h" +#include <string.h> +#include <vector> + +#include "absl/types/optional.h" +#include "api/rtp_headers.h" +#include "api/rtpparameters.h" +#include "api/transport/network_types.h" #include "logging/rtc_event_log/events/rtc_event_alr_state.h" #include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h" #include "logging/rtc_event_log/events/rtc_event_audio_playout.h" Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/encoder/varint.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/encoder/varint.h +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/encoder/varint.h @@ -11,6 +11,8 @@ #ifndef LOGGING_RTC_EVENT_LOG_ENCODER_VARINT_H_ #define LOGGING_RTC_EVENT_LOG_ENCODER_VARINT_H_ +#include <stddef.h> +#include <stdint.h> #include <string> #include "absl/strings/string_view.h" Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h @@ -11,6 +11,7 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_ICE_CANDIDATE_PAIR_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_ICE_CANDIDATE_PAIR_H_ +#include <stdint.h> #include <memory> #include "logging/rtc_event_log/events/rtc_event.h" Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h @@ -11,6 +11,7 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_ICE_CANDIDATE_PAIR_CONFIG_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_ICE_CANDIDATE_PAIR_CONFIG_H_ +#include <stdint.h> #include <memory> #include "logging/rtc_event_log/events/rtc_event.h" Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/fake_rtc_event_log_factory.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/fake_rtc_event_log_factory.cc +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/fake_rtc_event_log_factory.cc @@ -10,8 +10,7 @@ #include "logging/rtc_event_log/fake_rtc_event_log_factory.h" -#include <utility> - +#include "logging/rtc_event_log/fake_rtc_event_log.h" #include "logging/rtc_event_log/rtc_event_log.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/output/rtc_event_log_output_file.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/output/rtc_event_log_output_file.h +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/output/rtc_event_log_output_file.h @@ -13,8 +13,6 @@ #include <stddef.h> #include <stdio.h> - -#include <memory> #include <string> #include "api/rtceventlogoutput.h" Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/output/rtc_event_log_output_file_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/output/rtc_event_log_output_file_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/output/rtc_event_log_output_file_unittest.cc @@ -11,6 +11,7 @@ #include "logging/rtc_event_log/output/rtc_event_log_output_file.h" #include <fstream> +#include <iterator> #include <memory> #include <string> Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc @@ -8,24 +8,27 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> #include <string.h> - #include <iostream> #include <memory> -#include <sstream> #include <string> +#include <utility> +#include <vector> #include "absl/memory/memory.h" #include "absl/types/optional.h" +#include "api/array_view.h" +#include "api/rtp_headers.h" #include "logging/rtc_event_log/rtc_event_log.h" #include "logging/rtc_event_log/rtc_event_log_parser_new.h" #include "logging/rtc_event_log/rtc_event_processor.h" -#include "modules/rtp_rtcp/source/byte_io.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "modules/rtp_rtcp/source/rtp_header_extensions.h" #include "modules/rtp_rtcp/source/rtp_packet.h" -#include "modules/rtp_rtcp/source/rtp_utility.h" #include "rtc_base/checks.h" #include "rtc_base/flags.h" +#include "test/rtp_file_reader.h" #include "test/rtp_file_writer.h" namespace { Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/rtc_event_log_factory.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/rtc_event_log_factory.h +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/rtc_event_log_factory.h @@ -13,6 +13,7 @@ #include <memory> +#include "logging/rtc_event_log/rtc_event_log.h" #include "logging/rtc_event_log/rtc_event_log_factory_interface.h" #include "rtc_base/task_queue.h" Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc @@ -11,8 +11,8 @@ #include "logging/rtc_event_log/rtc_event_log_unittest_helper.h" #include <string.h> // memcmp - -#include <algorithm> +#include <cmath> +#include <cstdint> #include <limits> #include <memory> #include <numeric> @@ -20,14 +20,21 @@ #include <utility> #include <vector> +#include "absl/memory/memory.h" #include "absl/types/optional.h" -#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "api/array_view.h" +#include "api/rtp_headers.h" +#include "api/rtpparameters.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.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" #include "modules/rtp_rtcp/source/rtp_header_extensions.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "rtc_base/buffer.h" #include "rtc_base/checks.h" +#include "system_wrappers/include/ntp_time.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.h +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.h @@ -11,9 +11,10 @@ #ifndef LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_UNITTEST_HELPER_H_ #define LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_UNITTEST_HELPER_H_ +#include <stddef.h> +#include <stdint.h> #include <memory> -#include "logging/rtc_event_log/events/rtc_event.h" #include "logging/rtc_event_log/events/rtc_event_alr_state.h" #include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h" #include "logging/rtc_event_log/events/rtc_event_audio_playout.h" @@ -34,9 +35,11 @@ #include "logging/rtc_event_log/events/rtc_event_video_send_stream_config.h" #include "logging/rtc_event_log/rtc_event_log_parser_new.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/rtcp_packet/receiver_report.h" #include "modules/rtp_rtcp/source/rtcp_packet/report_block.h" #include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "modules/rtp_rtcp/source/rtp_packet.h" #include "rtc_base/random.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/rtc_event_processor.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/rtc_event_processor.h +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/rtc_event_processor.h @@ -11,11 +11,13 @@ #ifndef LOGGING_RTC_EVENT_LOG_RTC_EVENT_PROCESSOR_H_ #define LOGGING_RTC_EVENT_LOG_RTC_EVENT_PROCESSOR_H_ +#include <stdint.h> #include <algorithm> #include <memory> #include <utility> #include <vector> +#include "rtc_base/checks.h" #include "rtc_base/function_view.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/rtc_event_processor_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/logging/rtc_event_log/rtc_event_processor_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/logging/rtc_event_log/rtc_event_processor_unittest.cc @@ -10,6 +10,8 @@ #include "logging/rtc_event_log/rtc_event_processor.h" +#include <stddef.h> +#include <cstdint> #include <initializer_list> #include <numeric> Index: chromium-72.0.3626.53/third_party/webrtc/media/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/media/BUILD.gn @@ -73,6 +73,7 @@ rtc_static_library("rtc_media_base") { defines = [] libs = [] deps = [ + "../api:array_view", "../api:audio_options_api", "../rtc_base:checks", "../rtc_base:rtc_base_approved", @@ -172,6 +173,7 @@ rtc_static_library("rtc_simulcast_encode ] deps = [ "../api/video:video_bitrate_allocation", + "../api/video:video_frame", "../api/video:video_frame_i420", "../api/video_codecs:video_codecs_api", "../modules/video_coding:video_codec_interface", @@ -200,7 +202,11 @@ rtc_static_library("rtc_vp8_encoder_simu ] deps = [ ":rtc_simulcast_encoder_adapter", + "../:webrtc_common", + "../api/video:video_bitrate_allocation", + "../api/video:video_frame", "../api/video_codecs:video_codecs_api", + "../modules/video_coding:video_codec_interface", ] if (!build_with_chromium && is_clang) { # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). @@ -217,6 +223,9 @@ rtc_static_library("rtc_internal_video_c ":rtc_h264_profile_id", ":rtc_simulcast_encoder_adapter", ":rtc_vp8_encoder_simulcast_proxy", + "../:webrtc_common", + "../api/video:encoded_image", + "../api/video:video_frame", "../modules/video_coding:video_codec_interface", "//third_party/abseil-cpp/absl/memory", ] @@ -278,8 +287,10 @@ rtc_static_library("rtc_audio_video") { defines = [] libs = [] deps = [ + "../api/video:video_bitrate_allocation", "../api/video:video_bitrate_allocator_factory", "../modules/audio_processing:api", + "../modules/audio_processing:gain_control_interface", "../modules/audio_processing/aec_dump:aec_dump", "../modules/video_coding:video_codec_interface", "../modules/video_coding:video_coding", @@ -446,6 +457,7 @@ if (rtc_include_tests) { ":rtc_audio_video", ":rtc_simulcast_encoder_adapter", "../api:libjingle_peerconnection_api", + "../api/video:encoded_image", "../api/video:video_frame_i420", "../call:video_stream_api", "../common_video:common_video", @@ -543,12 +555,17 @@ if (rtc_include_tests) { ":rtc_audio_video", ":rtc_constants", ":rtc_data", + "../:webrtc_common", "../api/test/video:function_video_factory", "../api/units:time_delta", "../api/video:video_frame_i420", "../modules/audio_processing:api", "../modules/audio_processing:mocks", "../modules/rtp_rtcp", + + # TODO(http://crbug.com/908819): Add this dependency when Chromium + # android templates stop to consider *_module to have a special meaning. + # "../modules/video_capture:video_capture_module", "../modules/video_coding:video_codec_interface", "../modules/video_coding:webrtc_vp8", "../pc:rtc_pc", @@ -558,6 +575,7 @@ if (rtc_include_tests) { "../rtc_base:rtc_base_tests_utils", "../rtc_base:rtc_task_queue", "../rtc_base:stringutils", + "../rtc_base/third_party/sigslot:sigslot", "../test:field_trial", "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/strings", Index: chromium-72.0.3626.53/third_party/webrtc/media/base/adaptedvideotracksource.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/adaptedvideotracksource.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/adaptedvideotracksource.cc @@ -11,6 +11,11 @@ #include "media/base/adaptedvideotracksource.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/scoped_ref_ptr.h" +#include "rtc_base/timeutils.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/adaptedvideotracksource.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/adaptedvideotracksource.h +++ chromium-72.0.3626.53/third_party/webrtc/media/base/adaptedvideotracksource.h @@ -11,10 +11,19 @@ #ifndef MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_ #define MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_ +#include <stdint.h> + +#include "absl/types/optional.h" #include "api/mediastreaminterface.h" #include "api/notifier.h" +#include "api/video/video_frame.h" +#include "api/video/video_sink_interface.h" +#include "api/video/video_source_interface.h" #include "media/base/videoadapter.h" #include "media/base/videobroadcaster.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" +#include "rtc_base/thread_checker.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/fakeframesource.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/fakeframesource.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/fakeframesource.cc @@ -11,7 +11,10 @@ #include "media/base/fakeframesource.h" #include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" #include "rtc_base/checks.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/timeutils.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/fakertp.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/fakertp.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/fakertp.cc @@ -8,10 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> +#include <string.h> #include <algorithm> #include "media/base/fakertp.h" -#include "rtc_base/gunit.h" +#include "rtc_base/checks.h" +#include "test/gtest.h" void CompareHeaderExtensions(const char* packet1, size_t packet1_size, Index: chromium-72.0.3626.53/third_party/webrtc/media/base/fakevideocapturer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/fakevideocapturer.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/fakevideocapturer.cc @@ -10,7 +10,15 @@ #include "media/base/fakevideocapturer.h" +#include <string.h> +#include <cstdint> + +#include "absl/memory/memory.h" +#include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" #include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/timeutils.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/fakevideorenderer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/fakevideorenderer.h +++ chromium-72.0.3626.53/third_party/webrtc/media/base/fakevideorenderer.h @@ -11,10 +11,14 @@ #ifndef MEDIA_BASE_FAKEVIDEORENDERER_H_ #define MEDIA_BASE_FAKEVIDEORENDERER_H_ +#include <stdint.h> + #include "api/video/video_frame.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" #include "api/video/video_sink_interface.h" #include "rtc_base/criticalsection.h" -#include "rtc_base/logging.h" +#include "rtc_base/scoped_ref_ptr.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/mediaconstants.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/mediaconstants.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/mediaconstants.cc @@ -10,8 +10,6 @@ #include "media/base/mediaconstants.h" -#include <string> - namespace cricket { const int kVideoCodecClockrate = 90000; Index: chromium-72.0.3626.53/third_party/webrtc/media/base/mediaconstants.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/mediaconstants.h +++ chromium-72.0.3626.53/third_party/webrtc/media/base/mediaconstants.h @@ -11,7 +11,7 @@ #ifndef MEDIA_BASE_MEDIACONSTANTS_H_ #define MEDIA_BASE_MEDIACONSTANTS_H_ -#include <string> +#include <stddef.h> #include "rtc_base/system/rtc_export.h" Index: chromium-72.0.3626.53/third_party/webrtc/media/base/mediaengine.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/mediaengine.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/mediaengine.cc @@ -10,9 +10,13 @@ #include "media/base/mediaengine.h" +#include <stddef.h> +#include <cstdint> +#include <string> #include <utility> #include "api/video/video_bitrate_allocation.h" +#include "rtc_base/checks.h" #include "rtc_base/stringencode.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/rtpdataengine_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/rtpdataengine_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/rtpdataengine_unittest.cc @@ -8,6 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <string.h> #include <memory> #include <string> @@ -16,9 +17,10 @@ #include "media/base/rtpdataengine.h" #include "media/base/rtputils.h" #include "rtc_base/copyonwritebuffer.h" -#include "rtc_base/gunit.h" -#include "rtc_base/helpers.h" -#include "rtc_base/ssladapter.h" +#include "rtc_base/fakeclock.h" +#include "rtc_base/third_party/sigslot/sigslot.h" +#include "rtc_base/timeutils.h" +#include "test/gtest.h" class FakeDataReceiver : public sigslot::has_slots<> { public: Index: chromium-72.0.3626.53/third_party/webrtc/media/base/rtputils.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/rtputils.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/rtputils.cc @@ -10,10 +10,14 @@ #include "media/base/rtputils.h" +#include <string.h> +#include <vector> + // PacketTimeUpdateParams is defined in asyncpacketsocket.h. // TODO(sergeyu): Find more appropriate place for PacketTimeUpdateParams. #include "media/base/turnutils.h" #include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/byteorder.h" #include "rtc_base/checks.h" #include "rtc_base/messagedigest.h" Index: chromium-72.0.3626.53/third_party/webrtc/media/base/rtputils_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/rtputils_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/rtputils_unittest.cc @@ -8,12 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <string.h> +#include <cstdint> #include <vector> #include "media/base/fakertp.h" #include "media/base/rtputils.h" #include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/gunit.h" +#include "test/gtest.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/streamparams.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/streamparams.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/streamparams.cc @@ -10,9 +10,10 @@ #include "media/base/streamparams.h" +#include <stdint.h> #include <list> -#include "rtc_base/checks.h" +#include "api/array_view.h" #include "rtc_base/strings/string_builder.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/streamparams.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/streamparams.h +++ chromium-72.0.3626.53/third_party/webrtc/media/base/streamparams.h @@ -26,10 +26,9 @@ #ifndef MEDIA_BASE_STREAMPARAMS_H_ #define MEDIA_BASE_STREAMPARAMS_H_ -#include <stdint.h> - +#include <stddef.h> #include <algorithm> -#include <set> +#include <cstdint> #include <string> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/media/base/streamparams_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/streamparams_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/streamparams_unittest.cc @@ -9,9 +9,12 @@ */ #include "media/base/streamparams.h" + +#include <stdint.h> + #include "media/base/testutils.h" #include "rtc_base/arraysize.h" -#include "rtc_base/gunit.h" +#include "test/gtest.h" static const uint32_t kSsrcs1[] = {1}; static const uint32_t kSsrcs2[] = {1, 2}; Index: chromium-72.0.3626.53/third_party/webrtc/media/base/testutils.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/testutils.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/testutils.cc @@ -10,10 +10,10 @@ #include "media/base/testutils.h" -#include <algorithm> -#include <memory> +#include <cstdint> #include "api/video/video_frame.h" +#include "api/video/video_source_interface.h" #include "media/base/videocapturer.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/turnutils.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/turnutils.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/turnutils.cc @@ -12,7 +12,6 @@ #include "p2p/base/stun.h" #include "rtc_base/byteorder.h" -#include "rtc_base/checks.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/turnutils_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/turnutils_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/turnutils_unittest.cc @@ -10,9 +10,7 @@ #include "media/base/turnutils.h" -#include <stddef.h> - -#include "rtc_base/gunit.h" +#include "test/gtest.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/videoadapter.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/videoadapter.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/videoadapter.cc @@ -17,11 +17,10 @@ #include <utility> #include "absl/types/optional.h" -#include "media/base/mediaconstants.h" #include "media/base/videocommon.h" -#include "rtc_base/arraysize.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" namespace { struct Fraction { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/videoadapter.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/videoadapter.h +++ chromium-72.0.3626.53/third_party/webrtc/media/base/videoadapter.h @@ -11,12 +11,14 @@ #ifndef MEDIA_BASE_VIDEOADAPTER_H_ #define MEDIA_BASE_VIDEOADAPTER_H_ +#include <stdint.h> #include <utility> #include "absl/types/optional.h" #include "media/base/videocommon.h" #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/videoadapter_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/videoadapter_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/videoadapter_unittest.cc @@ -8,19 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <limits.h> // For INT_MAX - #include <limits> #include <memory> -#include <string> #include <utility> #include "absl/memory/memory.h" +#include "api/video/video_frame.h" #include "media/base/fakeframesource.h" -#include "media/base/mediachannel.h" #include "media/base/videoadapter.h" -#include "rtc_base/gunit.h" -#include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" +#include "test/gtest.h" namespace cricket { namespace { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/videobroadcaster.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/videobroadcaster.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/videobroadcaster.cc @@ -10,9 +10,11 @@ #include "media/base/videobroadcaster.h" -#include <limits> +#include <vector> +#include "absl/types/optional.h" #include "api/video/i420_buffer.h" +#include "api/video/video_rotation.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/media/base/videobroadcaster.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/videobroadcaster.h +++ chromium-72.0.3626.53/third_party/webrtc/media/base/videobroadcaster.h @@ -11,14 +11,12 @@ #ifndef MEDIA_BASE_VIDEOBROADCASTER_H_ #define MEDIA_BASE_VIDEOBROADCASTER_H_ -#include <memory> -#include <utility> -#include <vector> - -#include "api/video/video_frame.h" -#include "api/video/video_sink_interface.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_source_interface.h" #include "media/base/videosourcebase.h" #include "rtc_base/criticalsection.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/videobroadcaster_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/videobroadcaster_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/videobroadcaster_unittest.cc @@ -10,11 +10,13 @@ #include <limits> +#include "absl/types/optional.h" #include "api/video/i420_buffer.h" #include "api/video/video_frame.h" +#include "api/video/video_rotation.h" #include "media/base/fakevideorenderer.h" #include "media/base/videobroadcaster.h" -#include "rtc_base/gunit.h" +#include "test/gtest.h" using rtc::VideoBroadcaster; using rtc::VideoSinkWants; Index: chromium-72.0.3626.53/third_party/webrtc/media/base/videocapturer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/videocapturer.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/videocapturer.cc @@ -12,11 +12,16 @@ #include "media/base/videocapturer.h" -#include <algorithm> +#include <cstdint> #include "api/video/i420_buffer.h" #include "api/video/video_frame.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/timeutils.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/videocapturer_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/videocapturer_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/videocapturer_unittest.cc @@ -9,16 +9,17 @@ */ #include <stdio.h> - #include <memory> #include <vector> +#include "absl/types/optional.h" +#include "api/video/video_rotation.h" #include "media/base/fakevideocapturer.h" #include "media/base/fakevideorenderer.h" #include "media/base/videocapturer.h" #include "rtc_base/gunit.h" -#include "rtc_base/logging.h" #include "rtc_base/thread.h" +#include "test/gtest.h" using cricket::FakeVideoCapturerWithTaskQueue; Index: chromium-72.0.3626.53/third_party/webrtc/media/base/videocommon.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/videocommon.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/videocommon.cc @@ -10,9 +10,7 @@ #include "media/base/videocommon.h" -#include <limits.h> // For INT_MAX -#include <math.h> - +#include "api/array_view.h" #include "rtc_base/arraysize.h" #include "rtc_base/strings/string_builder.h" Index: chromium-72.0.3626.53/third_party/webrtc/media/base/videocommon_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/videocommon_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/videocommon_unittest.cc @@ -9,7 +9,8 @@ */ #include "media/base/videocommon.h" -#include "rtc_base/gunit.h" + +#include "test/gtest.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/videosourcebase.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/videosourcebase.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/videosourcebase.cc @@ -10,6 +10,8 @@ #include "media/base/videosourcebase.h" +#include <algorithm> + #include "rtc_base/checks.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/videosourcebase.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/videosourcebase.h +++ chromium-72.0.3626.53/third_party/webrtc/media/base/videosourcebase.h @@ -14,6 +14,7 @@ #include <vector> #include "api/video/video_frame.h" +#include "api/video/video_sink_interface.h" #include "api/video/video_source_interface.h" #include "rtc_base/thread_checker.h" Index: chromium-72.0.3626.53/third_party/webrtc/media/base/vp9_profile.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/vp9_profile.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/base/vp9_profile.cc @@ -10,6 +10,9 @@ #include "media/base/vp9_profile.h" +#include <map> +#include <utility> + #include "rtc_base/string_to_number.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/media/base/vp9_profile.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/base/vp9_profile.h +++ chromium-72.0.3626.53/third_party/webrtc/media/base/vp9_profile.h @@ -11,7 +11,6 @@ #ifndef MEDIA_BASE_VP9_PROFILE_H_ #define MEDIA_BASE_VP9_PROFILE_H_ -#include <map> #include <string> #include "absl/types/optional.h" Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/adm_helpers.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/adm_helpers.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/adm_helpers.cc @@ -11,6 +11,7 @@ #include "media/engine/adm_helpers.h" #include "modules/audio_device/include/audio_device.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/apm_helpers.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/apm_helpers.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/apm_helpers.cc @@ -10,8 +10,9 @@ #include "media/engine/apm_helpers.h" -#include "modules/audio_device/include/audio_device.h" #include "modules/audio_processing/include/audio_processing.h" +#include "modules/audio_processing/include/gain_control.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/convert_legacy_video_factory.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/convert_legacy_video_factory.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/convert_legacy_video_factory.cc @@ -16,11 +16,16 @@ #include "absl/memory/memory.h" #include "absl/strings/match.h" +#include "api/video_codecs/sdp_video_format.h" +#include "api/video_codecs/video_codec.h" +#include "api/video_codecs/video_decoder.h" #include "api/video_codecs/video_decoder_factory.h" #include "api/video_codecs/video_decoder_software_fallback_wrapper.h" +#include "api/video_codecs/video_encoder.h" #include "api/video_codecs/video_encoder_factory.h" #include "api/video_codecs/video_encoder_software_fallback_wrapper.h" -#include "media/base/h264_profile_level_id.h" +#include "media/base/codec.h" +#include "media/base/mediaconstants.h" #include "media/engine/internaldecoderfactory.h" #include "media/engine/internalencoderfactory.h" #include "media/engine/scopedvideodecoder.h" Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/fakewebrtcvideoengine.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/fakewebrtcvideoengine.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/fakewebrtcvideoengine.cc @@ -10,14 +10,15 @@ #include "media/engine/fakewebrtcvideoengine.h" +#include <algorithm> + +#include "absl/memory/memory.h" #include "absl/strings/match.h" #include "media/base/codec.h" +#include "media/base/mediaconstants.h" #include "media/engine/simulcast_encoder_adapter.h" -#include "media/engine/webrtcvideodecoderfactory.h" -#include "media/engine/webrtcvideoencoderfactory.h" #include "modules/video_coding/include/video_error_codes.h" -#include "rtc_base/gunit.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/timeutils.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/fakewebrtcvideoengine.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/fakewebrtcvideoengine.h +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/fakewebrtcvideoengine.h @@ -11,15 +11,23 @@ #ifndef MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_ #define MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_ +#include <stddef.h> +#include <stdint.h> #include <memory> #include <string> #include <vector> -#include "absl/memory/memory.h" +#include "api/video/encoded_image.h" +#include "api/video/video_bitrate_allocation.h" +#include "api/video/video_frame.h" +#include "api/video_codecs/sdp_video_format.h" +#include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_decoder.h" #include "api/video_codecs/video_decoder_factory.h" #include "api/video_codecs/video_encoder.h" #include "api/video_codecs/video_encoder_factory.h" +#include "common_types.h" // NOLINT(build/include) +#include "modules/video_coding/include/video_codec_interface.h" #include "rtc_base/criticalsection.h" #include "rtc_base/event.h" #include "rtc_base/thread_annotations.h" Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/internaldecoderfactory.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/internaldecoderfactory.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/internaldecoderfactory.cc @@ -12,6 +12,7 @@ #include "absl/strings/match.h" #include "api/video_codecs/sdp_video_format.h" +#include "media/base/codec.h" #include "media/base/mediaconstants.h" #include "modules/video_coding/codecs/h264/include/h264.h" #include "modules/video_coding/codecs/vp8/include/vp8.h" Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/internaldecoderfactory.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/internaldecoderfactory.h +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/internaldecoderfactory.h @@ -14,6 +14,8 @@ #include <memory> #include <vector> +#include "api/video_codecs/sdp_video_format.h" +#include "api/video_codecs/video_decoder.h" #include "api/video_codecs/video_decoder_factory.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/internalencoderfactory.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/internalencoderfactory.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/internalencoderfactory.cc @@ -10,10 +10,12 @@ #include "media/engine/internalencoderfactory.h" -#include <utility> +#include <string> #include "absl/strings/match.h" #include "api/video_codecs/sdp_video_format.h" +#include "media/base/codec.h" +#include "media/base/mediaconstants.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" Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/internalencoderfactory.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/internalencoderfactory.h +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/internalencoderfactory.h @@ -14,6 +14,8 @@ #include <memory> #include <vector> +#include "api/video_codecs/sdp_video_format.h" +#include "api/video_codecs/video_encoder.h" #include "api/video_codecs/video_encoder_factory.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/multiplexcodecfactory.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/multiplexcodecfactory.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/multiplexcodecfactory.cc @@ -10,6 +10,8 @@ #include "media/engine/multiplexcodecfactory.h" +#include <map> +#include <string> #include <utility> #include "absl/strings/match.h" Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/multiplexcodecfactory.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/multiplexcodecfactory.h +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/multiplexcodecfactory.h @@ -14,7 +14,10 @@ #include <memory> #include <vector> +#include "api/video_codecs/sdp_video_format.h" +#include "api/video_codecs/video_decoder.h" #include "api/video_codecs/video_decoder_factory.h" +#include "api/video_codecs/video_encoder.h" #include "api/video_codecs/video_encoder_factory.h" #include "rtc_base/system/rtc_export.h" Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/payload_type_mapper_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/payload_type_mapper_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/payload_type_mapper_unittest.cc @@ -11,6 +11,8 @@ #include <set> #include <string> +#include "absl/strings/string_view.h" +#include "media/base/mediaconstants.h" #include "media/engine/payload_type_mapper.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/scopedvideodecoder.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/scopedvideodecoder.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/scopedvideodecoder.cc @@ -10,8 +10,10 @@ #include "media/engine/scopedvideodecoder.h" -#include <vector> +#include <stdint.h> +#include "api/video/encoded_image.h" +#include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_decoder.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/scopedvideodecoder.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/scopedvideodecoder.h +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/scopedvideodecoder.h @@ -13,6 +13,8 @@ #include <memory> +#include "api/video_codecs/video_decoder.h" +#include "media/base/codec.h" #include "media/engine/webrtcvideodecoderfactory.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/scopedvideoencoder.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/scopedvideoencoder.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/scopedvideoencoder.cc @@ -10,10 +10,15 @@ #include "media/engine/scopedvideoencoder.h" +#include <stddef.h> +#include <stdint.h> #include <vector> #include "api/video/video_bitrate_allocation.h" +#include "api/video/video_frame.h" +#include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_encoder.h" +#include "common_types.h" // NOLINT(build/include) namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/scopedvideoencoder.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/scopedvideoencoder.h +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/scopedvideoencoder.h @@ -13,6 +13,8 @@ #include <memory> +#include "api/video_codecs/video_encoder.h" +#include "media/base/codec.h" #include "media/engine/webrtcvideoencoderfactory.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/simulcast.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/simulcast.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/simulcast.cc @@ -8,16 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> #include <stdio.h> #include <algorithm> #include <string> +#include "absl/types/optional.h" +#include "api/video/video_bitrate_allocation.h" #include "media/base/mediaconstants.h" -#include "media/base/streamparams.h" #include "media/engine/constants.h" #include "media/engine/simulcast.h" #include "modules/video_coding/utility/simulcast_rate_allocator.h" #include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" #include "rtc_base/experiments/normalize_simulcast_size_experiment.h" #include "rtc_base/logging.h" #include "system_wrappers/include/field_trial.h" Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/simulcast.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/simulcast.h +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/simulcast.h @@ -11,6 +11,7 @@ #ifndef MEDIA_ENGINE_SIMULCAST_H_ #define MEDIA_ENGINE_SIMULCAST_H_ +#include <stddef.h> #include <vector> #include "api/video_codecs/video_encoder_config.h" Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/simulcast_encoder_adapter.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/simulcast_encoder_adapter.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/simulcast_encoder_adapter.cc @@ -10,17 +10,23 @@ #include "media/engine/simulcast_encoder_adapter.h" +#include <stdio.h> +#include <string.h> #include <algorithm> +#include <cstdint> #include <string> #include <utility> #include "api/video/i420_buffer.h" #include "api/video/video_bitrate_allocation.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" #include "api/video_codecs/video_encoder_factory.h" +#include "modules/video_coding/include/video_error_codes.h" #include "modules/video_coding/utility/simulcast_rate_allocator.h" +#include "rtc_base/atomicops.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" -#include "system_wrappers/include/clock.h" +#include "rtc_base/scoped_ref_ptr.h" #include "system_wrappers/include/field_trial.h" #include "third_party/libyuv/include/libyuv/scale.h" Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/vp8_encoder_simulcast_proxy.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/vp8_encoder_simulcast_proxy.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/vp8_encoder_simulcast_proxy.cc @@ -11,6 +11,7 @@ #include "media/engine/vp8_encoder_simulcast_proxy.h" #include "media/engine/simulcast_encoder_adapter.h" +#include "modules/video_coding/include/video_error_codes.h" namespace webrtc { VP8EncoderSimulcastProxy::VP8EncoderSimulcastProxy(VideoEncoderFactory* factory, Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/vp8_encoder_simulcast_proxy.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/vp8_encoder_simulcast_proxy.h +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/vp8_encoder_simulcast_proxy.h @@ -12,12 +12,19 @@ #ifndef MEDIA_ENGINE_VP8_ENCODER_SIMULCAST_PROXY_H_ #define MEDIA_ENGINE_VP8_ENCODER_SIMULCAST_PROXY_H_ +#include <stddef.h> +#include <stdint.h> #include <memory> #include <vector> +#include "api/video/video_bitrate_allocation.h" +#include "api/video/video_frame.h" #include "api/video_codecs/sdp_video_format.h" +#include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_encoder.h" #include "api/video_codecs/video_encoder_factory.h" +#include "common_types.h" // NOLINT(build/include) +#include "modules/video_coding/include/video_codec_interface.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/webrtcvideocapturer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/webrtcvideocapturer.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/webrtcvideocapturer.cc @@ -10,17 +10,19 @@ #include "media/engine/webrtcvideocapturer.h" +#include <stddef.h> +#include <cstdint> +#include <string> + +#include "common_types.h" // NOLINT(build/include) +#include "modules/video_capture/video_capture_defines.h" +#include "modules/video_capture/video_capture_factory.h" #include "rtc_base/arraysize.h" -#include "rtc_base/bind.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" #include "rtc_base/logging.h" -#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/thread.h" #include "rtc_base/timeutils.h" -#include "modules/video_capture/video_capture_factory.h" - #if defined(WEBRTC_WIN) #include "rtc_base/win32.h" // Need this to #include the impl files. #endif // WEBRTC_WIN Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/webrtcvideocapturer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/webrtcvideocapturer.h +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/webrtcvideocapturer.h @@ -11,17 +11,19 @@ #ifndef MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_ #define MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_ +#include <stdint.h> #include <memory> -#include <string> #include <vector> -#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "api/video/video_frame.h" +#include "api/video/video_sink_interface.h" +#include "api/video/video_source_interface.h" #include "media/base/device.h" #include "media/base/videocapturer.h" +#include "media/base/videocommon.h" #include "modules/video_capture/video_capture.h" -#include "rtc_base/asyncinvoker.h" -#include "rtc_base/messagehandler.h" #include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/thread.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/webrtcvideocapturer_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/webrtcvideocapturer_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/webrtcvideocapturer_unittest.cc @@ -11,18 +11,21 @@ #ifdef HAVE_WEBRTC_VIDEO #include <stdio.h> - #include <memory> #include <vector> +#include "common_types.h" // NOLINT(build/include) #include "media/base/testutils.h" #include "media/base/videocommon.h" +#include "media/engine/fakewebrtcdeviceinfo.h" #include "media/engine/fakewebrtcvcmfactory.h" +#include "media/engine/fakewebrtcvideocapturemodule.h" #include "media/engine/webrtcvideocapturer.h" +// TODO(http://crbug.com/908819): Add this when Chromium android templates +// stop to consider *_module to have a special meaning. See media/BUILD.gn +// #include "modules/video_capture/video_capture_defines.h" #include "rtc_base/gunit.h" -#include "rtc_base/logging.h" -#include "rtc_base/stringutils.h" -#include "rtc_base/thread.h" +#include "test/gtest.h" using cricket::VideoFormat; Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/webrtcvideocapturerfactory.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/webrtcvideocapturerfactory.h +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/webrtcvideocapturerfactory.h @@ -14,6 +14,8 @@ #include <memory> +#include "media/base/device.h" +#include "media/base/videocapturer.h" #include "media/base/videocapturerfactory.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/engine/webrtcvideodecoderfactory.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/engine/webrtcvideodecoderfactory.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/engine/webrtcvideodecoderfactory.cc @@ -11,6 +11,7 @@ #include "media/engine/webrtcvideodecoderfactory.h" #include "api/video_codecs/video_codec.h" +#include "rtc_base/checks.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/media/sctp/sctptransport_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/media/sctp/sctptransport_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/media/sctp/sctptransport_unittest.cc @@ -8,23 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <errno.h> -#include <stdarg.h> #include <stdio.h> - +#include <string.h> +#include <algorithm> #include <memory> #include <string> #include <vector> #include "media/sctp/sctptransport.h" #include "p2p/base/fakedtlstransport.h" -#include "rtc_base/bind.h" #include "rtc_base/copyonwritebuffer.h" -#include "rtc_base/criticalsection.h" #include "rtc_base/gunit.h" -#include "rtc_base/helpers.h" -#include "rtc_base/ssladapter.h" +#include "rtc_base/logging.h" +#include "rtc_base/messagequeue.h" #include "rtc_base/thread.h" +#include "test/gtest.h" namespace { static const int kDefaultTimeout = 10000; // 10 seconds. Index: chromium-72.0.3626.53/third_party/webrtc/modules/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/modules/BUILD.gn @@ -236,6 +236,7 @@ if (rtc_include_tests) { deps = [ ":module_api", + ":module_api_public", "../test:test_main", "../test:test_support", "audio_coding:audio_coding_unittests", Index: chromium-72.0.3626.53/third_party/webrtc/modules/audio_coding/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/audio_coding/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/modules/audio_coding/BUILD.gn @@ -2090,6 +2090,7 @@ if (rtc_include_tests) { ":webrtc_cng", ":webrtc_opus", "..:module_api", + "..:module_api_public", "../..:webrtc_common", "../../api/audio:audio_frame_api", "../../api/audio_codecs:audio_codecs_api", Index: chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/audio_frame_manipulator.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/audio_mixer/audio_frame_manipulator.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/audio_frame_manipulator.h @@ -11,6 +11,9 @@ #ifndef MODULES_AUDIO_MIXER_AUDIO_FRAME_MANIPULATOR_H_ #define MODULES_AUDIO_MIXER_AUDIO_FRAME_MANIPULATOR_H_ +#include <stddef.h> +#include <stdint.h> + #include "api/audio/audio_frame.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/audio_mixer_impl.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/audio_mixer/audio_mixer_impl.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/audio_mixer_impl.cc @@ -10,13 +10,15 @@ #include "modules/audio_mixer/audio_mixer_impl.h" +#include <stdint.h> #include <algorithm> -#include <functional> #include <iterator> +#include <type_traits> #include <utility> #include "modules/audio_mixer/audio_frame_manipulator.h" #include "modules/audio_mixer/default_output_rate_calculator.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/refcountedobject.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/audio_mixer_impl.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/audio_mixer/audio_mixer_impl.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/audio_mixer_impl.h @@ -11,12 +11,15 @@ #ifndef MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_ #define MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_ +#include <stddef.h> #include <memory> #include <vector> +#include "api/audio/audio_frame.h" #include "api/audio/audio_mixer.h" #include "modules/audio_mixer/frame_combiner.h" #include "modules/audio_mixer/output_rate_calculator.h" +#include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" #include "rtc_base/race_checker.h" #include "rtc_base/scoped_ref_ptr.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/default_output_rate_calculator.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/audio_mixer/default_output_rate_calculator.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/default_output_rate_calculator.cc @@ -11,8 +11,10 @@ #include "modules/audio_mixer/default_output_rate_calculator.h" #include <algorithm> +#include <iterator> #include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/checks.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/frame_combiner.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/audio_mixer/frame_combiner.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/frame_combiner.cc @@ -12,18 +12,19 @@ #include <algorithm> #include <array> -#include <functional> +#include <cstdint> +#include <iterator> +#include <string> #include "api/array_view.h" -#include "audio/utility/audio_frame_operations.h" #include "common_audio/include/audio_util.h" #include "modules/audio_mixer/audio_frame_manipulator.h" #include "modules/audio_mixer/audio_mixer_impl.h" +#include "modules/audio_processing/include/audio_frame_view.h" #include "modules/audio_processing/include/audio_processing.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" #include "system_wrappers/include/metrics.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/frame_combiner_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/audio_mixer/frame_combiner_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/frame_combiner_unittest.cc @@ -10,9 +10,13 @@ #include "modules/audio_mixer/frame_combiner.h" +#include <cstdint> +#include <initializer_list> #include <numeric> #include <string> +#include <type_traits> +#include "api/array_view.h" #include "audio/utility/audio_frame_operations.h" #include "modules/audio_mixer/gain_change_calculator.h" #include "modules/audio_mixer/sine_wave_generator.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/gain_change_calculator.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/audio_mixer/gain_change_calculator.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/gain_change_calculator.cc @@ -11,8 +11,11 @@ #include "modules/audio_mixer/gain_change_calculator.h" #include <math.h> +#include <cstdlib> #include <vector> +#include "rtc_base/checks.h" + namespace webrtc { namespace { Index: chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/gain_change_calculator.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/audio_mixer/gain_change_calculator.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/gain_change_calculator.h @@ -11,6 +11,8 @@ #ifndef MODULES_AUDIO_MIXER_GAIN_CHANGE_CALCULATOR_H_ #define MODULES_AUDIO_MIXER_GAIN_CHANGE_CALCULATOR_H_ +#include <stdint.h> + #include "api/array_view.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/sine_wave_generator.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/audio_mixer/sine_wave_generator.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/sine_wave_generator.cc @@ -11,6 +11,7 @@ #include "modules/audio_mixer/sine_wave_generator.h" #include <math.h> +#include <stddef.h> #include "rtc_base/numerics/safe_conversions.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/sine_wave_generator.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/audio_mixer/sine_wave_generator.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/audio_mixer/sine_wave_generator.h @@ -11,6 +11,8 @@ #ifndef MODULES_AUDIO_MIXER_SINE_WAVE_GENERATOR_H_ #define MODULES_AUDIO_MIXER_SINE_WAVE_GENERATOR_H_ +#include <stdint.h> + #include "api/audio/audio_frame.h" #include "rtc_base/checks.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/bitrate_controller/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/bitrate_controller/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/modules/bitrate_controller/BUILD.gn @@ -80,10 +80,14 @@ if (rtc_include_tests) { "../../logging:mocks", "../../logging:rtc_event_bwe", "../../logging:rtc_event_log_api", + "../../system_wrappers:system_wrappers", "../../test:field_trial", "../../test:test_support", + "../congestion_controller/goog_cc:delay_based_bwe", "../pacing:mock_paced_sender", + "../pacing:pacing", "../remote_bitrate_estimator:remote_bitrate_estimator", + "../rtp_rtcp:rtp_rtcp_format", ] if (!build_with_chromium && is_clang) { # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). Index: chromium-72.0.3626.53/third_party/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc @@ -8,14 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <algorithm> -#include <vector> +#include <stdint.h> +#include <memory> #include "logging/rtc_event_log/mock/mock_rtc_event_log.h" #include "modules/bitrate_controller/include/bitrate_controller.h" -#include "modules/pacing/mock/mock_paced_sender.h" +#include "modules/congestion_controller/goog_cc/delay_based_bwe.h" +#include "modules/pacing/paced_sender.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "system_wrappers/include/clock.h" #include "test/field_trial.h" +#include "test/gmock.h" #include "test/gtest.h" using ::testing::Exactly; Index: chromium-72.0.3626.53/third_party/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc @@ -8,12 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <algorithm> -#include <vector> - +#include "modules/bitrate_controller/send_side_bandwidth_estimation.h" +#include "logging/rtc_event_log/events/rtc_event.h" #include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h" #include "logging/rtc_event_log/mock/mock_rtc_event_log.h" -#include "modules/bitrate_controller/send_side_bandwidth_estimation.h" +#include "test/gmock.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/BUILD.gn @@ -38,6 +38,8 @@ rtc_static_library("congestion_controlle "..:module_api", "../..:webrtc_common", "../../api/transport:network_control", + "../../api/units:data_rate", + "../../api/units:timestamp", "../../rtc_base:checks", "../../rtc_base:ptr_util", "../../rtc_base:rate_limiter", @@ -53,6 +55,7 @@ rtc_static_library("congestion_controlle "goog_cc:probe_controller", "goog_cc:pushback_controller", "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/types:optional", ] if (!build_with_mozilla) { @@ -69,6 +72,7 @@ rtc_static_library("transport_feedback") deps = [ "../../api/transport:network_control", + "../../api/units:data_size", "../../modules:module_api", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", @@ -91,7 +95,12 @@ if (rtc_include_tests) { } deps = [ "../../api/transport:network_control", + "../../api/units:data_rate", + "../../api/units:data_size", + "../../api/units:time_delta", + "../../api/units:timestamp", "../../rtc_base:checks", + "//third_party/abseil-cpp/absl/types:optional", ] } rtc_source_set("congestion_controller_unittests") { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/bbr/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/BUILD.gn @@ -16,6 +16,7 @@ rtc_static_library("bbr") { deps = [ ":bbr_controller", "../../../api/transport:network_control", + "../../../api/units:time_delta", "../../../rtc_base:rtc_base_approved", "//third_party/abseil-cpp/absl/memory", ] @@ -104,6 +105,7 @@ rtc_source_set("rtt_stats") { deps = [ "../../../api/units:time_delta", "../../../api/units:timestamp", + "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", ] } @@ -124,6 +126,9 @@ if (rtc_include_tests) { ":bbr", ":bbr_controller", "..:test_controller_printer", + "../../../api/transport:network_control", + "../../../api/units:timestamp", + "../../../rtc_base:checks", ] } rtc_source_set("bbr_unittests") { @@ -150,6 +155,7 @@ if (rtc_include_tests) { "../../../api/units:data_rate", "../../../api/units:time_delta", "../../../api/units:timestamp", + "../../../rtc_base:logging", "../../../test:test_support", ] if (!build_with_chromium && is_clang) { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/bandwidth_sampler_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/bbr/bandwidth_sampler_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/bandwidth_sampler_unittest.cc @@ -9,10 +9,9 @@ */ // Based on the Quic implementation in Chromium. -#include <algorithm> +#include <stddef.h> #include "modules/congestion_controller/bbr/bandwidth_sampler.h" - #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/bbr_factory.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/bbr/bbr_factory.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/bbr_factory.h @@ -14,6 +14,7 @@ #include <memory> #include "api/transport/network_control.h" +#include "api/units/time_delta.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/data_transfer_tracker.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/bbr/data_transfer_tracker.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/data_transfer_tracker.cc @@ -11,7 +11,6 @@ #include "modules/congestion_controller/bbr/data_transfer_tracker.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" namespace webrtc { namespace bbr { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/data_transfer_tracker_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/bbr/data_transfer_tracker_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/data_transfer_tracker_unittest.cc @@ -9,6 +9,9 @@ */ #include "modules/congestion_controller/bbr/data_transfer_tracker.h" + +#include <stdint.h> + #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/loss_rate_filter.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/bbr/loss_rate_filter.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/loss_rate_filter.h @@ -10,7 +10,7 @@ #ifndef MODULES_CONGESTION_CONTROLLER_BBR_LOSS_RATE_FILTER_H_ #define MODULES_CONGESTION_CONTROLLER_BBR_LOSS_RATE_FILTER_H_ -#include "absl/types/optional.h" +#include <stdint.h> namespace webrtc { namespace bbr { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/loss_rate_filter_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/bbr/loss_rate_filter_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/loss_rate_filter_unittest.cc @@ -8,6 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ #include "modules/congestion_controller/bbr/loss_rate_filter.h" + +#include "api/units/time_delta.h" #include "api/units/timestamp.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/packet_number_indexed_queue.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/bbr/packet_number_indexed_queue.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/packet_number_indexed_queue.h @@ -13,8 +13,10 @@ #ifndef MODULES_CONGESTION_CONTROLLER_BBR_PACKET_NUMBER_INDEXED_QUEUE_H_ #define MODULES_CONGESTION_CONTROLLER_BBR_PACKET_NUMBER_INDEXED_QUEUE_H_ +#include <stddef.h> #include <stdint.h> #include <deque> +#include <type_traits> #include <utility> #include "rtc_base/checks.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/packet_number_indexed_queue_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/bbr/packet_number_indexed_queue_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/packet_number_indexed_queue_unittest.cc @@ -10,8 +10,6 @@ #include "modules/congestion_controller/bbr/packet_number_indexed_queue.h" -#include <limits> -#include <map> #include <string> #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/rtt_stats.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/bbr/rtt_stats.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/rtt_stats.cc @@ -10,7 +10,9 @@ #include "modules/congestion_controller/bbr/rtt_stats.h" -#include <cstdlib> +#include <algorithm> +#include <string> +#include <type_traits> #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/rtt_stats.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/bbr/rtt_stats.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/rtt_stats.h @@ -13,11 +13,9 @@ #ifndef MODULES_CONGESTION_CONTROLLER_BBR_RTT_STATS_H_ #define MODULES_CONGESTION_CONTROLLER_BBR_RTT_STATS_H_ -#include <algorithm> -#include <cstdint> - #include "api/units/time_delta.h" #include "api/units/timestamp.h" +#include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/rtt_stats_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/bbr/rtt_stats_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/rtt_stats_unittest.cc @@ -10,6 +10,8 @@ #include "modules/congestion_controller/bbr/rtt_stats.h" +#include <stdlib.h> +#include <cmath> #include <vector> #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/test/bbr_printer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/bbr/test/bbr_printer.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/test/bbr_printer.cc @@ -9,6 +9,8 @@ */ #include "modules/congestion_controller/bbr/test/bbr_printer.h" +#include "rtc_base/checks.h" + namespace webrtc { BbrStatePrinter::BbrStatePrinter() = default; Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/test/bbr_printer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/bbr/test/bbr_printer.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/test/bbr_printer.h @@ -10,8 +10,12 @@ #ifndef MODULES_CONGESTION_CONTROLLER_BBR_TEST_BBR_PRINTER_H_ #define MODULES_CONGESTION_CONTROLLER_BBR_TEST_BBR_PRINTER_H_ +#include <stdio.h> #include <memory> +#include "api/transport/network_control.h" +#include "api/transport/network_types.h" +#include "api/units/timestamp.h" #include "modules/congestion_controller/bbr/bbr_factory.h" #include "modules/congestion_controller/bbr/bbr_network_controller.h" #include "modules/congestion_controller/test/controller_printer.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/windowed_filter_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/bbr/windowed_filter_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/bbr/windowed_filter_unittest.cc @@ -10,10 +10,13 @@ #include "modules/congestion_controller/bbr/windowed_filter.h" +#include <stdint.h> +#include <string> +#include <type_traits> + #include "api/units/data_rate.h" #include "api/units/time_delta.h" - -#include "modules/congestion_controller/bbr/rtt_stats.h" +#include "rtc_base/logging.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/goog_cc/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/BUILD.gn @@ -32,6 +32,10 @@ rtc_static_library("goog_cc") { "../..:module_api", "../../..:webrtc_common", "../../../api/transport:network_control", + "../../../api/units:data_rate", + "../../../api/units:data_size", + "../../../api/units:time_delta", + "../../../api/units:timestamp", "../../../logging:rtc_event_log_api", "../../../logging:rtc_event_pacing", "../../../rtc_base:checks", @@ -55,6 +59,7 @@ rtc_source_set("pushback_controller") { ] deps = [ "../../../api/transport:network_control", + "../../../api/units:data_size", "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", "../../../system_wrappers:field_trial", @@ -144,6 +149,9 @@ rtc_source_set("probe_controller") { deps = [ "../../../api/transport:network_control", + "../../../api/units:data_rate", + "../../../api/units:time_delta", + "../../../api/units:timestamp", "../../../logging:rtc_event_log_api", "../../../logging:rtc_event_pacing", "../../../rtc_base:checks", @@ -163,10 +171,18 @@ if (rtc_include_tests) { "test/goog_cc_printer.h", ] deps = [ + ":alr_detector", + ":delay_based_bwe", ":estimators", ":goog_cc", "..:test_controller_printer", "../../../api/transport:goog_cc", + "../../../api/transport:network_control", + "../../../api/units:timestamp", + "../../../logging:rtc_event_log_api", + "../../../rtc_base:checks", + "../../remote_bitrate_estimator:remote_bitrate_estimator", + "//third_party/abseil-cpp/absl/types:optional", ] } rtc_source_set("goog_cc_unittests") { @@ -198,6 +214,8 @@ if (rtc_include_tests) { "../../../api/transport:goog_cc", "../../../api/transport:network_control", "../../../api/transport:network_control_test", + "../../../api/units:data_rate", + "../../../api/units:timestamp", "../../../logging:mocks", "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.cc @@ -8,12 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <inttypes.h> +#include <stdio.h> #include <algorithm> #include <string> #include "modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h" #include "rtc_base/checks.h" -#include "rtc_base/format_macros.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h @@ -11,7 +11,11 @@ #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_CONGESTION_WINDOW_PUSHBACK_CONTROLLER_H_ #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_CONGESTION_WINDOW_PUSHBACK_CONTROLLER_H_ -#include "api/transport/network_types.h" +#include <stddef.h> +#include <stdint.h> + +#include "absl/types/optional.h" +#include "api/units/data_size.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc @@ -9,12 +9,11 @@ */ #include "modules/congestion_controller/goog_cc/delay_based_bwe.h" + +#include "api/transport/network_types.h" +#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" #include "modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h" -#include "modules/pacing/paced_sender.h" -#include "rtc_base/constructormagic.h" #include "system_wrappers/include/clock.h" -#include "system_wrappers/include/field_trial.h" -#include "test/field_trial.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc @@ -10,8 +10,7 @@ #include "modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h" #include <algorithm> -#include <limits> -#include <utility> +#include <cstdint> #include "absl/memory/memory.h" #include "modules/congestion_controller/goog_cc/delay_based_bwe.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h @@ -11,16 +11,17 @@ #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_UNITTEST_HELPER_H_ #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_UNITTEST_HELPER_H_ -#include <list> -#include <map> +#include <stddef.h> +#include <stdint.h> #include <memory> #include <string> -#include <utility> #include <vector> +#include "api/transport/network_types.h" #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" #include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "rtc_base/constructormagic.h" #include "system_wrappers/include/clock.h" #include "test/field_trial.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/goog_cc_network_control.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/goog_cc/goog_cc_network_control.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/goog_cc_network_control.cc @@ -10,25 +10,25 @@ #include "modules/congestion_controller/goog_cc/goog_cc_network_control.h" +#include <inttypes.h> +#include <stdio.h> #include <algorithm> -#include <functional> -#include <limits> +#include <cstdint> #include <memory> #include <numeric> #include <string> -#include <utility> #include <vector> #include "absl/memory/memory.h" +#include "api/units/time_delta.h" #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" #include "modules/congestion_controller/goog_cc/alr_detector.h" #include "modules/congestion_controller/goog_cc/probe_controller.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "rtc_base/checks.h" -#include "rtc_base/format_macros.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/goog_cc_network_control.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/goog_cc/goog_cc_network_control.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/goog_cc_network_control.h @@ -18,6 +18,10 @@ #include "absl/types/optional.h" #include "api/transport/network_control.h" +#include "api/transport/network_types.h" +#include "api/units/data_rate.h" +#include "api/units/data_size.h" +#include "api/units/timestamp.h" #include "logging/rtc_event_log/rtc_event_log.h" #include "modules/bitrate_controller/send_side_bandwidth_estimation.h" #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" @@ -26,6 +30,7 @@ #include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "modules/congestion_controller/goog_cc/probe_controller.h" #include "rtc_base/constructormagic.h" +#include "rtc_base/experiments/field_trial_parser.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc @@ -10,11 +10,9 @@ #include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h" -#include <utility> -#include <vector> +#include <stddef.h> -#include "modules/remote_bitrate_estimator/aimd_rate_control.h" -#include "test/gmock.h" +#include "api/transport/network_types.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/probe_controller.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/goog_cc/probe_controller.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/probe_controller.cc @@ -12,7 +12,12 @@ #include <algorithm> #include <initializer_list> +#include <string> +#include "api/units/data_rate.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "system_wrappers/include/field_trial.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/probe_controller_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/goog_cc/probe_controller_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/probe_controller_unittest.cc @@ -10,8 +10,9 @@ #include <memory> #include "api/transport/network_types.h" +#include "api/units/data_rate.h" +#include "api/units/timestamp.h" #include "modules/congestion_controller/goog_cc/probe_controller.h" -#include "rtc_base/logging.h" #include "system_wrappers/include/clock.h" #include "test/gmock.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/test/goog_cc_printer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/goog_cc/test/goog_cc_printer.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/test/goog_cc_printer.cc @@ -11,7 +11,12 @@ #include <math.h> +#include "absl/types/optional.h" +#include "modules/congestion_controller/goog_cc/alr_detector.h" +#include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "modules/congestion_controller/goog_cc/trendline_estimator.h" +#include "modules/remote_bitrate_estimator/aimd_rate_control.h" +#include "rtc_base/checks.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/test/goog_cc_printer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/goog_cc/test/goog_cc_printer.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/goog_cc/test/goog_cc_printer.h @@ -10,9 +10,14 @@ #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_TEST_GOOG_CC_PRINTER_H_ #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_TEST_GOOG_CC_PRINTER_H_ +#include <stdio.h> #include <memory> #include "api/transport/goog_cc_factory.h" +#include "api/transport/network_control.h" +#include "api/transport/network_types.h" +#include "api/units/timestamp.h" +#include "logging/rtc_event_log/rtc_event_log.h" #include "modules/congestion_controller/goog_cc/goog_cc_network_control.h" #include "modules/congestion_controller/test/controller_printer.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/include/send_side_congestion_controller_interface.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/include/send_side_congestion_controller_interface.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/include/send_side_congestion_controller_interface.h @@ -20,12 +20,9 @@ #include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "rtc_base/constructormagic.h" +#include "rtc_base/network/sent_packet.h" #include "rtc_base/networkroute.h" -namespace rtc { -struct SentPacket; -} - namespace webrtc { class BitrateController; Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/pcc/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/BUILD.gn @@ -16,8 +16,9 @@ rtc_static_library("pcc") { deps = [ ":pcc_controller", "../../../api/transport:network_control", + "../../../api/units:time_delta", "../../../rtc_base:rtc_base_approved", - "//third_party/abseil-cpp/absl/memory:memory", + "//third_party/abseil-cpp/absl/memory", ] } @@ -31,8 +32,14 @@ rtc_static_library("pcc_controller") { ":monitor_interval", ":rtt_tracker", "../../../api/transport:network_control", + "../../../api/units:data_rate", + "../../../api/units:data_size", + "../../../api/units:time_delta", + "../../../api/units:timestamp", + "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", - "//third_party/abseil-cpp/absl/memory:memory", + "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/types:optional", ] } @@ -43,6 +50,10 @@ rtc_static_library("monitor_interval") { ] deps = [ "../../../api/transport:network_control", + "../../../api/units:data_rate", + "../../../api/units:data_size", + "../../../api/units:time_delta", + "../../../api/units:timestamp", "../../../rtc_base:rtc_base_approved", ] } @@ -54,6 +65,8 @@ rtc_static_library("rtt_tracker") { ] deps = [ "../../../api/transport:network_control", + "../../../api/units:time_delta", + "../../../api/units:timestamp", "../../../rtc_base:rtc_base_approved", ] } @@ -66,6 +79,8 @@ rtc_static_library("utility_function") { deps = [ ":monitor_interval", "../../../api/transport:network_control", + "../../../api/units:data_rate", + "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", ] } @@ -79,8 +94,9 @@ rtc_static_library("bitrate_controller") ":monitor_interval", ":utility_function", "../../../api/transport:network_control", + "../../../api/units:data_rate", "../../../rtc_base:rtc_base_approved", - "//third_party/abseil-cpp/absl/memory:memory", + "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/types:optional", ] } @@ -102,13 +118,15 @@ if (rtc_include_tests) { ":pcc_controller", ":rtt_tracker", ":utility_function", + "../../../api/transport:network_control", "../../../api/transport:network_control_test", "../../../api/units:data_rate", + "../../../api/units:data_size", "../../../api/units:time_delta", "../../../api/units:timestamp", "../../../rtc_base:rtc_base_approved", "../../../test:test_support", - "//third_party/abseil-cpp/absl/memory:memory", + "//third_party/abseil-cpp/absl/memory", ] } } Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/bitrate_controller.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/pcc/bitrate_controller.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/bitrate_controller.cc @@ -9,10 +9,8 @@ */ #include <algorithm> -#include <array> #include <cmath> #include <cstdlib> -#include <string> #include <utility> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/bitrate_controller.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/pcc/bitrate_controller.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/bitrate_controller.h @@ -11,11 +11,12 @@ #ifndef MODULES_CONGESTION_CONTROLLER_PCC_BITRATE_CONTROLLER_H_ #define MODULES_CONGESTION_CONTROLLER_PCC_BITRATE_CONTROLLER_H_ +#include <stdint.h> #include <memory> #include <vector> -#include "api/transport/network_control.h" -#include "api/transport/network_types.h" +#include "absl/types/optional.h" +#include "api/units/data_rate.h" #include "modules/congestion_controller/pcc/monitor_interval.h" #include "modules/congestion_controller/pcc/utility_function.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/monitor_interval.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/pcc/monitor_interval.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/monitor_interval.cc @@ -9,6 +9,10 @@ */ #include "modules/congestion_controller/pcc/monitor_interval.h" + +#include <stddef.h> +#include <cmath> + #include "rtc_base/logging.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/monitor_interval.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/pcc/monitor_interval.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/monitor_interval.h @@ -13,8 +13,11 @@ #include <vector> -#include "api/transport/network_control.h" #include "api/transport/network_types.h" +#include "api/units/data_rate.h" +#include "api/units/data_size.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" namespace webrtc { namespace pcc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/monitor_interval_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/pcc/monitor_interval_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/monitor_interval_unittest.cc @@ -9,6 +9,9 @@ */ #include "modules/congestion_controller/pcc/monitor_interval.h" + +#include <stddef.h> + #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/pcc_factory.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/pcc/pcc_factory.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/pcc_factory.h @@ -14,6 +14,7 @@ #include <memory> #include "api/transport/network_control.h" +#include "api/units/time_delta.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/pcc_network_controller.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/pcc/pcc_network_controller.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/pcc_network_controller.cc @@ -10,8 +10,10 @@ #include <algorithm> -#include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/units/data_size.h" #include "modules/congestion_controller/pcc/pcc_network_controller.h" +#include "rtc_base/checks.h" namespace webrtc { namespace pcc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/pcc_network_controller.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/pcc/pcc_network_controller.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/pcc_network_controller.h @@ -11,11 +11,16 @@ #ifndef MODULES_CONGESTION_CONTROLLER_PCC_PCC_NETWORK_CONTROLLER_H_ #define MODULES_CONGESTION_CONTROLLER_PCC_PCC_NETWORK_CONTROLLER_H_ +#include <stddef.h> +#include <stdint.h> #include <deque> #include <vector> #include "api/transport/network_control.h" #include "api/transport/network_types.h" +#include "api/units/data_rate.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "modules/congestion_controller/pcc/bitrate_controller.h" #include "modules/congestion_controller/pcc/monitor_interval.h" #include "modules/congestion_controller/pcc/rtt_tracker.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/rtt_tracker.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/pcc/rtt_tracker.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/rtt_tracker.h @@ -13,8 +13,9 @@ #include <vector> -#include "api/transport/network_control.h" #include "api/transport/network_types.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" namespace webrtc { namespace pcc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/utility_function.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/pcc/utility_function.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/utility_function.cc @@ -12,7 +12,9 @@ #include <algorithm> #include <cmath> -#include <vector> + +#include "api/units/data_rate.h" +#include "rtc_base/checks.h" namespace webrtc { namespace pcc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/utility_function.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/pcc/utility_function.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/utility_function.h @@ -11,7 +11,6 @@ #ifndef MODULES_CONGESTION_CONTROLLER_PCC_UTILITY_FUNCTION_H_ #define MODULES_CONGESTION_CONTROLLER_PCC_UTILITY_FUNCTION_H_ -#include "api/transport/network_control.h" #include "modules/congestion_controller/pcc/monitor_interval.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/utility_function_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/pcc/utility_function_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/pcc/utility_function_unittest.cc @@ -8,8 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stddef.h> +#include <cmath> +#include <type_traits> #include <vector> +#include "api/transport/network_types.h" +#include "api/units/data_rate.h" +#include "api/units/data_size.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "modules/congestion_controller/pcc/utility_function.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/receive_side_congestion_controller.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/receive_side_congestion_controller.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/receive_side_congestion_controller.cc @@ -11,6 +11,7 @@ #include "modules/congestion_controller/include/receive_side_congestion_controller.h" #include "modules/pacing/packet_router.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" #include "modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h" #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/rtp/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/rtp/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/rtp/BUILD.gn @@ -72,6 +72,9 @@ rtc_source_set("control_handler") { deps = [ "../:congestion_controller", "../../../api/transport:network_control", + "../../../api/units:data_rate", + "../../../api/units:data_size", + "../../../api/units:time_delta", "../../../rtc_base:checks", "../../../rtc_base:rate_limiter", "../../../rtc_base:safe_minmax", @@ -83,6 +86,7 @@ rtc_source_set("control_handler") { "../../remote_bitrate_estimator", "../../rtp_rtcp:rtp_rtcp_format", "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/types:optional", ] if (!build_with_mozilla) { @@ -102,6 +106,7 @@ rtc_static_library("transport_feedback") "../..:module_api", "../../../api/transport:network_control", "../../../api/units:data_size", + "../../../api/units:timestamp", "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", "../../../rtc_base/network:sent_packet", Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/rtp/congestion_controller_unittests_helper.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/rtp/congestion_controller_unittests_helper.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/rtp/congestion_controller_unittests_helper.cc @@ -10,6 +10,9 @@ #include "modules/congestion_controller/rtp/congestion_controller_unittests_helper.h" +#include <stddef.h> +#include <stdint.h> + #include "rtc_base/checks.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/rtp/control_handler.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/rtp/control_handler.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/rtp/control_handler.cc @@ -10,8 +10,12 @@ #include "modules/congestion_controller/rtp/control_handler.h" -#include "rtc_base/checks.h" +#include <algorithm> +#include <vector> + +#include "api/units/data_rate.h" #include "rtc_base/logging.h" +#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/numerics/safe_minmax.h" #include "system_wrappers/include/field_trial.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/rtp/control_handler.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/rtp/control_handler.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/rtp/control_handler.h @@ -11,12 +11,15 @@ #ifndef MODULES_CONGESTION_CONTROLLER_RTP_CONTROL_HANDLER_H_ #define MODULES_CONGESTION_CONTROLLER_RTP_CONTROL_HANDLER_H_ -#include <algorithm> -#include <memory> +#include <stdint.h> -#include "api/transport/network_control.h" +#include "absl/types/optional.h" +#include "api/transport/network_types.h" +#include "api/units/data_size.h" +#include "api/units/time_delta.h" #include "modules/congestion_controller/include/network_changed_observer.h" #include "modules/pacing/paced_sender.h" +#include "rtc_base/constructormagic.h" #include "rtc_base/sequenced_task_checker.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/rtp/send_time_history_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/rtp/send_time_history_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/rtp/send_time_history_unittest.cc @@ -13,6 +13,7 @@ #include <random> #include <vector> +#include "api/transport/network_types.h" #include "modules/congestion_controller/rtp/send_time_history.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "system_wrappers/include/clock.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/rtp/transport_feedback_adapter.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/rtp/transport_feedback_adapter.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/rtp/transport_feedback_adapter.cc @@ -10,13 +10,15 @@ #include "modules/congestion_controller/rtp/transport_feedback_adapter.h" +#include <stdlib.h> #include <algorithm> +#include <cmath> +#include "api/units/timestamp.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/numerics/mod_ops.h" namespace webrtc { namespace { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/send_side_congestion_controller.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/send_side_congestion_controller.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/send_side_congestion_controller.cc @@ -10,23 +10,26 @@ #include "modules/congestion_controller/include/send_side_congestion_controller.h" +#include <inttypes.h> #include <algorithm> #include <cstdio> #include <iterator> #include <memory> +#include <string> #include <vector> #include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/units/data_rate.h" +#include "api/units/timestamp.h" #include "modules/bitrate_controller/include/bitrate_controller.h" #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" #include "modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h" #include "modules/congestion_controller/goog_cc/probe_controller.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "rtc_base/checks.h" -#include "rtc_base/format_macros.h" #include "rtc_base/logging.h" #include "rtc_base/network/sent_packet.h" -#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/rate_limiter.h" #include "rtc_base/timeutils.h" #include "system_wrappers/include/field_trial.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/test/controller_printer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/test/controller_printer.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/test/controller_printer.cc @@ -9,11 +9,13 @@ */ #include "modules/congestion_controller/test/controller_printer.h" -#include <cmath> #include <limits> #include <utility> -#include "rtc_base/checks.h" +#include "absl/types/optional.h" +#include "api/units/data_rate.h" +#include "api/units/data_size.h" +#include "api/units/time_delta.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/test/controller_printer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/test/controller_printer.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/test/controller_printer.h @@ -13,7 +13,8 @@ #include <cstdio> #include <memory> -#include "api/transport/network_control.h" +#include "api/transport/network_types.h" +#include "api/units/timestamp.h" namespace webrtc { class DebugStatePrinter { Index: chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/transport_feedback_adapter.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/congestion_controller/transport_feedback_adapter.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/congestion_controller/transport_feedback_adapter.cc @@ -10,13 +10,16 @@ #include "modules/congestion_controller/transport_feedback_adapter.h" +#include <stdlib.h> #include <algorithm> +#include <cmath> +#include <cstdint> +#include "api/units/data_size.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/numerics/mod_ops.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc @@ -10,10 +10,11 @@ #include "modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h" -#include <algorithm> +#include <stdint.h> #include <utility> #include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_region.h" #include "rtc_base/checks.h" #include "system_wrappers/include/metrics.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h @@ -13,8 +13,11 @@ #include <memory> +#include "modules/desktop_capture/desktop_capture_types.h" #include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_frame.h" #include "modules/desktop_capture/rgba_color.h" +#include "modules/desktop_capture/shared_memory.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper_unittest.cc @@ -16,6 +16,8 @@ #include "modules/desktop_capture/desktop_capturer.h" #include "modules/desktop_capture/desktop_frame.h" #include "modules/desktop_capture/desktop_frame_generator.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_region.h" #include "modules/desktop_capture/fake_desktop_capturer.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/capture_result_desktop_capturer_wrapper.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/capture_result_desktop_capturer_wrapper.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/capture_result_desktop_capturer_wrapper.h @@ -15,6 +15,7 @@ #include "modules/desktop_capture/desktop_capturer.h" #include "modules/desktop_capture/desktop_capturer_wrapper.h" +#include "modules/desktop_capture/desktop_frame.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/cropped_desktop_frame.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/cropped_desktop_frame.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/cropped_desktop_frame.cc @@ -9,9 +9,10 @@ */ #include <memory> +#include <utility> #include "modules/desktop_capture/cropped_desktop_frame.h" - +#include "modules/desktop_capture/desktop_region.h" #include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/cropped_desktop_frame.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/cropped_desktop_frame.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/cropped_desktop_frame.h @@ -11,7 +11,10 @@ #ifndef MODULES_DESKTOP_CAPTURE_CROPPED_DESKTOP_FRAME_H_ #define MODULES_DESKTOP_CAPTURE_CROPPED_DESKTOP_FRAME_H_ +#include <memory> + #include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_geometry.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/cropping_window_capturer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/cropping_window_capturer.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/cropping_window_capturer.cc @@ -10,6 +10,9 @@ #include "modules/desktop_capture/cropping_window_capturer.h" +#include <stddef.h> +#include <utility> + #include "modules/desktop_capture/cropped_desktop_frame.h" #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/cropping_window_capturer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/cropping_window_capturer.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/cropping_window_capturer.h @@ -14,7 +14,11 @@ #include <memory> #include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_capture_types.h" #include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/shared_memory.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc @@ -10,8 +10,8 @@ #include "modules/desktop_capture/desktop_and_cursor_composer.h" +#include <stdint.h> #include <string.h> - #include <utility> #include "absl/memory/memory.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h @@ -14,8 +14,13 @@ #include <memory> #include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_capture_types.h" #include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/mouse_cursor.h" #include "modules/desktop_capture/mouse_cursor_monitor.h" +#include "modules/desktop_capture/shared_memory.h" #include "rtc_base/constructormagic.h" #include "rtc_base/system/rtc_export.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc @@ -8,10 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> +#include <string.h> #include <memory> +#include <utility> #include "modules/desktop_capture/desktop_and_cursor_composer.h" -#include "modules/desktop_capture/desktop_capture_options.h" #include "modules/desktop_capture/desktop_capturer.h" #include "modules/desktop_capture/desktop_frame.h" #include "modules/desktop_capture/mouse_cursor.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_capture_options.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/desktop_capture_options.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_capture_options.h @@ -10,7 +10,6 @@ #ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_ #define MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_ -#include "rtc_base/constructormagic.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/system/rtc_export.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_capturer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/desktop_capturer.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_capturer.cc @@ -12,6 +12,10 @@ #include "modules/desktop_capture/desktop_capturer.h" +#include <stdlib.h> +#include <string.h> +#include <utility> + #include "modules/desktop_capture/desktop_capture_options.h" #include "modules/desktop_capture/desktop_capturer_differ_wrapper.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.cc @@ -10,12 +10,12 @@ #include "modules/desktop_capture/desktop_capturer_differ_wrapper.h" +#include <stdint.h> #include <string.h> - -#include <algorithm> #include <utility> #include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/desktop_region.h" #include "modules/desktop_capture/differ_block.h" #include "rtc_base/checks.h" #include "rtc_base/timeutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.h @@ -13,8 +13,12 @@ #include <memory> +#include "modules/desktop_capture/desktop_capture_types.h" #include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_geometry.h" #include "modules/desktop_capture/shared_desktop_frame.h" +#include "modules/desktop_capture/shared_memory.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_capturer_wrapper.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/desktop_capturer_wrapper.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_capturer_wrapper.h @@ -13,7 +13,10 @@ #include <memory> +#include "modules/desktop_capture/desktop_capture_types.h" #include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/shared_memory.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_frame.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/desktop_frame.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_frame.cc @@ -10,11 +10,11 @@ #include "modules/desktop_capture/desktop_frame.h" -#include <utility> - #include <string.h> +#include <utility> #include "absl/memory/memory.h" +#include "modules/desktop_capture/desktop_capture_types.h" #include "modules/desktop_capture/desktop_geometry.h" #include "rtc_base/checks.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_frame.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/desktop_frame.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_frame.h @@ -11,9 +11,9 @@ #ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_H_ #define MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_H_ +#include <stdint.h> #include <memory> -#include "modules/desktop_capture/desktop_capture_types.h" #include "modules/desktop_capture/desktop_geometry.h" #include "modules/desktop_capture/desktop_region.h" #include "modules/desktop_capture/shared_memory.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_frame_generator.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/desktop_frame_generator.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_frame_generator.cc @@ -12,10 +12,10 @@ #include <stdint.h> #include <string.h> - #include <memory> #include "modules/desktop_capture/rgba_color.h" +#include "rtc_base/checks.h" #include "rtc_base/random.h" #include "rtc_base/timeutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_frame_rotation.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/desktop_frame_rotation.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_frame_rotation.cc @@ -10,8 +10,6 @@ #include "modules/desktop_capture/desktop_frame_rotation.h" -#include <string.h> - #include "rtc_base/checks.h" #include "third_party/libyuv/include/libyuv/rotate_argb.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_frame_rotation_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/desktop_frame_rotation_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_frame_rotation_unittest.cc @@ -10,6 +10,8 @@ #include "modules/desktop_capture/desktop_frame_rotation.h" +#include <stdint.h> + #include "modules/desktop_capture/desktop_frame.h" #include "modules/desktop_capture/desktop_region.h" #include "modules/desktop_capture/test_utils.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_geometry.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/desktop_geometry.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_geometry.h @@ -13,7 +13,6 @@ #include <stdint.h> -#include "rtc_base/constructormagic.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_region.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/desktop_region.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_region.cc @@ -11,8 +11,8 @@ #include "modules/desktop_capture/desktop_region.h" #include <assert.h> - #include <algorithm> +#include <utility> namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_region.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/desktop_region.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_region.h @@ -11,11 +11,11 @@ #ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_REGION_H_ #define MODULES_DESKTOP_CAPTURE_DESKTOP_REGION_H_ +#include <stdint.h> #include <map> #include <vector> #include "modules/desktop_capture/desktop_geometry.h" -#include "rtc_base/constructormagic.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_region_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/desktop_region_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/desktop_region_unittest.cc @@ -10,7 +10,9 @@ #include "modules/desktop_capture/desktop_region.h" +#include <stdlib.h> #include <algorithm> +#include <cstdint> #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/differ_block_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/differ_block_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/differ_block_unittest.cc @@ -9,7 +9,10 @@ */ #include "modules/desktop_capture/differ_block.h" -#include "test/gmock.h" + +#include <string.h> + +#include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/fake_desktop_capturer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/fake_desktop_capturer.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/fake_desktop_capturer.cc @@ -12,6 +12,9 @@ #include <utility> +#include "modules/desktop_capture/desktop_capture_types.h" +#include "modules/desktop_capture/desktop_frame.h" + namespace webrtc { FakeDesktopCapturer::FakeDesktopCapturer() = default; Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/fake_desktop_capturer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/fake_desktop_capturer.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/fake_desktop_capturer.h @@ -13,7 +13,6 @@ #include <memory> -#include "modules/desktop_capture/desktop_capture_types.h" #include "modules/desktop_capture/desktop_capturer.h" #include "modules/desktop_capture/desktop_frame_generator.h" #include "modules/desktop_capture/shared_memory.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc @@ -10,9 +10,11 @@ #include "modules/desktop_capture/fallback_desktop_capturer_wrapper.h" +#include <stddef.h> #include <utility> #include "rtc_base/checks.h" +#include "rtc_base/thread_checker.h" #include "system_wrappers/include/metrics.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.h @@ -16,6 +16,7 @@ #include "modules/desktop_capture/desktop_capture_types.h" #include "modules/desktop_capture/desktop_capturer.h" #include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_geometry.h" #include "modules/desktop_capture/shared_memory.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper_unittest.cc @@ -10,6 +10,7 @@ #include "modules/desktop_capture/fallback_desktop_capturer_wrapper.h" +#include <stddef.h> #include <memory> #include <utility> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc @@ -10,18 +10,22 @@ #include "modules/desktop_capture/linux/mouse_cursor_monitor_x11.h" -#include <X11/Xutil.h> +#include <X11/Xlib.h> #include <X11/extensions/Xfixes.h> - +#include <X11/extensions/xfixeswire.h> +#include <stddef.h> +#include <stdint.h> #include <algorithm> #include <memory> #include "modules/desktop_capture/desktop_capture_options.h" #include "modules/desktop_capture/desktop_capture_types.h" #include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_geometry.h" #include "modules/desktop_capture/linux/x_error_trap.h" #include "modules/desktop_capture/mouse_cursor.h" #include "modules/desktop_capture/mouse_cursor_monitor.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" namespace { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.h @@ -11,12 +11,15 @@ #ifndef MODULES_DESKTOP_CAPTURE_LINUX_MOUSE_CURSOR_MONITOR_X11_H_ #define MODULES_DESKTOP_CAPTURE_LINUX_MOUSE_CURSOR_MONITOR_X11_H_ -#include <X11/Xlib.h> - +#include <X11/X.h> #include <memory> +#include "modules/desktop_capture/desktop_capture_options.h" +#include "modules/desktop_capture/desktop_capture_types.h" #include "modules/desktop_capture/linux/shared_x_display.h" +#include "modules/desktop_capture/mouse_cursor.h" #include "modules/desktop_capture/mouse_cursor_monitor.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/screen_capturer_x11.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/linux/screen_capturer_x11.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/screen_capturer_x11.cc @@ -10,20 +10,19 @@ #include "modules/desktop_capture/linux/screen_capturer_x11.h" -#include <string.h> - #include <X11/Xlib.h> -#include <X11/Xutil.h> #include <X11/extensions/Xdamage.h> #include <X11/extensions/Xfixes.h> - +#include <X11/extensions/damagewire.h> +#include <stdint.h> +#include <string.h> #include <memory> -#include <set> #include <utility> #include "modules/desktop_capture/desktop_capture_options.h" #include "modules/desktop_capture/desktop_capturer.h" #include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_geometry.h" #include "modules/desktop_capture/linux/x_server_pixel_buffer.h" #include "modules/desktop_capture/screen_capture_frame_queue.h" #include "modules/desktop_capture/screen_capturer_helper.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/screen_capturer_x11.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/linux/screen_capturer_x11.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/screen_capturer_x11.h @@ -11,16 +11,17 @@ #ifndef MODULES_DESKTOP_CAPTURE_LINUX_SCREEN_CAPTURER_X11_H_ #define MODULES_DESKTOP_CAPTURE_LINUX_SCREEN_CAPTURER_X11_H_ +#include <X11/X.h> #include <X11/Xlib.h> #include <X11/extensions/Xdamage.h> - +#include <X11/extensions/Xfixes.h> #include <memory> -#include <set> -#include <utility> #include "modules/desktop_capture/desktop_capture_options.h" #include "modules/desktop_capture/desktop_capturer.h" #include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/linux/shared_x_display.h" #include "modules/desktop_capture/linux/x_server_pixel_buffer.h" #include "modules/desktop_capture/screen_capture_frame_queue.h" #include "modules/desktop_capture/screen_capturer_helper.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc @@ -12,13 +12,15 @@ #include <X11/Xutil.h> #include <X11/extensions/Xcomposite.h> -#include <X11/extensions/Xrender.h> - +#include <X11/extensions/composite.h> +#include <string.h> #include <memory> #include <string> #include <utility> +#include "modules/desktop_capture/desktop_capture_types.h" #include "modules/desktop_capture/desktop_frame.h" +#include "modules/desktop_capture/desktop_region.h" #include "modules/desktop_capture/linux/shared_x_display.h" #include "modules/desktop_capture/linux/window_finder_x11.h" #include "modules/desktop_capture/linux/window_list_utils.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.h @@ -11,15 +11,20 @@ #ifndef MODULES_DESKTOP_CAPTURE_LINUX_WINDOW_CAPTURER_X11_H_ #define MODULES_DESKTOP_CAPTURE_LINUX_WINDOW_CAPTURER_X11_H_ +#include <X11/X.h> +#include <X11/Xlib.h> #include <memory> #include <string> #include "modules/desktop_capture/desktop_capture_options.h" #include "modules/desktop_capture/desktop_capturer.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "modules/desktop_capture/linux/shared_x_display.h" #include "modules/desktop_capture/linux/window_finder_x11.h" #include "modules/desktop_capture/linux/x_atom_cache.h" #include "modules/desktop_capture/linux/x_server_pixel_buffer.h" #include "rtc_base/constructormagic.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/window_finder_x11.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/linux/window_finder_x11.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/window_finder_x11.cc @@ -10,6 +10,7 @@ #include "modules/desktop_capture/linux/window_finder_x11.h" +#include <X11/X.h> #include <memory> #include "absl/memory/memory.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/window_list_utils.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/linux/window_list_utils.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/window_list_utils.cc @@ -10,11 +10,9 @@ #include "modules/desktop_capture/linux/window_list_utils.h" -#include <X11/Xatom.h> #include <X11/Xlib.h> #include <X11/Xutil.h> #include <string.h> - #include <algorithm> #include "modules/desktop_capture/linux/x_error_trap.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/window_list_utils.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/linux/window_list_utils.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/window_list_utils.h @@ -11,7 +11,9 @@ #ifndef MODULES_DESKTOP_CAPTURE_LINUX_WINDOW_LIST_UTILS_H_ #define MODULES_DESKTOP_CAPTURE_LINUX_WINDOW_LIST_UTILS_H_ +#include <X11/X.h> #include <X11/Xlib.h> +#include <stdint.h> #include "modules/desktop_capture/desktop_geometry.h" #include "modules/desktop_capture/linux/x_atom_cache.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/x_atom_cache.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/linux/x_atom_cache.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/x_atom_cache.h @@ -11,7 +11,7 @@ #ifndef MODULES_DESKTOP_CAPTURE_LINUX_X_ATOM_CACHE_H_ #define MODULES_DESKTOP_CAPTURE_LINUX_X_ATOM_CACHE_H_ -#include <X11/Xatom.h> +#include <X11/X.h> #include <X11/Xlib.h> namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/x_error_trap.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/linux/x_error_trap.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/x_error_trap.cc @@ -11,6 +11,7 @@ #include "modules/desktop_capture/linux/x_error_trap.h" #include <assert.h> +#include <stddef.h> #if defined(TOOLKIT_GTK) #include <gdk/gdk.h> Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc @@ -10,7 +10,10 @@ #include "modules/desktop_capture/linux/x_server_pixel_buffer.h" +#include <X11/Xutil.h> +#include <stdint.h> #include <string.h> +#include <sys/ipc.h> #include <sys/shm.h> #include "modules/desktop_capture/desktop_frame.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/mouse_cursor.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/mouse_cursor.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/mouse_cursor.h @@ -13,13 +13,12 @@ #include <memory> +#include "modules/desktop_capture/desktop_frame.h" #include "modules/desktop_capture/desktop_geometry.h" #include "rtc_base/constructormagic.h" namespace webrtc { -class DesktopFrame; - class MouseCursor { public: MouseCursor(); Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc @@ -8,6 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <memory> + +#include "modules/desktop_capture/desktop_capture_types.h" #include "modules/desktop_capture/mouse_cursor_monitor.h" #if defined(USE_X11) Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc @@ -8,6 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <assert.h> +#include <stddef.h> #include <memory> #include "modules/desktop_capture/desktop_capture_options.h" @@ -15,6 +17,7 @@ #include "modules/desktop_capture/desktop_frame.h" #include "modules/desktop_capture/mouse_cursor.h" #include "modules/desktop_capture/mouse_cursor_monitor.h" +#include "rtc_base/checks.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/rgba_color_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/rgba_color_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/rgba_color_unittest.cc @@ -10,6 +10,7 @@ #include "modules/desktop_capture/rgba_color.h" +#include <cstdint> #include <vector> #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/screen_capturer_helper.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/screen_capturer_helper.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/screen_capturer_helper.cc @@ -11,7 +11,6 @@ #include "modules/desktop_capture/screen_capturer_helper.h" #include <assert.h> -#include <algorithm> namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/screen_capturer_linux.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/screen_capturer_linux.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/screen_capturer_linux.cc @@ -8,6 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <memory> + #include "modules/desktop_capture/desktop_capture_options.h" #include "modules/desktop_capture/desktop_capturer.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/screen_drawer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/screen_drawer.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/screen_drawer.h @@ -11,10 +11,6 @@ #ifndef MODULES_DESKTOP_CAPTURE_SCREEN_DRAWER_H_ #define MODULES_DESKTOP_CAPTURE_SCREEN_DRAWER_H_ -#include <stdint.h> - -#include <memory> - #include "modules/desktop_capture/desktop_capture_types.h" #include "modules/desktop_capture/desktop_geometry.h" #include "modules/desktop_capture/rgba_color.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/screen_drawer_linux.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/screen_drawer_linux.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/screen_drawer_linux.cc @@ -8,16 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <X11/X.h> #include <X11/Xlib.h> #include <string.h> - #include <memory> #include "absl/memory/memory.h" +#include "modules/desktop_capture/desktop_capture_types.h" +#include "modules/desktop_capture/desktop_geometry.h" #include "modules/desktop_capture/linux/shared_x_display.h" +#include "modules/desktop_capture/rgba_color.h" #include "modules/desktop_capture/screen_drawer.h" #include "modules/desktop_capture/screen_drawer_lock_posix.h" #include "rtc_base/checks.h" +#include "rtc_base/scoped_ref_ptr.h" #include "system_wrappers/include/sleep.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/shared_desktop_frame.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/shared_desktop_frame.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/shared_desktop_frame.cc @@ -11,11 +11,9 @@ #include "modules/desktop_capture/shared_desktop_frame.h" #include <memory> +#include <type_traits> #include <utility> -#include "absl/memory/memory.h" -#include "rtc_base/constructormagic.h" - namespace webrtc { SharedDesktopFrame::~SharedDesktopFrame() {} Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/shared_desktop_frame.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/shared_desktop_frame.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/shared_desktop_frame.h @@ -11,9 +11,10 @@ #ifndef MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ #define MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ +#include <memory> + #include "modules/desktop_capture/desktop_frame.h" #include "rtc_base/constructormagic.h" -#include "rtc_base/refcount.h" #include "rtc_base/refcountedobject.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/system/rtc_export.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/shared_memory.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/shared_memory.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/shared_memory.h @@ -20,7 +20,6 @@ #include <memory> #include "rtc_base/constructormagic.h" -#include "rtc_base/thread_checker.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/test_utils.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/test_utils.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/test_utils.cc @@ -10,8 +10,10 @@ #include "modules/desktop_capture/test_utils.h" +#include <stdint.h> #include <string.h> +#include "modules/desktop_capture/desktop_geometry.h" #include "rtc_base/checks.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/test_utils_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/test_utils_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/test_utils_unittest.cc @@ -10,6 +10,9 @@ #include "modules/desktop_capture/test_utils.h" +#include <stdint.h> + +#include "modules/desktop_capture/desktop_geometry.h" #include "modules/desktop_capture/rgba_color.h" #include "rtc_base/checks.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/window_capturer_linux.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/window_capturer_linux.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/window_capturer_linux.cc @@ -8,6 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <memory> + #include "modules/desktop_capture/desktop_capture_options.h" #include "modules/desktop_capture/desktop_capturer.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/window_capturer_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/window_capturer_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/window_capturer_unittest.cc @@ -9,11 +9,14 @@ */ #include <memory> +#include <string> +#include <utility> #include "modules/desktop_capture/desktop_capture_options.h" #include "modules/desktop_capture/desktop_capturer.h" #include "modules/desktop_capture/desktop_frame.h" -#include "modules/desktop_capture/desktop_region.h" +#include "modules/desktop_capture/desktop_geometry.h" +#include "rtc_base/checks.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/window_finder_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/desktop_capture/window_finder_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/desktop_capture/window_finder_unittest.cc @@ -11,12 +11,12 @@ #include "modules/desktop_capture/window_finder.h" #include <stdint.h> - #include <memory> #include "modules/desktop_capture/desktop_geometry.h" #include "modules/desktop_capture/screen_drawer.h" #include "rtc_base/logging.h" +#include "rtc_base/scoped_ref_ptr.h" #include "test/gtest.h" #if defined(USE_X11) Index: chromium-72.0.3626.53/third_party/webrtc/modules/module_common_types_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/module_common_types_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/module_common_types_unittest.cc @@ -10,6 +10,7 @@ #include "modules/include/module_common_types.h" +#include "modules/include/module_common_types_public.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/pacing/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/pacing/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/modules/pacing/BUILD.gn @@ -73,6 +73,7 @@ if (rtc_include_tests) { deps = [ ":interval_budget", ":pacing", + "../../api/units:time_delta", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_tests_utils", Index: chromium-72.0.3626.53/third_party/webrtc/modules/pacing/bitrate_prober_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/pacing/bitrate_prober_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/pacing/bitrate_prober_unittest.cc @@ -8,8 +8,6 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <limits> - #include "modules/pacing/bitrate_prober.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/pacing/packet_router_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/pacing/packet_router_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/pacing/packet_router_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <list> -#include <memory> +#include <cstddef> +#include <cstdint> +#include "api/units/time_delta.h" #include "modules/pacing/packet_router.h" -#include "modules/rtp_rtcp/include/rtp_rtcp.h" #include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "rtc_base/checks.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/BUILD.gn @@ -41,6 +41,7 @@ rtc_static_library("remote_bitrate_estim deps = [ "../..:webrtc_common", + "../../api:libjingle_peerconnection_api", "../../api/units:data_rate", "../../api/units:timestamp", "../../modules:module_api", @@ -124,7 +125,10 @@ if (rtc_include_tests) { deps = [ ":remote_bitrate_estimator", "..:module_api", + "..:module_api_public", "../..:webrtc_common", + "../../api:libjingle_peerconnection_api", + "../../api/transport:network_control", "../../logging:mocks", "../../rtc_base:checks", "../../rtc_base:gtest_prod", @@ -166,6 +170,7 @@ if (rtc_include_tests) { ":bwe_simulator_lib", ":remote_bitrate_estimator", "../../rtc_base:rtc_base_approved", + "../../system_wrappers:system_wrappers", "../../test:field_trial", "../../test:fileutils", "../../test:test_support", @@ -199,6 +204,7 @@ if (rtc_include_tests) { deps = [ ":bwe_simulator_lib", ":remote_bitrate_estimator", + "..:module_api_public", "../..:webrtc_common", "../../rtc_base:checks", "../../rtc_base:rtc_base", @@ -227,6 +233,7 @@ if (rtc_include_tests) { ":remote_bitrate_estimator", "../..:webrtc_common", "../../rtc_base:rtc_base_approved", + "../../system_wrappers:system_wrappers", "../../test:fileutils", "../../test:test_main", "../../test:test_support", Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc @@ -8,13 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stddef.h> +#include <cstdint> #include <memory> +#include <string> +#include <vector> -#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/remote_bitrate_estimator/test/bwe.h" #include "modules/remote_bitrate_estimator/test/bwe_test.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" #include "modules/remote_bitrate_estimator/test/packet_receiver.h" #include "modules/remote_bitrate_estimator/test/packet_sender.h" #include "rtc_base/constructormagic.h" +#include "rtc_base/random.h" +#include "system_wrappers/include/clock.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/inter_arrival_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/inter_arrival_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/inter_arrival_unittest.cc @@ -10,7 +10,6 @@ #include <memory> -#include "common_types.h" // NOLINT(build/include) #include "modules/remote_bitrate_estimator/inter_arrival.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc @@ -8,10 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <math.h> - +#include <stdio.h> +#include <string.h> #include <algorithm> -#include <cmath> #include <cstdlib> #include <memory> @@ -20,7 +19,6 @@ #include "modules/remote_bitrate_estimator/overuse_detector.h" #include "modules/remote_bitrate_estimator/overuse_estimator.h" #include "rtc_base/random.h" -#include "rtc_base/rate_statistics.h" #include "test/field_trial.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h @@ -11,11 +11,14 @@ #ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_ABS_SEND_TIME_H_ #define MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_ABS_SEND_TIME_H_ +#include <stddef.h> +#include <stdint.h> #include <list> #include <map> #include <memory> #include <vector> +#include "api/rtp_headers.h" #include "modules/remote_bitrate_estimator/aimd_rate_control.h" #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "modules/remote_bitrate_estimator/inter_arrival.h" @@ -26,6 +29,8 @@ #include "rtc_base/criticalsection.h" #include "rtc_base/race_checker.h" #include "rtc_base/rate_statistics.h" +#include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/clock.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc @@ -9,8 +9,10 @@ */ #include "modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" + #include "modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h" #include "rtc_base/constructormagic.h" +#include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc @@ -9,8 +9,10 @@ */ #include "modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h" + #include "modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h" #include "rtc_base/constructormagic.h" +#include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc @@ -9,20 +9,22 @@ */ #ifndef WEBRTC_WIN -#include <sys/types.h> #include <unistd.h> #endif +#include <stdint.h> #include <algorithm> -#include <sstream> -#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/remote_bitrate_estimator/test/bwe.h" #include "modules/remote_bitrate_estimator/test/bwe_test.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" #include "modules/remote_bitrate_estimator/test/packet_receiver.h" #include "modules/remote_bitrate_estimator/test/packet_sender.h" #include "rtc_base/constructormagic.h" #include "rtc_base/random.h" +#include "system_wrappers/include/clock.h" #include "test/field_trial.h" +#include "test/gtest.h" #include "test/testsupport/fileutils.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/bbr_paced_sender.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/bbr_paced_sender.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/bbr_paced_sender.cc @@ -11,10 +11,8 @@ #include "modules/remote_bitrate_estimator/test/bbr_paced_sender.h" #include <algorithm> -#include <queue> -#include <set> -#include <vector> +#include "api/transport/network_types.h" #include "modules/pacing/paced_sender.h" #include "modules/remote_bitrate_estimator/test/estimators/congestion_window.h" #include "system_wrappers/include/clock.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe.h @@ -11,17 +11,21 @@ #ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_H_ #define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_H_ +#include <stddef.h> +#include <stdint.h> +#include <iterator> #include <list> #include <map> -#include <sstream> -#include <string> +#include <utility> #include "modules/bitrate_controller/include/bitrate_controller.h" +#include "modules/include/module.h" #include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" #include "modules/remote_bitrate_estimator/test/packet.h" #include "rtc_base/constructormagic.h" #include "rtc_base/gtest_prod_util.h" #include "rtc_base/numerics/sequence_number_util.h" +#include "system_wrappers/include/clock.h" namespace webrtc { namespace testing { Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc @@ -11,13 +11,12 @@ #include "modules/remote_bitrate_estimator/test/bwe_test_baselinefile.h" #include <stdio.h> - #include <algorithm> +#include <cstdint> #include <memory> #include <vector> #include "modules/remote_bitrate_estimator/test/bwe_test_fileutils.h" -#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "rtc_base/constructormagic.h" #include "test/testsupport/fileutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.h @@ -11,8 +11,8 @@ #ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_BASELINEFILE_H_ #define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_BASELINEFILE_H_ +#include <stdint.h> #include <string> -#include "modules/include/module_common_types.h" namespace webrtc { namespace testing { Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h @@ -11,11 +11,10 @@ #ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_FILEUTILS_H_ #define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_FILEUTILS_H_ +#include <stdint.h> #include <stdio.h> - #include <string> -#include "modules/include/module_common_types.h" #include "rtc_base/constructormagic.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc @@ -11,10 +11,13 @@ #include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" #include <stdio.h> - +#include <stdlib.h> +#include <string.h> +#include <cmath> #include <sstream> -#include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtp_packet_received.h" #include "rtc_base/constructormagic.h" #include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/system/unused.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc @@ -10,10 +10,11 @@ #include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" -#include <numeric> - +#include "modules/include/module_common_types_public.h" +#include "modules/remote_bitrate_estimator/test/bwe.h" #include "modules/remote_bitrate_estimator/test/packet.h" #include "modules/remote_bitrate_estimator/test/packet_sender.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "rtc_base/constructormagic.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/bwe_unittest.cc @@ -10,6 +10,8 @@ #include "modules/remote_bitrate_estimator/test/bwe.h" +#include <algorithm> +#include <cstdint> #include <random> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/bbr.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/bbr.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/bbr.cc @@ -12,6 +12,7 @@ #include "modules/remote_bitrate_estimator/test/estimators/bbr.h" #include <stdlib.h> +#include <time.h> #include <algorithm> #include "modules/remote_bitrate_estimator/test/estimators/congestion_window.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/congestion_window.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/congestion_window.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/congestion_window.cc @@ -11,9 +11,8 @@ #include "modules/remote_bitrate_estimator/test/estimators/congestion_window.h" -#include <algorithm> - #include "modules/remote_bitrate_estimator/test/estimators/bbr.h" +#include "rtc_base/checks.h" namespace webrtc { namespace testing { Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/congestion_window.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/congestion_window.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/congestion_window.h @@ -12,9 +12,11 @@ #ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_CONGESTION_WINDOW_H_ #define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_CONGESTION_WINDOW_H_ -#include "modules/remote_bitrate_estimator/test/estimators/bbr.h" +#include <stddef.h> +#include <stdint.h> #include "absl/types/optional.h" +#include "modules/remote_bitrate_estimator/test/estimators/bbr.h" namespace webrtc { namespace testing { Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/max_bandwidth_filter.h @@ -12,15 +12,9 @@ #ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_MAX_BANDWIDTH_FILTER_H_ #define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_MAX_BANDWIDTH_FILTER_H_ -#include <climits> -#include <list> -#include <map> -#include <memory> +#include <cstddef> +#include <cstdint> #include <utility> -#include <vector> - -#include "logging/rtc_event_log/mock/mock_rtc_event_log.h" -#include "modules/remote_bitrate_estimator/test/bwe.h" namespace webrtc { namespace testing { Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/min_rtt_filter.h @@ -12,8 +12,7 @@ #ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_MIN_RTT_FILTER_H_ #define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_MIN_RTT_FILTER_H_ -#include <cstdint> -#include <limits> +#include <stddef.h> #include <list> #include "absl/types/optional.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc @@ -15,10 +15,12 @@ // From March 26, 2015. #include <math.h> +#include <stddef.h> #include <algorithm> +#include <cstdint> +#include <list> #include <vector> -#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "modules/remote_bitrate_estimator/test/estimators/nada.h" #include "modules/rtp_rtcp/include/receive_statistics.h" #include "rtc_base/arraysize.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc @@ -10,17 +10,14 @@ #include "modules/remote_bitrate_estimator/test/estimators/nada.h" +#include <math.h> +#include <stddef.h> #include <algorithm> #include <memory> -#include <numeric> -#include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" #include "modules/remote_bitrate_estimator/test/packet.h" -#include "modules/remote_bitrate_estimator/test/packet_sender.h" #include "rtc_base/arraysize.h" -#include "rtc_base/constructormagic.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" namespace webrtc { namespace testing { Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc @@ -8,14 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <assert.h> +#include <stddef.h> #include <algorithm> - -#include "modules/remote_bitrate_estimator/test/estimators/remb.h" +#include <cstdint> #include "modules/bitrate_controller/include/bitrate_controller.h" #include "modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "modules/remote_bitrate_estimator/test/estimators/remb.h" #include "modules/rtp_rtcp/include/receive_statistics.h" +#include "modules/rtp_rtcp/source/rtcp_packet/report_block.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/system/unused.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc @@ -10,9 +10,13 @@ #include "modules/remote_bitrate_estimator/test/estimators/send_side.h" +#include <assert.h> +#include <stddef.h> #include <algorithm> #include "absl/memory/memory.h" +#include "api/rtp_headers.h" +#include "api/transport/network_types.h" #include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h @@ -11,13 +11,23 @@ #ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_SEND_SIDE_H_ #define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_SEND_SIDE_H_ +#include <stdint.h> #include <memory> #include <vector> #include "logging/rtc_event_log/mock/mock_rtc_event_log.h" +#include "modules/bitrate_controller/include/bitrate_controller.h" #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "modules/congestion_controller/rtp/send_time_history.h" +#include "modules/include/module_common_types_public.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "modules/remote_bitrate_estimator/test/bwe.h" +#include "modules/remote_bitrate_estimator/test/packet.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/constructormagic.h" +#include "system_wrappers/include/clock.h" +#include "test/gmock.h" namespace webrtc { namespace testing { Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.cc @@ -8,15 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <algorithm> +#include <cstdint> +#include "api/rtp_headers.h" #include "modules/remote_bitrate_estimator/test/estimators/tcp.h" -#include "modules/bitrate_controller/include/bitrate_controller.h" -#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "modules/rtp_rtcp/include/receive_statistics.h" -#include "test/gtest.h" - namespace webrtc { namespace testing { namespace bwe { Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.h @@ -11,9 +11,11 @@ #ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_TCP_H_ #define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_TCP_H_ +#include <stdint.h> #include <vector> #include "modules/remote_bitrate_estimator/test/bwe.h" +#include "modules/remote_bitrate_estimator/test/packet.h" namespace webrtc { namespace testing { Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc @@ -12,6 +12,7 @@ #include <math.h> #include <algorithm> +#include <cstdint> #include <random> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/packet.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/packet.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/packet.cc @@ -10,6 +10,9 @@ #include "modules/remote_bitrate_estimator/test/packet.h" +#include <assert.h> +#include <cstdint> + namespace webrtc { namespace testing { namespace bwe { Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/packet.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/packet.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/packet.h @@ -11,13 +11,13 @@ #ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_H_ #define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_H_ +#include <stddef.h> +#include <stdint.h> #include <list> #include <map> -#include <utility> #include <vector> -#include "common_types.h" // NOLINT(build/include) -#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "api/rtp_headers.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.cc @@ -10,14 +10,12 @@ #include "modules/remote_bitrate_estimator/test/packet_receiver.h" +#include <list> #include <vector> -#include "modules/include/module_common_types.h" #include "modules/remote_bitrate_estimator/test/bwe.h" #include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" -#include "modules/rtp_rtcp/include/receive_statistics.h" -#include "system_wrappers/include/clock.h" -#include "test/gtest.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" namespace webrtc { namespace testing { Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h @@ -11,12 +11,15 @@ #ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_RECEIVER_H_ #define MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_RECEIVER_H_ +#include <stddef.h> +#include <stdint.h> #include <memory> #include <string> #include "modules/remote_bitrate_estimator/test/bwe.h" #include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" #include "modules/remote_bitrate_estimator/test/metric_recorder.h" +#include "modules/remote_bitrate_estimator/test/packet.h" #include "rtc_base/constructormagic.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc @@ -10,15 +10,20 @@ #include "modules/remote_bitrate_estimator/test/packet_sender.h" +#include <assert.h> +#include <math.h> #include <algorithm> +#include <limits> #include <list> -#include <sstream> +#include <vector> -#include "modules/include/module_common_types.h" +#include "modules/include/module_common_types_public.h" #include "modules/pacing/pacer.h" #include "modules/remote_bitrate_estimator/test/bbr_paced_sender.h" #include "modules/remote_bitrate_estimator/test/bwe.h" +#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "modules/remote_bitrate_estimator/test/metric_recorder.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "rtc_base/checks.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/device_info_impl.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_capture/device_info_impl.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/device_info_impl.cc @@ -12,10 +12,10 @@ #include <stdlib.h> #include "absl/strings/match.h" +#include "absl/strings/string_view.h" +#include "common_types.h" // NOLINT(build/include) #include "modules/video_capture/device_info_impl.h" -#include "modules/video_capture/video_capture_config.h" #include "rtc_base/logging.h" -#include "rtc_base/stringutils.h" #ifndef abs #define abs(a) (a >= 0 ? a : -a) Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/device_info_impl.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_capture/device_info_impl.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/device_info_impl.h @@ -11,9 +11,12 @@ #ifndef MODULES_VIDEO_CAPTURE_MAIN_SOURCE_DEVICE_INFO_IMPL_H_ #define MODULES_VIDEO_CAPTURE_MAIN_SOURCE_DEVICE_INFO_IMPL_H_ +#include <stdint.h> #include <vector> +#include "api/video/video_rotation.h" #include "modules/video_capture/video_capture.h" +#include "modules/video_capture/video_capture_defines.h" #include "rtc_base/synchronization/rw_lock_wrapper.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/external/device_info_external.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_capture/external/device_info_external.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/external/device_info_external.cc @@ -8,7 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> + #include "modules/video_capture/device_info_impl.h" +#include "modules/video_capture/video_capture.h" #include "modules/video_capture/video_capture_impl.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/external/video_capture_external.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_capture/external/video_capture_external.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/external/video_capture_external.cc @@ -8,9 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include "modules/video_capture/video_capture.h" #include "modules/video_capture/video_capture_impl.h" -#include "rtc_base/refcount.h" #include "rtc_base/refcountedobject.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/linux/device_info_linux.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_capture/linux/device_info_linux.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/linux/device_info_linux.cc @@ -14,12 +14,17 @@ #include <fcntl.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <sys/ioctl.h> -#include <sys/stat.h> #include <unistd.h> // v4l includes #include <linux/videodev2.h> +#include <vector> +#include "common_types.h" // NOLINT(build/include) +#include "modules/video_capture/video_capture.h" +#include "modules/video_capture/video_capture_defines.h" +#include "modules/video_capture/video_capture_impl.h" #include "rtc_base/logging.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/linux/device_info_linux.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_capture/linux/device_info_linux.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/linux/device_info_linux.h @@ -11,8 +11,9 @@ #ifndef MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_DEVICE_INFO_LINUX_H_ #define MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_DEVICE_INFO_LINUX_H_ +#include <stdint.h> + #include "modules/video_capture/device_info_impl.h" -#include "modules/video_capture/video_capture_impl.h" namespace webrtc { namespace videocapturemodule { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/linux/video_capture_linux.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_capture/linux/video_capture_linux.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/linux/video_capture_linux.cc @@ -17,14 +17,15 @@ #include <string.h> #include <sys/ioctl.h> #include <sys/mman.h> -#include <sys/stat.h> +#include <sys/select.h> +#include <time.h> #include <unistd.h> - #include <new> +#include <string> #include "media/base/videocommon.h" +#include "modules/video_capture/video_capture.h" #include "rtc_base/logging.h" -#include "rtc_base/refcount.h" #include "rtc_base/refcountedobject.h" #include "rtc_base/scoped_ref_ptr.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/linux/video_capture_linux.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_capture/linux/video_capture_linux.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/linux/video_capture_linux.h @@ -11,9 +11,12 @@ #ifndef MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_VIDEO_CAPTURE_LINUX_H_ #define MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_VIDEO_CAPTURE_LINUX_H_ +#include <stddef.h> +#include <stdint.h> #include <memory> #include "common_types.h" // NOLINT(build/include) +#include "modules/video_capture/video_capture_defines.h" #include "modules/video_capture/video_capture_impl.h" #include "rtc_base/criticalsection.h" #include "rtc_base/platform_thread.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/video_capture_factory.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_capture/video_capture_factory.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/video_capture_factory.h @@ -15,6 +15,8 @@ #define MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_FACTORY_H_ #include "modules/video_capture/video_capture.h" +#include "modules/video_capture/video_capture_defines.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/video_capture_impl.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_capture/video_capture_impl.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/video_capture_impl.cc @@ -9,18 +9,18 @@ */ #include <stdlib.h> +#include <string.h> #include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" +#include "common_types.h" // NOLINT(build/include) #include "common_video/libyuv/include/webrtc_libyuv.h" -#include "modules/include/module_common_types.h" #include "modules/video_capture/video_capture_config.h" #include "modules/video_capture/video_capture_impl.h" #include "rtc_base/logging.h" -#include "rtc_base/refcount.h" #include "rtc_base/refcountedobject.h" #include "rtc_base/timeutils.h" #include "rtc_base/trace_event.h" -#include "system_wrappers/include/clock.h" #include "third_party/libyuv/include/libyuv.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/video_capture_impl.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_capture/video_capture_impl.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_capture/video_capture_impl.h @@ -15,10 +15,15 @@ * video_capture_impl.h */ +#include <stddef.h> +#include <stdint.h> + #include "api/video/video_frame.h" -#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "api/video/video_rotation.h" +#include "api/video/video_sink_interface.h" #include "modules/video_capture/video_capture.h" #include "modules/video_capture/video_capture_config.h" +#include "modules/video_capture/video_capture_defines.h" #include "rtc_base/criticalsection.h" #include "rtc_base/scoped_ref_ptr.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/BUILD.gn @@ -15,9 +15,11 @@ rtc_static_library("encoded_frame") { "encoded_frame.h", ] deps = [ + ":codec_globals_headers", ":video_codec_interface", "../../:webrtc_common", "../../api/video:encoded_image", + "../../api/video:video_frame", "../../api/video:video_frame_i420", "../../modules:module_api", "../../modules:module_api_public", @@ -28,6 +30,7 @@ rtc_static_library("encoded_frame") { "../../rtc_base/experiments:rtt_mult_experiment", "../../system_wrappers:system_wrappers", "//third_party/abseil-cpp/absl/types:optional", + "//third_party/abseil-cpp/absl/types:variant", ] if (!build_with_chromium && is_clang) { @@ -70,15 +73,26 @@ rtc_static_library("packet") { ] deps = [ "..:module_api", + "../../:webrtc_common", + "../../api:libjingle_peerconnection_api", "../rtp_rtcp:rtp_rtcp_format", + "../rtp_rtcp:rtp_video_header", + "//third_party/abseil-cpp/absl/types:optional", ] } rtc_static_library("video_coding") { visibility = [ "*" ] deps = [ + "..:module_fec_api", + "../../api:libjingle_peerconnection_api", + "../../api/video:encoded_image", + "../../api/video:video_bitrate_allocation", + "../../api/video:video_bitrate_allocator_factory", "../../system_wrappers:field_trial", "../../system_wrappers:metrics", + "../rtp_rtcp:rtp_video_header", + "//third_party/abseil-cpp/absl/memory", ] sources = [ @@ -201,6 +215,7 @@ rtc_source_set("video_codec_interface") "../../api/video:video_frame", "../../api/video_codecs:video_codecs_api", "../../common_video:common_video", + "//third_party/abseil-cpp/absl/types:optional", ] } @@ -264,6 +279,7 @@ rtc_source_set("video_coding_utility") { "..:module_api", "../..:webrtc_common", "../../api/video:encoded_image", + "../../api/video:video_bitrate_allocation", "../../api/video:video_bitrate_allocator", "../../api/video_codecs:video_codecs_api", "../../common_video", @@ -298,6 +314,7 @@ rtc_static_library("webrtc_h264") { deps = [ ":video_codec_interface", ":video_coding_utility", + "../../:webrtc_common", "../../api/video:video_frame", "../../api/video:video_frame_i420", "../../api/video_codecs:video_codecs_api", @@ -309,6 +326,7 @@ rtc_static_library("webrtc_h264") { "../../system_wrappers:metrics", "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/strings", + "//third_party/abseil-cpp/absl/types:optional", "//third_party/libyuv", ] @@ -386,6 +404,7 @@ rtc_static_library("webrtc_multiplex") { "../../api/video:video_frame_i420", "../../api/video_codecs:video_codecs_api", "../../common_video:common_video", + "../../rtc_base:checks", "../../rtc_base:rtc_base", "../../system_wrappers", "../rtp_rtcp:rtp_rtcp_format", @@ -420,6 +439,7 @@ rtc_static_library("webrtc_vp8") { "../..:webrtc_common", "../../api/video:encoded_image", "../../api/video:video_frame", + "../../api/video:video_frame_i420", "../../api/video_codecs:create_vp8_temporal_layers", "../../api/video_codecs:video_codecs_api", "../../common_video", @@ -489,8 +509,10 @@ rtc_static_library("webrtc_vp9_helpers") } deps = [ + ":codec_globals_headers", ":video_codec_interface", "../..:webrtc_common", + "../../api/video:video_bitrate_allocation", "../../api/video:video_bitrate_allocator", "../../api/video_codecs:video_codecs_api", "../../common_video", @@ -635,14 +657,19 @@ if (rtc_include_tests) { } deps = [ + ":codec_globals_headers", ":video_codec_interface", ":video_coding", ":video_coding_utility", ":webrtc_vp9_helpers", + "..:module_api", "../..:webrtc_common", "../../api:videocodec_test_fixture_api", "../../api/video:builtin_video_bitrate_allocator_factory", + "../../api/video:encoded_image", + "../../api/video:video_bitrate_allocation", "../../api/video:video_bitrate_allocator", + "../../api/video:video_bitrate_allocator_factory", "../../api/video:video_frame", "../../api/video:video_frame_i420", "../../api/video_codecs:video_codecs_api", @@ -656,6 +683,8 @@ if (rtc_include_tests) { "../../test:video_test_common", "../../test:video_test_support", "../rtp_rtcp:rtp_rtcp_format", + "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/types:optional", "//third_party/libyuv", ] } @@ -704,13 +733,16 @@ if (rtc_include_tests) { "codecs/test/videocodec_test_stats_impl.h", ] deps = [ + ":codec_globals_headers", ":video_codec_interface", ":video_codecs_test_framework", ":video_coding_utility", ":webrtc_vp9_helpers", "../..:webrtc_common", + "../../api:array_view", "../../api:videocodec_test_fixture_api", "../../api/test/video:function_video_factory", + "../../api/video:video_bitrate_allocation", "../../api/video_codecs:video_codecs_api", "../../call:video_stream_api", "../../common_video", @@ -731,6 +763,7 @@ if (rtc_include_tests) { "../../test:video_test_support", "../rtp_rtcp:rtp_rtcp_format", "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/types:optional", ] if (!build_with_chromium && is_clang) { # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). @@ -757,6 +790,7 @@ if (rtc_include_tests) { deps = [ ":mock_headers", + ":video_codec_interface", ":video_codecs_test_framework", ":video_coding_utility", ":videocodec_test_impl", @@ -772,6 +806,7 @@ if (rtc_include_tests) { "../../api:mock_video_encoder", "../../api:videocodec_test_fixture_api", "../../api/test/video:function_video_factory", + "../../api/video:encoded_image", "../../api/video:video_frame", "../../api/video:video_frame_i420", "../../api/video_codecs:rtc_software_fallback_wrappers", @@ -886,14 +921,18 @@ if (rtc_include_tests) { ":webrtc_vp9", ":webrtc_vp9_helpers", "..:module_api", + "..:module_fec_api", "../..:webrtc_common", + "../../api:array_view", "../../api:create_simulcast_test_fixture_api", + "../../api:fec_controller_api", "../../api:mock_video_decoder", "../../api:mock_video_encoder", "../../api:simulcast_test_fixture_api", "../../api:videocodec_test_fixture_api", "../../api/test/video:function_video_factory", "../../api/video:builtin_video_bitrate_allocator_factory", + "../../api/video:video_bitrate_allocation", "../../api/video:video_bitrate_allocator", "../../api/video:video_bitrate_allocator_factory", "../../api/video:video_frame", @@ -920,8 +959,10 @@ if (rtc_include_tests) { "../../test:video_test_common", "../../test:video_test_support", "../rtp_rtcp:rtp_rtcp_format", + "../rtp_rtcp:rtp_video_header", "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/types:optional", + "//third_party/abseil-cpp/absl/types:variant", ] if (rtc_build_libvpx) { deps += [ rtc_libvpx_dir ] Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codec_timer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codec_timer.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codec_timer.cc @@ -10,6 +10,8 @@ #include "modules/video_coding/codec_timer.h" +#include <cstdint> + namespace webrtc { namespace { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/h264/h264.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/h264/h264.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/h264/h264.cc @@ -11,15 +11,19 @@ #include "modules/video_coding/codecs/h264/include/h264.h" +#include <string> + +#include "absl/types/optional.h" #include "api/video_codecs/sdp_video_format.h" +#include "common_types.h" // NOLINT(build/include) #include "media/base/h264_profile_level_id.h" +#include "media/base/mediaconstants.h" #if defined(WEBRTC_USE_H264) #include "modules/video_coding/codecs/h264/h264_decoder_impl.h" #include "modules/video_coding/codecs/h264/h264_encoder_impl.h" #endif -#include "absl/memory/memory.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc @@ -8,10 +8,25 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> +#include <memory> + +#include "absl/types/optional.h" #include "api/video/color_space.h" +#include "api/video/encoded_image.h" +#include "api/video/video_frame.h" +#include "api/video_codecs/video_codec.h" +#include "api/video_codecs/video_decoder.h" +#include "api/video_codecs/video_encoder.h" +#include "common_types.h" // NOLINT(build/include) #include "common_video/libyuv/include/webrtc_libyuv.h" +#include "media/base/codec.h" +#include "media/base/mediaconstants.h" #include "modules/video_coding/codecs/h264/include/h264.h" #include "modules/video_coding/codecs/test/video_codec_unittest.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "test/gtest.h" #include "test/video_codec_settings.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/interface/common_constants.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/interface/common_constants.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/interface/common_constants.h @@ -14,6 +14,8 @@ #ifndef MODULES_VIDEO_CODING_CODECS_INTERFACE_COMMON_CONSTANTS_H_ #define MODULES_VIDEO_CODING_CODECS_INTERFACE_COMMON_CONSTANTS_H_ +#include <stdint.h> + namespace webrtc { const int16_t kNoPictureId = -1; Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/multiplex/augmented_video_frame_buffer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/multiplex/augmented_video_frame_buffer.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/multiplex/augmented_video_frame_buffer.cc @@ -9,6 +9,10 @@ */ #include "modules/video_coding/codecs/multiplex/include/augmented_video_frame_buffer.h" + +#include <stdint.h> +#include <utility> + #include "api/video/video_frame_buffer.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/multiplex/include/augmented_video_frame_buffer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/multiplex/include/augmented_video_frame_buffer.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/multiplex/include/augmented_video_frame_buffer.h @@ -11,9 +11,11 @@ #ifndef MODULES_VIDEO_CODING_CODECS_MULTIPLEX_INCLUDE_AUGMENTED_VIDEO_FRAME_BUFFER_H_ #define MODULES_VIDEO_CODING_CODECS_MULTIPLEX_INCLUDE_AUGMENTED_VIDEO_FRAME_BUFFER_H_ +#include <cstdint> #include <memory> #include "api/video/video_frame_buffer.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { class AugmentedVideoFrameBuffer : public VideoFrameBuffer { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.cc @@ -14,6 +14,7 @@ #include <utility> #include "modules/rtp_rtcp/source/byte_io.h" +#include "rtc_base/checks.h" namespace webrtc { int PackHeader(uint8_t* buffer, MultiplexImageHeader header) { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h @@ -11,6 +11,7 @@ #ifndef MODULES_VIDEO_CODING_CODECS_MULTIPLEX_MULTIPLEX_ENCODED_IMAGE_PACKER_H_ #define MODULES_VIDEO_CODING_CODECS_MULTIPLEX_MULTIPLEX_ENCODED_IMAGE_PACKER_H_ +#include <cstdint> #include <memory> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc @@ -8,10 +8,25 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stddef.h> +#include <cstdint> +#include <memory> +#include <utility> +#include <vector> + #include "absl/memory/memory.h" +#include "absl/types/optional.h" #include "api/test/mock_video_decoder_factory.h" #include "api/test/mock_video_encoder_factory.h" +#include "api/video/encoded_image.h" +#include "api/video/video_frame.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" #include "api/video_codecs/sdp_video_format.h" +#include "api/video_codecs/video_codec.h" +#include "api/video_codecs/video_decoder.h" +#include "api/video_codecs/video_encoder.h" +#include "common_types.h" // NOLINT(build/include) #include "common_video/include/video_frame_buffer.h" #include "common_video/libyuv/include/webrtc_libyuv.h" #include "media/base/mediaconstants.h" @@ -21,7 +36,13 @@ #include "modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h" #include "modules/video_coding/codecs/test/video_codec_unittest.h" #include "modules/video_coding/codecs/vp9/include/vp9.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/keep_ref_until_done.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "test/gmock.h" +#include "test/gtest.h" #include "test/video_codec_settings.h" using testing::_; Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/test/video_codec_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/test/video_codec_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/test/video_codec_unittest.cc @@ -8,9 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_coding/codecs/test/video_codec_unittest.h" +#include <utility> +#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/video_coding/codecs/test/video_codec_unittest.h" #include "modules/video_coding/include/video_error_codes.h" #include "test/video_codec_settings.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/test/videocodec_test_fixture_config_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/test/videocodec_test_fixture_config_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/test/videocodec_test_fixture_config_unittest.cc @@ -8,7 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stddef.h> + #include "api/test/videocodec_test_fixture.h" +#include "api/video_codecs/video_codec.h" +#include "common_types.h" // NOLINT(build/include) #include "test/gmock.h" #include "test/gtest.h" #include "test/video_codec_settings.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc @@ -10,30 +10,43 @@ #include "modules/video_coding/codecs/test/videocodec_test_fixture_impl.h" +#include <stdint.h> +#include <stdio.h> #include <algorithm> #include <cmath> #include <memory> +#include <string> #include <utility> #include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/array_view.h" +#include "api/video/video_bitrate_allocation.h" #include "api/video_codecs/sdp_video_format.h" +#include "api/video_codecs/video_codec.h" +#include "api/video_codecs/video_decoder.h" +#include "api/video_codecs/video_encoder_config.h" #include "common_types.h" // NOLINT(build/include) +#include "common_video/h264/h264_common.h" #include "media/base/h264_profile_level_id.h" #include "media/base/mediaconstants.h" #include "media/engine/internaldecoderfactory.h" #include "media/engine/internalencoderfactory.h" #include "media/engine/simulcast.h" +#include "modules/video_coding/codecs/h264/include/h264_globals.h" #include "modules/video_coding/codecs/vp9/svc_config.h" -#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/utility/ivf_file_writer.h" #include "rtc_base/checks.h" #include "rtc_base/cpu_time.h" #include "rtc_base/event.h" #include "rtc_base/file.h" #include "rtc_base/strings/string_builder.h" +#include "rtc_base/timeutils.h" #include "system_wrappers/include/cpu_info.h" #include "system_wrappers/include/sleep.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" +#include "test/testsupport/frame_writer.h" #include "test/video_codec_settings.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/test/videocodec_test_stats_impl.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/test/videocodec_test_stats_impl.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/test/videocodec_test_stats_impl.h @@ -11,12 +11,11 @@ #ifndef MODULES_VIDEO_CODING_CODECS_TEST_VIDEOCODEC_TEST_STATS_IMPL_H_ #define MODULES_VIDEO_CODING_CODECS_TEST_VIDEOCODEC_TEST_STATS_IMPL_H_ +#include <stddef.h> #include <map> -#include <string> #include <vector> #include "api/test/videocodec_test_stats.h" // NOLINT(build/include) -#include "common_types.h" // NOLINT(build/include) namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor.cc @@ -10,21 +10,27 @@ #include "modules/video_coding/codecs/test/videoprocessor.h" +#include <string.h> #include <algorithm> +#include <cstddef> #include <limits> #include <utility> +#include "absl/memory/memory.h" #include "api/video/builtin_video_bitrate_allocator_factory.h" #include "api/video/i420_buffer.h" +#include "api/video/video_bitrate_allocator_factory.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" +#include "api/video_codecs/video_codec.h" #include "common_types.h" // NOLINT(build/include) #include "common_video/h264/h264_common.h" #include "common_video/libyuv/include/webrtc_libyuv.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "modules/video_coding/include/video_codec_initializer.h" +#include "modules/video_coding/codecs/interface/common_constants.h" #include "modules/video_coding/include/video_error_codes.h" -#include "modules/video_coding/utility/default_video_bitrate_allocator.h" -#include "modules/video_coding/utility/simulcast_rate_allocator.h" #include "rtc_base/checks.h" +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/timeutils.h" #include "test/gtest.h" #include "third_party/libyuv/include/libyuv/compare.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor.h @@ -11,21 +11,32 @@ #ifndef MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_H_ #define MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_H_ +#include <stddef.h> +#include <stdint.h> #include <map> #include <memory> -#include <string> #include <vector> +#include "absl/types/optional.h" #include "api/test/videocodec_test_fixture.h" #include "api/test/videocodec_test_stats.h" +#include "api/video/encoded_image.h" +#include "api/video/video_bitrate_allocation.h" #include "api/video/video_bitrate_allocator.h" #include "api/video/video_frame.h" +#include "api/video_codecs/video_decoder.h" +#include "api/video_codecs/video_encoder.h" +#include "common_types.h" // NOLINT(build/include) +#include "modules/include/module_common_types.h" #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/utility/ivf_file_writer.h" #include "rtc_base/buffer.h" +#include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" #include "rtc_base/sequenced_task_checker.h" #include "rtc_base/task_queue.h" +#include "rtc_base/thread_annotations.h" +#include "rtc_base/thread_checker.h" #include "test/testsupport/frame_reader.h" #include "test/testsupport/frame_writer.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc @@ -15,12 +15,10 @@ #include "api/test/mock_video_encoder.h" #include "api/test/videocodec_test_fixture.h" #include "api/video/i420_buffer.h" -#include "common_types.h" // NOLINT(build/include) #include "media/base/mediaconstants.h" #include "modules/video_coding/codecs/test/videocodec_test_stats_impl.h" #include "modules/video_coding/codecs/test/videoprocessor.h" -#include "modules/video_coding/include/video_coding.h" -#include "rtc_base/event.h" +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/task_queue_for_test.h" #include "test/gmock.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h @@ -12,6 +12,8 @@ #ifndef MODULES_VIDEO_CODING_CODECS_VP8_DEFAULT_TEMPORAL_LAYERS_H_ #define MODULES_VIDEO_CODING_CODECS_VP8_DEFAULT_TEMPORAL_LAYERS_H_ +#include <stddef.h> +#include <stdint.h> #include <limits> #include <map> #include <memory> @@ -19,9 +21,9 @@ #include <vector> #include "absl/types/optional.h" - #include "api/video_codecs/vp8_temporal_layers.h" #include "modules/video_coding/codecs/vp8/include/temporal_layers_checker.h" +#include "modules/video_coding/include/video_codec_interface.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc @@ -9,11 +9,18 @@ */ #include "modules/video_coding/codecs/vp8/default_temporal_layers.h" + +#include <cstdint> + +#include "api/video/video_bitrate_allocation.h" +#include "api/video_codecs/video_codec.h" +#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h" #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/utility/simulcast_rate_allocator.h" #include "test/field_trial.h" #include "test/gtest.h" +#include "vpx/vp8cx.h" namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp8/libvpx_interface.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/vp8/libvpx_interface.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp8/libvpx_interface.h @@ -11,10 +11,13 @@ #ifndef MODULES_VIDEO_CODING_CODECS_VP8_LIBVPX_INTERFACE_H_ #define MODULES_VIDEO_CODING_CODECS_VP8_LIBVPX_INTERFACE_H_ +#include <stdint.h> #include <memory> #include "vpx/vp8cx.h" +#include "vpx/vpx_codec.h" #include "vpx/vpx_encoder.h" +#include "vpx/vpx_image.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc @@ -8,18 +8,31 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdio.h> +#include <string.h> #include <algorithm> #include <string> #include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/video/i420_buffer.h" +#include "api/video/video_frame.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" +#include "common_types.h" // NOLINT(build/include) +#include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h" +#include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/checks.h" #include "rtc_base/numerics/exp_filter.h" +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/timeutils.h" #include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/metrics.h" #include "third_party/libyuv/include/libyuv/convert.h" -#include "third_party/libyuv/include/libyuv/scale.h" +#include "vpx/vp8.h" +#include "vpx/vp8dx.h" +#include "vpx/vpx_decoder.h" namespace webrtc { namespace { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc @@ -8,24 +8,33 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <assert.h> +#include <string.h> #include <algorithm> +#include <cstdint> #include <string> #include <utility> #include <vector> #include "absl/memory/memory.h" +#include "api/video/video_content_type.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_timing.h" #include "api/video_codecs/create_vp8_temporal_layers.h" #include "api/video_codecs/vp8_temporal_layers.h" #include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/video_coding/codecs/interface/common_constants.h" +#include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h" +#include "modules/video_coding/include/video_error_codes.h" #include "modules/video_coding/utility/simulcast_rate_allocator.h" #include "modules/video_coding/utility/simulcast_utility.h" #include "rtc_base/checks.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/field_trial.h" -#include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/scale.h" +#include "vpx/vp8cx.h" namespace webrtc { namespace { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc @@ -8,16 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdlib.h> +#include <string.h> +#include <cstdint> #include <memory> #include <vector> +#include "modules/video_coding/codecs/interface/common_constants.h" #include "modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h" #include "modules/video_coding/codecs/vp8/screenshare_layers.h" #include "modules/video_coding/include/video_codec_interface.h" +#include "rtc_base/checks.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/metrics.h" #include "test/gmock.h" #include "test/gtest.h" +#include "vpx/vp8cx.h" using ::testing::_; using ::testing::ElementsAre; Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp9/include/vp9_globals.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/vp9/include/vp9_globals.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp9/include/vp9_globals.h @@ -15,6 +15,7 @@ #define MODULES_VIDEO_CODING_CODECS_VP9_INCLUDE_VP9_GLOBALS_H_ #include <assert.h> +#include <stdint.h> #include "modules/video_coding/codecs/interface/common_constants.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp9/svc_config.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/vp9/svc_config.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp9/svc_config.h @@ -10,6 +10,7 @@ #ifndef MODULES_VIDEO_CODING_CODECS_VP9_SVC_CONFIG_H_ #define MODULES_VIDEO_CODING_CODECS_VP9_SVC_CONFIG_H_ +#include <stddef.h> #include <vector> #include "common_types.h" // NOLINT(build/include) Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp9/svc_config_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/vp9/svc_config_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp9/svc_config_unittest.cc @@ -9,7 +9,6 @@ */ #include <cstddef> -#include <cstdint> #include <vector> #include "modules/video_coding/codecs/vp9/include/vp9_globals.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp9/svc_rate_allocator.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/vp9/svc_rate_allocator.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp9/svc_rate_allocator.cc @@ -12,8 +12,10 @@ #include <algorithm> #include <cmath> +#include <cstddef> #include <numeric> +#include "common_types.h" // NOLINT(build/include) #include "rtc_base/checks.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp9/svc_rate_allocator.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/vp9/svc_rate_allocator.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp9/svc_rate_allocator.h @@ -11,10 +11,11 @@ #ifndef MODULES_VIDEO_CODING_CODECS_VP9_SVC_RATE_ALLOCATOR_H_ #define MODULES_VIDEO_CODING_CODECS_VP9_SVC_RATE_ALLOCATOR_H_ +#include <stddef.h> #include <stdint.h> - #include <vector> +#include "api/video/video_bitrate_allocation.h" #include "api/video/video_bitrate_allocator.h" #include "api/video_codecs/video_codec.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc @@ -10,8 +10,10 @@ #include <algorithm> +#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/vp9/svc_config.h" #include "modules/video_coding/codecs/vp9/svc_rate_allocator.h" +#include "rtc_base/checks.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/decoding_state_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/decoding_state_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/decoding_state_unittest.cc @@ -8,13 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <string.h> - -#include "modules/include/module_common_types.h" #include "modules/video_coding/decoding_state.h" +#include "common_types.h" // NOLINT(build/include) +#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" #include "modules/video_coding/frame_buffer.h" -#include "modules/video_coding/jitter_buffer_common.h" +#include "modules/video_coding/include/video_coding.h" #include "modules/video_coding/packet.h" +#include "modules/video_coding/session_info.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/encoded_frame.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/encoded_frame.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/encoded_frame.cc @@ -10,6 +10,14 @@ #include "modules/video_coding/encoded_frame.h" +#include <string.h> + +#include "absl/types/variant.h" +#include "api/video/video_timing.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 { VCMEncodedFrame::VCMEncodedFrame() Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/encoder_database.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/encoder_database.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/encoder_database.cc @@ -10,6 +10,9 @@ #include "modules/video_coding/encoder_database.h" +#include <string.h> + +#include "common_types.h" // NOLINT(build/include) #include "rtc_base/checks.h" #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/encoder_database.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/encoder_database.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/encoder_database.h @@ -11,8 +11,11 @@ #ifndef MODULES_VIDEO_CODING_ENCODER_DATABASE_H_ #define MODULES_VIDEO_CODING_ENCODER_DATABASE_H_ +#include <stddef.h> #include <memory> +#include "api/video_codecs/video_codec.h" +#include "api/video_codecs/video_encoder.h" #include "modules/video_coding/generic_encoder.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/fec_controller_default.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/fec_controller_default.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/fec_controller_default.cc @@ -8,8 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdlib.h> #include <algorithm> +#include <string> +#include "modules/include/module_fec_types.h" #include "modules/video_coding/fec_controller_default.h" // NOLINT #include "rtc_base/logging.h" #include "system_wrappers/include/field_trial.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/fec_controller_default.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/fec_controller_default.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/fec_controller_default.h @@ -11,12 +11,17 @@ #ifndef MODULES_VIDEO_CODING_FEC_CONTROLLER_DEFAULT_H_ #define MODULES_VIDEO_CODING_FEC_CONTROLLER_DEFAULT_H_ +#include <stddef.h> +#include <stdint.h> #include <memory> #include <vector> + #include "api/fec_controller.h" -#include "modules/include/module_common_types.h" +#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/media_opt_util.h" +#include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" #include "system_wrappers/include/clock.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/fec_controller_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/fec_controller_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/fec_controller_unittest.cc @@ -8,6 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> +#include <vector> + +#include "api/fec_controller.h" +#include "modules/include/module_fec_types.h" #include "modules/video_coding/fec_controller_default.h" #include "system_wrappers/include/clock.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/frame_buffer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/frame_buffer.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/frame_buffer.cc @@ -13,6 +13,10 @@ #include <assert.h> #include <string.h> +#include "api/video/encoded_image.h" +#include "api/video/video_timing.h" +#include "modules/rtp_rtcp/source/rtp_video_header.h" +#include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/packet.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/frame_buffer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/frame_buffer.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/frame_buffer.h @@ -11,12 +11,17 @@ #ifndef MODULES_VIDEO_CODING_FRAME_BUFFER_H_ #define MODULES_VIDEO_CODING_FRAME_BUFFER_H_ +#include <stddef.h> +#include <stdint.h> #include <vector> -#include "modules/include/module_common_types.h" +#include "common_types.h" // NOLINT(build/include) +#include "modules/video_coding/codecs/h264/include/h264_globals.h" +#include "modules/video_coding/codecs/vp9/include/vp9_globals.h" #include "modules/video_coding/encoded_frame.h" #include "modules/video_coding/include/video_coding.h" #include "modules/video_coding/jitter_buffer_common.h" +#include "modules/video_coding/packet.h" #include "modules/video_coding/session_info.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/frame_buffer2.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/frame_buffer2.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/frame_buffer2.cc @@ -11,15 +11,22 @@ #include "modules/video_coding/frame_buffer2.h" #include <algorithm> -#include <cstring> +#include <cstdlib> +#include <iterator> #include <queue> +#include <utility> #include <vector> +#include "api/video/encoded_image.h" +#include "api/video/video_timing.h" +#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/include/video_coding_defines.h" #include "modules/video_coding/jitter_estimator.h" #include "modules/video_coding/timing.h" #include "rtc_base/checks.h" +#include "rtc_base/experiments/rtt_mult_experiment.h" #include "rtc_base/logging.h" +#include "rtc_base/numerics/sequence_number_util.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/field_trial.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/frame_object.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/frame_object.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/frame_object.cc @@ -10,9 +10,14 @@ #include "modules/video_coding/frame_object.h" -#include "common_video/h264/h264_common.h" +#include <string.h> + +#include "api/video/encoded_image.h" +#include "api/video/video_timing.h" +#include "modules/video_coding/packet.h" #include "modules/video_coding/packet_buffer.h" #include "rtc_base/checks.h" +#include "rtc_base/criticalsection.h" namespace webrtc { namespace video_coding { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/generic_decoder.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/generic_decoder.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/generic_decoder.cc @@ -10,10 +10,11 @@ #include "modules/video_coding/generic_decoder.h" +#include <stddef.h> #include <algorithm> -#include "modules/video_coding/include/video_coding.h" -#include "modules/video_coding/internal_defines.h" +#include "api/video/video_timing.h" +#include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/timeutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/generic_encoder.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/generic_encoder.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/generic_encoder.cc @@ -10,19 +10,24 @@ #include "modules/video_coding/generic_encoder.h" +#include <cstddef> +#include <cstdint> #include <vector> #include "absl/types/optional.h" #include "api/video/i420_buffer.h" +#include "api/video/video_content_type.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" +#include "api/video/video_timing.h" #include "modules/include/module_common_types_public.h" -#include "modules/video_coding/encoded_frame.h" +#include "modules/video_coding/include/video_coding_defines.h" #include "modules/video_coding/media_optimization.h" #include "rtc_base/checks.h" #include "rtc_base/experiments/alr_experiment.h" #include "rtc_base/logging.h" #include "rtc_base/timeutils.h" #include "rtc_base/trace_event.h" -#include "system_wrappers/include/field_trial.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/generic_encoder_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/generic_encoder_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/generic_encoder_unittest.cc @@ -8,12 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <cstddef> #include <vector> -#include "modules/video_coding/encoded_frame.h" +#include "api/video/video_timing.h" #include "modules/video_coding/generic_encoder.h" #include "modules/video_coding/include/video_coding_defines.h" #include "rtc_base/fakeclock.h" +#include "rtc_base/timeutils.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/h264_sprop_parameter_sets.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/h264_sprop_parameter_sets.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/h264_sprop_parameter_sets.cc @@ -10,6 +10,8 @@ #include "modules/video_coding/h264_sprop_parameter_sets.h" +#include <stddef.h> +#include <stdint.h> #include <string> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/h264_sprop_parameter_sets.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/h264_sprop_parameter_sets.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/h264_sprop_parameter_sets.h @@ -11,6 +11,7 @@ #ifndef MODULES_VIDEO_CODING_H264_SPROP_PARAMETER_SETS_H_ #define MODULES_VIDEO_CODING_H264_SPROP_PARAMETER_SETS_H_ +#include <cstdint> #include <string> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/h264_sprop_parameter_sets_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/h264_sprop_parameter_sets_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/h264_sprop_parameter_sets_unittest.cc @@ -10,8 +10,6 @@ #include "modules/video_coding/h264_sprop_parameter_sets.h" -#include <stdint.h> - #include <vector> #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/h264_sps_pps_tracker_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/h264_sps_pps_tracker_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/h264_sps_pps_tracker_unittest.cc @@ -10,9 +10,14 @@ #include "modules/video_coding/h264_sps_pps_tracker.h" +#include <string.h> #include <vector> +#include "absl/types/variant.h" +#include "common_types.h" // NOLINT(build/include) #include "common_video/h264/h264_common.h" +#include "modules/rtp_rtcp/source/rtp_video_header.h" +#include "modules/video_coding/codecs/h264/include/h264_globals.h" #include "modules/video_coding/packet.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/histogram.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/histogram.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/histogram.cc @@ -12,7 +12,7 @@ #include <algorithm> -#include "rtc_base/numerics/sequence_number_util.h" +#include "rtc_base/checks.h" namespace webrtc { namespace video_coding { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/include/video_coding_defines.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/include/video_coding_defines.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/include/video_coding_defines.h @@ -11,11 +11,14 @@ #ifndef MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ #define MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ -#include <string> -#include <vector> +#include <stddef.h> +#include <stdint.h> +#include "absl/types/optional.h" +#include "api/video/video_content_type.h" #include "api/video/video_frame.h" -#include "modules/include/module_common_types.h" +#include "api/video/video_timing.h" +#include "common_types.h" // NOLINT(build/include) namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/jitter_estimator.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/jitter_estimator.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/jitter_estimator.cc @@ -12,17 +12,16 @@ #include <assert.h> #include <math.h> -#include <stdlib.h> #include <string.h> #include <algorithm> -#include <string> +#include <cstdint> #include "absl/types/optional.h" #include "modules/video_coding/internal_defines.h" #include "modules/video_coding/rtt_filter.h" #include "rtc_base/experiments/jitter_upper_bound_experiment.h" +#include "rtc_base/numerics/safe_conversions.h" #include "system_wrappers/include/clock.h" -#include "system_wrappers/include/field_trial.h" namespace webrtc { namespace { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/jitter_estimator_tests.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/jitter_estimator_tests.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/jitter_estimator_tests.cc @@ -7,11 +7,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_coding/jitter_estimator.h" +#include <stdint.h> +#include <memory> +#include <vector> +#include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/array_view.h" +#include "modules/video_coding/jitter_estimator.h" #include "rtc_base/experiments/jitter_upper_bound_experiment.h" -#include "rtc_base/logging.h" #include "rtc_base/numerics/histogram_percentile_counter.h" +#include "rtc_base/strings/string_builder.h" #include "rtc_base/timeutils.h" #include "system_wrappers/include/clock.h" #include "test/field_trial.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/media_opt_util.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/media_opt_util.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/media_opt_util.cc @@ -10,18 +10,14 @@ #include "modules/video_coding/media_opt_util.h" -#include <float.h> -#include <limits.h> +#include <assert.h> #include <math.h> - #include <algorithm> -#include <limits> -#include "modules/include/module_common_types.h" #include "modules/video_coding/fec_rate_table.h" -#include "modules/video_coding/include/video_coding_defines.h" -#include "modules/video_coding/nack_fec_tables.h" +#include "modules/video_coding/internal_defines.h" #include "modules/video_coding/utility/simulcast_rate_allocator.h" +#include "rtc_base/checks.h" #include "rtc_base/numerics/safe_conversions.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/media_optimization.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/media_optimization.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/media_optimization.cc @@ -10,6 +10,8 @@ #include "modules/video_coding/media_optimization.h" +#include <string.h> +#include <algorithm> #include <limits> #include "modules/video_coding/utility/frame_dropper.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/nack_module.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/nack_module.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/nack_module.h @@ -11,6 +11,7 @@ #ifndef MODULES_VIDEO_CODING_NACK_MODULE_H_ #define MODULES_VIDEO_CODING_NACK_MODULE_H_ +#include <stdint.h> #include <map> #include <set> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/nack_module_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/nack_module_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/nack_module_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <cstdint> #include <cstring> #include <memory> -#include "modules/video_coding/include/video_coding_defines.h" #include "modules/video_coding/nack_module.h" #include "system_wrappers/include/clock.h" #include "test/field_trial.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/packet.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/packet.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/packet.cc @@ -10,6 +10,7 @@ #include "modules/video_coding/packet.h" +#include "api/rtp_headers.h" #include "modules/include/module_common_types.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/packet.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/packet.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/packet.h @@ -11,8 +11,14 @@ #ifndef MODULES_VIDEO_CODING_PACKET_H_ #define MODULES_VIDEO_CODING_PACKET_H_ +#include <stddef.h> +#include <stdint.h> + +#include "absl/types/optional.h" +#include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h" +#include "modules/rtp_rtcp/source/rtp_video_header.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/packet_buffer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/packet_buffer.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/packet_buffer.cc @@ -10,15 +10,22 @@ #include "modules/video_coding/packet_buffer.h" +#include <string.h> #include <algorithm> -#include <limits> +#include <cstdint> #include <utility> +#include "absl/types/variant.h" +#include "api/video/encoded_frame.h" +#include "common_types.h" // NOLINT(build/include) #include "common_video/h264/h264_common.h" +#include "modules/rtp_rtcp/source/rtp_video_header.h" +#include "modules/video_coding/codecs/h264/include/h264_globals.h" #include "modules/video_coding/frame_object.h" #include "rtc_base/atomicops.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/numerics/mod_ops.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/field_trial.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/receiver.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/receiver.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/receiver.cc @@ -11,14 +11,17 @@ #include "modules/video_coding/receiver.h" #include <assert.h> - +#include <cstdint> #include <cstdlib> #include <utility> #include <vector> +#include "absl/memory/memory.h" +#include "api/video/encoded_image.h" +#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/encoded_frame.h" #include "modules/video_coding/internal_defines.h" -#include "modules/video_coding/media_opt_util.h" +#include "modules/video_coding/jitter_buffer_common.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/trace_event.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/receiver_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/receiver_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/receiver_unittest.cc @@ -8,13 +8,14 @@ */ #include <string.h> - -#include <list> +#include <cstdint> #include <memory> #include <queue> #include <vector> +#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/encoded_frame.h" +#include "modules/video_coding/jitter_buffer_common.h" #include "modules/video_coding/packet.h" #include "modules/video_coding/receiver.h" #include "modules/video_coding/test/stream_generator.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/session_info.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/session_info.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/session_info.cc @@ -9,6 +9,17 @@ */ #include "modules/video_coding/session_info.h" + +#include <assert.h> +#include <string.h> +#include <vector> + +#include "absl/types/variant.h" +#include "modules/include/module_common_types.h" +#include "modules/include/module_common_types_public.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/jitter_buffer_common.h" #include "modules/video_coding/packet.h" #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/session_info.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/session_info.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/session_info.h @@ -11,10 +11,14 @@ #ifndef MODULES_VIDEO_CODING_SESSION_INFO_H_ #define MODULES_VIDEO_CODING_SESSION_INFO_H_ +#include <stddef.h> +#include <stdint.h> #include <list> #include <vector> -#include "modules/include/module_common_types.h" +#include "common_types.h" // NOLINT(build/include) +#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_coding.h" #include "modules/video_coding/packet.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/test/stream_generator.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/test/stream_generator.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/test/stream_generator.cc @@ -11,11 +11,10 @@ #include "modules/video_coding/test/stream_generator.h" #include <string.h> - #include <list> +#include "modules/include/module_common_types.h" #include "modules/video_coding/packet.h" -#include "system_wrappers/include/clock.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/test/stream_generator.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/test/stream_generator.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/test/stream_generator.h @@ -10,8 +10,10 @@ #ifndef MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_ #define MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_ +#include <stdint.h> #include <list> +#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/packet.h" #include "rtc_base/constructormagic.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/timestamp_map.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/timestamp_map.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/timestamp_map.cc @@ -10,7 +10,7 @@ #include <stdlib.h> -#include "modules/include/module_common_types.h" +#include "modules/include/module_common_types_public.h" #include "modules/video_coding/timestamp_map.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/timing.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/timing.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/timing.cc @@ -10,6 +10,7 @@ #include "modules/video_coding/timing.h" +#include <assert.h> #include <algorithm> #include "rtc_base/time/timestamp_extrapolator.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc @@ -10,8 +10,8 @@ #include "modules/video_coding/utility/default_video_bitrate_allocator.h" +#include <stddef.h> #include <stdint.h> - #include <algorithm> namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h @@ -11,6 +11,9 @@ #ifndef MODULES_VIDEO_CODING_UTILITY_DEFAULT_VIDEO_BITRATE_ALLOCATOR_H_ #define MODULES_VIDEO_CODING_UTILITY_DEFAULT_VIDEO_BITRATE_ALLOCATOR_H_ +#include <stdint.h> + +#include "api/video/video_bitrate_allocation.h" #include "api/video/video_bitrate_allocator.h" #include "api/video_codecs/video_codec.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc @@ -11,6 +11,7 @@ #include <limits> #include <memory> +#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/utility/default_video_bitrate_allocator.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/frame_dropper_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/utility/frame_dropper_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/frame_dropper_unittest.cc @@ -10,7 +10,6 @@ #include "modules/video_coding/utility/frame_dropper.h" -#include "rtc_base/logging.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/framerate_controller.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/utility/framerate_controller.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/framerate_controller.cc @@ -10,7 +10,8 @@ #include "modules/video_coding/utility/framerate_controller.h" -#include "rtc_base/checks.h" +#include <stddef.h> +#include <cstdint> namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/framerate_controller.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/utility/framerate_controller.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/framerate_controller.h @@ -11,6 +11,8 @@ #ifndef MODULES_VIDEO_CODING_UTILITY_FRAMERATE_CONTROLLER_H_ #define MODULES_VIDEO_CODING_UTILITY_FRAMERATE_CONTROLLER_H_ +#include <stdint.h> + #include "absl/types/optional.h" #include "rtc_base/rate_statistics.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/framerate_controller_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/utility/framerate_controller_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/framerate_controller_unittest.cc @@ -10,6 +10,8 @@ #include "modules/video_coding/utility/framerate_controller.h" +#include <stddef.h> + #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/ivf_file_writer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/utility/ivf_file_writer.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/ivf_file_writer.cc @@ -10,7 +10,6 @@ #include "modules/video_coding/utility/ivf_file_writer.h" -#include <string> #include <utility> #include "api/video_codecs/video_codec.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/ivf_file_writer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/utility/ivf_file_writer.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/ivf_file_writer.h @@ -11,11 +11,12 @@ #ifndef MODULES_VIDEO_CODING_UTILITY_IVF_FILE_WRITER_H_ #define MODULES_VIDEO_CODING_UTILITY_IVF_FILE_WRITER_H_ +#include <stddef.h> +#include <stdint.h> #include <memory> -#include <string> #include "api/video/encoded_image.h" -#include "modules/include/module_common_types.h" +#include "common_types.h" // NOLINT(build/include) #include "rtc_base/constructormagic.h" #include "rtc_base/file.h" #include "rtc_base/timeutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/ivf_file_writer_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/utility/ivf_file_writer_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/ivf_file_writer_unittest.cc @@ -10,13 +10,12 @@ #include "modules/video_coding/utility/ivf_file_writer.h" +#include <string.h> #include <memory> +#include <string> #include "modules/rtp_rtcp/source/byte_io.h" -#include "rtc_base/helpers.h" -#include "rtc_base/logging.h" -#include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/platform_file.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/quality_scaler.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/utility/quality_scaler.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/quality_scaler.cc @@ -10,11 +10,9 @@ #include "modules/video_coding/utility/quality_scaler.h" -#include <math.h> - -#include <algorithm> #include <memory> +#include "absl/types/optional.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/exp_filter.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/quality_scaler.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/utility/quality_scaler.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/quality_scaler.h @@ -11,15 +11,15 @@ #ifndef MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_ #define MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_ +#include <stddef.h> +#include <stdint.h> #include <memory> -#include <utility> -#include "absl/types/optional.h" #include "api/video_codecs/video_encoder.h" -#include "common_types.h" // NOLINT(build/include) #include "rtc_base/experiments/quality_scaling_experiment.h" #include "rtc_base/numerics/moving_average.h" #include "rtc_base/sequenced_task_checker.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { @@ -66,6 +66,7 @@ class QualityScaler { private: class CheckQpTask; class QpSmoother; + void CheckQp(); void ClearSamples(); void ReportQpLow(); Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/quality_scaler_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/utility/quality_scaler_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/quality_scaler_unittest.cc @@ -13,10 +13,10 @@ #include <memory> #include <string> +#include "rtc_base/checks.h" #include "rtc_base/event.h" #include "rtc_base/task_queue.h" #include "test/field_trial.h" -#include "test/gmock.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/simulcast_rate_allocator.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/utility/simulcast_rate_allocator.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/simulcast_rate_allocator.cc @@ -10,10 +10,10 @@ #include "modules/video_coding/utility/simulcast_rate_allocator.h" +#include <stdio.h> #include <algorithm> -#include <memory> +#include <cstdint> #include <string> -#include <utility> #include <vector> #include "common_types.h" // NOLINT(build/include) Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/simulcast_rate_allocator.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/utility/simulcast_rate_allocator.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/simulcast_rate_allocator.h @@ -11,15 +11,13 @@ #ifndef MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_ #define MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_ +#include <stddef.h> #include <stdint.h> - -#include <map> -#include <memory> #include <vector> +#include "api/video/video_bitrate_allocation.h" #include "api/video/video_bitrate_allocator.h" -#include "api/video_codecs/video_encoder.h" -#include "common_types.h" // NOLINT(build/include) +#include "api/video_codecs/video_codec.h" #include "rtc_base/constructormagic.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/simulcast_utility.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/utility/simulcast_utility.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/simulcast_utility.cc @@ -10,7 +10,9 @@ #include <algorithm> +#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/utility/simulcast_utility.h" +#include "rtc_base/checks.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/simulcast_utility.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/utility/simulcast_utility.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/utility/simulcast_utility.h @@ -11,7 +11,9 @@ #ifndef MODULES_VIDEO_CODING_UTILITY_SIMULCAST_UTILITY_H_ #define MODULES_VIDEO_CODING_UTILITY_SIMULCAST_UTILITY_H_ -#include "api/video_codecs/video_encoder.h" +#include <stdint.h> + +#include "api/video_codecs/video_codec.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/video_codec_initializer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/video_codec_initializer.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/video_codec_initializer.cc @@ -10,17 +10,19 @@ #include "modules/video_coding/include/video_codec_initializer.h" -#include "api/video/video_bitrate_allocator.h" +#include <stdint.h> +#include <string.h> +#include <algorithm> + +#include "absl/types/optional.h" +#include "api/video/video_bitrate_allocation.h" #include "api/video_codecs/video_encoder.h" #include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/vp9/svc_config.h" -#include "modules/video_coding/codecs/vp9/svc_rate_allocator.h" #include "modules/video_coding/include/video_coding_defines.h" -#include "modules/video_coding/utility/default_video_bitrate_allocator.h" -#include "modules/video_coding/utility/simulcast_rate_allocator.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/system/fallthrough.h" -#include "system_wrappers/include/clock.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/video_codec_initializer_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/video_codec_initializer_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/video_codec_initializer_unittest.cc @@ -9,7 +9,16 @@ */ #include "modules/video_coding/include/video_codec_initializer.h" + +#include <stddef.h> +#include <stdint.h> +#include <memory> + +#include "absl/types/optional.h" #include "api/video/builtin_video_bitrate_allocator_factory.h" +#include "api/video/video_bitrate_allocation.h" +#include "api/video/video_bitrate_allocator.h" +#include "api/video/video_bitrate_allocator_factory.h" #include "api/video_codecs/create_vp8_temporal_layers.h" #include "api/video_codecs/video_encoder.h" #include "api/video_codecs/vp8_temporal_layers.h" @@ -17,6 +26,7 @@ #include "modules/video_coding/codecs/vp9/include/vp9_globals.h" #include "rtc_base/checks.h" #include "rtc_base/refcountedobject.h" +#include "rtc_base/scoped_ref_ptr.h" #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/video_coding_impl.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/video_coding_impl.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/video_coding_impl.cc @@ -11,17 +11,14 @@ #include "modules/video_coding/video_coding_impl.h" #include <algorithm> -#include <utility> +#include <memory> #include "api/video/builtin_video_bitrate_allocator_factory.h" +#include "api/video/encoded_image.h" #include "api/video/video_bitrate_allocator.h" +#include "api/video/video_bitrate_allocator_factory.h" #include "common_types.h" // NOLINT(build/include) -#include "common_video/libyuv/include/webrtc_libyuv.h" -#include "modules/video_coding/encoded_frame.h" -#include "modules/video_coding/include/video_codec_initializer.h" #include "modules/video_coding/include/video_codec_interface.h" -#include "modules/video_coding/jitter_buffer.h" -#include "modules/video_coding/packet.h" #include "modules/video_coding/timing.h" #include "rtc_base/criticalsection.h" #include "rtc_base/thread_checker.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/video_receiver.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/video_receiver.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/video_receiver.cc @@ -8,17 +8,34 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stddef.h> +#include <cstdint> +#include <vector> + +#include "api/rtp_headers.h" +#include "api/video_codecs/video_codec.h" +#include "api/video_codecs/video_decoder.h" #include "common_types.h" // NOLINT(build/include) -#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "modules/include/module_common_types.h" #include "modules/utility/include/process_thread.h" +#include "modules/video_coding/decoder_database.h" #include "modules/video_coding/encoded_frame.h" -#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/generic_decoder.h" +#include "modules/video_coding/include/video_coding.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "modules/video_coding/internal_defines.h" #include "modules/video_coding/jitter_buffer.h" +#include "modules/video_coding/media_opt_util.h" #include "modules/video_coding/packet.h" +#include "modules/video_coding/receiver.h" +#include "modules/video_coding/timing.h" #include "modules/video_coding/video_coding_impl.h" #include "rtc_base/checks.h" +#include "rtc_base/criticalsection.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" +#include "rtc_base/onetimeevent.h" +#include "rtc_base/thread_checker.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/clock.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/video_sender.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_coding/video_sender.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_coding/video_sender.cc @@ -8,19 +8,31 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stddef.h> +#include <stdint.h> +#include <vector> -#include <algorithm> // std::max - +#include "api/video/video_bitrate_allocation.h" #include "api/video/video_bitrate_allocator.h" +#include "api/video/video_frame.h" +#include "api/video/video_frame_buffer.h" +#include "api/video_codecs/video_codec.h" +#include "api/video_codecs/video_encoder.h" #include "common_types.h" // NOLINT(build/include) -#include "common_video/libyuv/include/webrtc_libyuv.h" -#include "modules/video_coding/encoded_frame.h" +#include "modules/video_coding/encoder_database.h" +#include "modules/video_coding/generic_encoder.h" #include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "modules/video_coding/internal_defines.h" +#include "modules/video_coding/media_optimization.h" #include "modules/video_coding/utility/default_video_bitrate_allocator.h" -#include "modules/video_coding/utility/quality_scaler.h" #include "modules/video_coding/video_coding_impl.h" #include "rtc_base/checks.h" +#include "rtc_base/criticalsection.h" #include "rtc_base/logging.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/sequenced_task_checker.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/field_trial.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_processing/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/BUILD.gn @@ -27,6 +27,8 @@ rtc_static_library("video_processing") { deps = [ ":denoiser_filter", "..:module_api", + "../../api/video:video_frame", + "../../api/video:video_frame_i420", "../../common_audio", "../../common_video", "../../modules/utility", @@ -110,8 +112,12 @@ if (rtc_include_tests) { "test/denoiser_test.cc", ] deps = [ + ":denoiser_filter", ":video_processing", + "../../api/video:video_frame", + "../../api/video:video_frame_i420", "../../common_video:common_video", + "../../rtc_base:ptr_util", "../../test:fileutils", "../../test:test_support", "../../test:video_test_common", Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/test/denoiser_test.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_processing/test/denoiser_test.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/test/denoiser_test.cc @@ -8,12 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> +#include <stdio.h> #include <string.h> - #include <memory> +#include <string> -#include "common_video/include/i420_buffer_pool.h" +#include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" +#include "modules/video_processing/util/denoiser_filter.h" +#include "modules/video_processing/util/skin_detection.h" #include "modules/video_processing/video_denoiser.h" +#include "rtc_base/scoped_ref_ptr.h" #include "test/frame_utils.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/util/denoiser_filter.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_processing/util/denoiser_filter.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/util/denoiser_filter.h @@ -11,11 +11,9 @@ #ifndef MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_H_ #define MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_H_ -#include <climits> +#include <stdint.h> #include <memory> -#include "modules/include/module_common_types.h" - namespace webrtc { extern const int kMotionMagnitudeThreshold; Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/util/denoiser_filter_c.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_processing/util/denoiser_filter_c.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/util/denoiser_filter_c.cc @@ -9,6 +9,7 @@ */ #include <stdlib.h> +#include <string.h> #include "modules/video_processing/util/denoiser_filter_c.h" Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/util/denoiser_filter_c.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_processing/util/denoiser_filter_c.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/util/denoiser_filter_c.h @@ -11,6 +11,8 @@ #ifndef MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_C_H_ #define MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_C_H_ +#include <stdint.h> + #include "modules/video_processing/util/denoiser_filter.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/util/denoiser_filter_sse2.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_processing/util/denoiser_filter_sse2.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/util/denoiser_filter_sse2.cc @@ -9,7 +9,10 @@ */ #include "modules/video_processing/util/denoiser_filter_sse2.h" + #include <emmintrin.h> +#include <stdlib.h> +#include <string.h> namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/util/denoiser_filter_sse2.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_processing/util/denoiser_filter_sse2.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/util/denoiser_filter_sse2.h @@ -11,6 +11,8 @@ #ifndef MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_SSE2_H_ #define MODULES_VIDEO_PROCESSING_UTIL_DENOISER_FILTER_SSE2_H_ +#include <stdint.h> + #include "modules/video_processing/util/denoiser_filter.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/util/noise_estimation.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_processing/util/noise_estimation.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/util/noise_estimation.h @@ -11,9 +11,9 @@ #ifndef MODULES_VIDEO_PROCESSING_UTIL_NOISE_ESTIMATION_H_ #define MODULES_VIDEO_PROCESSING_UTIL_NOISE_ESTIMATION_H_ +#include <cstdint> #include <memory> -#include "modules/include/module_common_types.h" #include "modules/video_processing/util/denoiser_filter.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/util/skin_detection.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_processing/util/skin_detection.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/util/skin_detection.cc @@ -8,9 +8,6 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <limits.h> -#include <math.h> - #include "modules/video_processing/util/skin_detection.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/video_denoiser.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_processing/video_denoiser.cc +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/video_denoiser.cc @@ -9,7 +9,11 @@ */ #include "modules/video_processing/video_denoiser.h" -#include "common_video/libyuv/include/webrtc_libyuv.h" + +#include <stdint.h> +#include <string.h> + +#include "api/video/i420_buffer.h" #include "third_party/libyuv/include/libyuv/planar_functions.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/video_denoiser.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/modules/video_processing/video_denoiser.h +++ chromium-72.0.3626.53/third_party/webrtc/modules/video_processing/video_denoiser.h @@ -13,10 +13,12 @@ #include <memory> +#include "api/video/video_frame_buffer.h" #include "common_video/include/i420_buffer_pool.h" #include "modules/video_processing/util/denoiser_filter.h" #include "modules/video_processing/util/noise_estimation.h" #include "modules/video_processing/util/skin_detection.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/p2p/BUILD.gn @@ -93,6 +93,7 @@ rtc_static_library("rtc_p2p") { "../rtc_base:safe_minmax", "../rtc_base:stringutils", "../rtc_base:weak_ptr", + "../rtc_base/network:sent_packet", "../rtc_base/system:rtc_export", "../rtc_base/third_party/base64", "../rtc_base/third_party/sigslot", @@ -180,7 +181,9 @@ if (rtc_include_tests) { deps = [ ":p2p_test_utils", ":rtc_p2p", + "../api:libjingle_peerconnection_api", "../api:ortc_api", + "../api/units:time_delta", "../rtc_base:checks", "../rtc_base:gunit_helpers", "../rtc_base:rtc_base", @@ -188,6 +191,8 @@ if (rtc_include_tests) { "../rtc_base:rtc_base_tests_utils", "../rtc_base:stringutils", "../rtc_base:testclient", + "../rtc_base/network:sent_packet", + "../rtc_base/third_party/sigslot:sigslot", "../system_wrappers:metrics", "../test:test_support", "//testing/gtest", @@ -231,6 +236,7 @@ if (rtc_include_tests) { "../rtc_base:gunit_helpers", "../rtc_base:rtc_base", "../rtc_base:rtc_base_tests_utils", + "../test:test_support", "//testing/gtest", ] } Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/asyncstuntcpsocket.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/asyncstuntcpsocket.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/asyncstuntcpsocket.cc @@ -10,11 +10,16 @@ #include "p2p/base/asyncstuntcpsocket.h" +#include <errno.h> +#include <stdint.h> #include <string.h> #include "p2p/base/stun.h" +#include "rtc_base/byteorder.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" +#include "rtc_base/network/sent_packet.h" +#include "rtc_base/third_party/sigslot/sigslot.h" +#include "rtc_base/timeutils.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/asyncstuntcpsocket.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/asyncstuntcpsocket.h +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/asyncstuntcpsocket.h @@ -11,9 +11,13 @@ #ifndef P2P_BASE_ASYNCSTUNTCPSOCKET_H_ #define P2P_BASE_ASYNCSTUNTCPSOCKET_H_ +#include <stddef.h> + +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/asyncsocket.h" #include "rtc_base/asynctcpsocket.h" #include "rtc_base/constructormagic.h" -#include "rtc_base/socketfactory.h" +#include "rtc_base/socketaddress.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/asyncstuntcpsocket_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/asyncstuntcpsocket_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/asyncstuntcpsocket_unittest.cc @@ -8,14 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> +#include <string.h> #include <list> #include <memory> #include <string> #include "p2p/base/asyncstuntcpsocket.h" #include "rtc_base/asyncsocket.h" -#include "rtc_base/gunit.h" +#include "rtc_base/network/sent_packet.h" +#include "rtc_base/third_party/sigslot/sigslot.h" +#include "rtc_base/thread.h" #include "rtc_base/virtualsocketserver.h" +#include "test/gtest.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/basicasyncresolverfactory.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/basicasyncresolverfactory.h +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/basicasyncresolverfactory.h @@ -12,6 +12,7 @@ #define P2P_BASE_BASICASYNCRESOLVERFACTORY_H_ #include "api/asyncresolverfactory.h" +#include "rtc_base/asyncresolverinterface.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/basicasyncresolverfactory_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/basicasyncresolverfactory_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/basicasyncresolverfactory_unittest.cc @@ -9,7 +9,11 @@ */ #include "p2p/base/basicasyncresolverfactory.h" + #include "rtc_base/gunit.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/third_party/sigslot/sigslot.h" +#include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/basicpacketsocketfactory.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/basicpacketsocketfactory.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/basicpacketsocketfactory.cc @@ -10,17 +10,18 @@ #include "p2p/base/basicpacketsocketfactory.h" +#include <stddef.h> #include <string> #include "p2p/base/asyncstuntcpsocket.h" -#include "p2p/base/stun.h" #include "rtc_base/asynctcpsocket.h" #include "rtc_base/asyncudpsocket.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/nethelpers.h" -#include "rtc_base/physicalsocketserver.h" +#include "rtc_base/socket.h" #include "rtc_base/socketadapters.h" +#include "rtc_base/socketserver.h" #include "rtc_base/ssladapter.h" #include "rtc_base/thread.h" Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/dtlstransportinternal.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/dtlstransportinternal.h +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/dtlstransportinternal.h @@ -11,14 +11,20 @@ #ifndef P2P_BASE_DTLSTRANSPORTINTERNAL_H_ #define P2P_BASE_DTLSTRANSPORTINTERNAL_H_ +#include <stddef.h> +#include <stdint.h> #include <memory> #include <string> -#include <vector> #include "api/crypto/cryptooptions.h" #include "p2p/base/icetransportinternal.h" #include "p2p/base/packettransportinternal.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/sslcertificate.h" +#include "rtc_base/sslfingerprint.h" #include "rtc_base/sslstreamadapter.h" +#include "rtc_base/third_party/sigslot/sigslot.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/icecredentialsiterator.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/icecredentialsiterator.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/icecredentialsiterator.cc @@ -9,6 +9,8 @@ */ #include "p2p/base/icecredentialsiterator.h" + +#include "p2p/base/p2pconstants.h" #include "rtc_base/helpers.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/icecredentialsiterator_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/icecredentialsiterator_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/icecredentialsiterator_unittest.cc @@ -8,12 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <memory> -#include <string> #include <vector> #include "p2p/base/icecredentialsiterator.h" -#include "rtc_base/gunit.h" +#include "test/gtest.h" using cricket::IceParameters; using cricket::IceCredentialsIterator; Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/icetransportinternal.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/icetransportinternal.h +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/icetransportinternal.h @@ -11,16 +11,20 @@ #ifndef P2P_BASE_ICETRANSPORTINTERNAL_H_ #define P2P_BASE_ICETRANSPORTINTERNAL_H_ +#include <stdint.h> #include <string> #include <vector> +#include "absl/types/optional.h" #include "api/candidate.h" #include "api/transport/enums.h" -#include "p2p/base/candidatepairinterface.h" #include "p2p/base/packettransportinternal.h" #include "p2p/base/port.h" #include "p2p/base/transportdescription.h" +#include "rtc_base/network_constants.h" #include "rtc_base/system/rtc_export.h" +#include "rtc_base/third_party/sigslot/sigslot.h" +#include "rtc_base/timeutils.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/mdns_message.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/mdns_message.h +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/mdns_message.h @@ -21,9 +21,7 @@ // Fuzzer tests (test/fuzzers/mdns_parser_fuzzer.cc) MUST always be performed // after changes made to this file. -#include <map> -#include <memory> -#include <set> +#include <stdint.h> #include <string> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/p2pconstants.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/p2pconstants.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/p2pconstants.cc @@ -10,8 +10,6 @@ #include "p2p/base/p2pconstants.h" -#include <string> - namespace cricket { const char CN_AUDIO[] = "audio"; Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/p2pconstants.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/p2pconstants.h +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/p2pconstants.h @@ -11,7 +11,8 @@ #ifndef P2P_BASE_P2PCONSTANTS_H_ #define P2P_BASE_P2PCONSTANTS_H_ -#include <string> +#include <stddef.h> +#include <stdint.h> #include "rtc_base/system/rtc_export.h" Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/packetlossestimator.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/packetlossestimator.h +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/packetlossestimator.h @@ -11,6 +11,7 @@ #ifndef P2P_BASE_PACKETLOSSESTIMATOR_H_ #define P2P_BASE_PACKETLOSSESTIMATOR_H_ +#include <stddef.h> #include <stdint.h> #include <string> #include <unordered_map> Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/packetlossestimator_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/packetlossestimator_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/packetlossestimator_unittest.cc @@ -8,10 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <cstdint> #include <utility> #include "p2p/base/packetlossestimator.h" -#include "rtc_base/gunit.h" +#include "test/gtest.h" using cricket::PacketLossEstimator; Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/port_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/port_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/port_unittest.cc @@ -8,32 +8,63 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <string.h> +#include <cstdint> #include <list> #include <memory> +#include <string> +#include <utility> +#include <vector> #include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/candidate.h" +#include "api/units/time_delta.h" #include "p2p/base/basicpacketsocketfactory.h" #include "p2p/base/p2pconstants.h" +#include "p2p/base/packetsocketfactory.h" +#include "p2p/base/port.h" +#include "p2p/base/portallocator.h" +#include "p2p/base/portinterface.h" #include "p2p/base/relayport.h" +#include "p2p/base/stun.h" #include "p2p/base/stunport.h" +#include "p2p/base/stunserver.h" #include "p2p/base/tcpport.h" #include "p2p/base/testrelayserver.h" #include "p2p/base/teststunserver.h" #include "p2p/base/testturnserver.h" +#include "p2p/base/transportdescription.h" #include "p2p/base/turnport.h" +#include "p2p/base/turnserver.h" +#include "p2p/client/relayportfactoryinterface.h" #include "rtc_base/arraysize.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/asyncsocket.h" #include "rtc_base/buffer.h" -#include "rtc_base/crc32.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/checks.h" +#include "rtc_base/dscp.h" +#include "rtc_base/fakeclock.h" #include "rtc_base/gunit.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" #include "rtc_base/natserver.h" #include "rtc_base/natsocketfactory.h" +#include "rtc_base/nattypes.h" +#include "rtc_base/nethelper.h" +#include "rtc_base/network.h" +#include "rtc_base/network/sent_packet.h" +#include "rtc_base/network_constants.h" +#include "rtc_base/proxyinfo.h" +#include "rtc_base/socket.h" +#include "rtc_base/socketadapters.h" #include "rtc_base/socketaddress.h" -#include "rtc_base/ssladapter.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" #include "rtc_base/virtualsocketserver.h" +#include "test/gtest.h" using rtc::AsyncPacketSocket; using rtc::ByteBufferReader; Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/portallocator.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/portallocator.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/portallocator.cc @@ -11,10 +11,12 @@ #include "p2p/base/portallocator.h" #include <iterator> +#include <set> #include <utility> #include "p2p/base/icecredentialsiterator.h" #include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/portallocator_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/portallocator_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/portallocator_unittest.cc @@ -12,9 +12,9 @@ #include "p2p/base/fakeportallocator.h" #include "p2p/base/portallocator.h" -#include "rtc_base/gunit.h" #include "rtc_base/thread.h" #include "rtc_base/virtualsocketserver.h" +#include "test/gtest.h" static const char kContentName[] = "test content"; // Based on ICE_UFRAG_LENGTH Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/pseudotcp.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/pseudotcp.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/pseudotcp.cc @@ -10,14 +10,13 @@ #include "p2p/base/pseudotcp.h" +#include <errno.h> #include <stdio.h> -#include <stdlib.h> - #include <algorithm> +#include <cstdint> #include <memory> #include <set> -#include "rtc_base/arraysize.h" #include "rtc_base/bytebuffer.h" #include "rtc_base/byteorder.h" #include "rtc_base/checks.h" Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/pseudotcp.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/pseudotcp.h +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/pseudotcp.h @@ -11,6 +11,8 @@ #ifndef P2P_BASE_PSEUDOTCP_H_ #define P2P_BASE_PSEUDOTCP_H_ +#include <stddef.h> +#include <stdint.h> #include <list> #include "rtc_base/stream.h" Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/pseudotcp_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/pseudotcp_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/pseudotcp_unittest.cc @@ -8,17 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <string.h> #include <algorithm> +#include <cstddef> #include <string> #include <vector> #include "p2p/base/pseudotcp.h" #include "rtc_base/gunit.h" #include "rtc_base/helpers.h" +#include "rtc_base/location.h" +#include "rtc_base/logging.h" #include "rtc_base/memory_stream.h" #include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" #include "rtc_base/thread.h" #include "rtc_base/timeutils.h" +#include "test/gtest.h" using cricket::PseudoTcp; Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/relayport.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/relayport.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/relayport.cc @@ -7,13 +7,24 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ +#include <errno.h> +#include <string.h> #include <algorithm> #include "p2p/base/relayport.h" +#include "p2p/base/stun.h" +#include "p2p/base/stunrequest.h" #include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/bytebuffer.h" #include "rtc_base/checks.h" -#include "rtc_base/helpers.h" +#include "rtc_base/dscp.h" +#include "rtc_base/location.h" #include "rtc_base/logging.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/nethelper.h" +#include "rtc_base/proxyinfo.h" +#include "rtc_base/timeutils.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/relayserver_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/relayserver_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/relayserver_unittest.cc @@ -8,20 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <string.h> #include <memory> #include <string> #include <utility> #include "absl/memory/memory.h" #include "p2p/base/relayserver.h" -#include "rtc_base/gunit.h" +#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/bytebuffer.h" #include "rtc_base/helpers.h" -#include "rtc_base/logging.h" #include "rtc_base/socketaddress.h" -#include "rtc_base/ssladapter.h" #include "rtc_base/testclient.h" #include "rtc_base/thread.h" #include "rtc_base/virtualsocketserver.h" +#include "test/gtest.h" using rtc::SocketAddress; Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/stun.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/stun.h +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/stun.h @@ -14,11 +14,14 @@ // This file contains classes for dealing with the STUN protocol, as specified // in RFC 5389, and its descendants. +#include <stddef.h> +#include <stdint.h> #include <memory> #include <string> #include <vector> #include "rtc_base/bytebuffer.h" +#include "rtc_base/ipaddress.h" #include "rtc_base/socketaddress.h" namespace cricket { @@ -116,14 +119,15 @@ const size_t kStunLegacyTransactionIdLen // STUN Message Integrity HMAC length. const size_t kStunMessageIntegritySize = 20; -class StunAttribute; class StunAddressAttribute; -class StunXorAddressAttribute; -class StunUInt32Attribute; -class StunUInt64Attribute; +class StunAttribute; class StunByteStringAttribute; class StunErrorCodeAttribute; + class StunUInt16ListAttribute; +class StunUInt32Attribute; +class StunUInt64Attribute; +class StunXorAddressAttribute; // Records a complete STUN/TURN message. Each message consists of a type and // any number of attributes. Each attribute is parsed into an instance of an Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/stun_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/stun_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/stun_unittest.cc @@ -8,6 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <string.h> #include <string> #include <utility> @@ -15,10 +16,9 @@ #include "p2p/base/stun.h" #include "rtc_base/arraysize.h" #include "rtc_base/bytebuffer.h" -#include "rtc_base/gunit.h" -#include "rtc_base/logging.h" -#include "rtc_base/messagedigest.h" +#include "rtc_base/byteorder.h" #include "rtc_base/socketaddress.h" +#include "test/gtest.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/stunrequest.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/stunrequest.h +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/stunrequest.h @@ -11,9 +11,14 @@ #ifndef P2P_BASE_STUNREQUEST_H_ #define P2P_BASE_STUNREQUEST_H_ +#include <stddef.h> +#include <stdint.h> #include <map> #include <string> + #include "p2p/base/stun.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/stunrequest_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/stunrequest_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/stunrequest_unittest.cc @@ -13,10 +13,9 @@ #include "p2p/base/stunrequest.h" #include "rtc_base/fakeclock.h" #include "rtc_base/gunit.h" -#include "rtc_base/helpers.h" #include "rtc_base/logging.h" -#include "rtc_base/ssladapter.h" #include "rtc_base/timeutils.h" +#include "test/gtest.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/stunserver.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/stunserver.h +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/stunserver.h @@ -11,10 +11,15 @@ #ifndef P2P_BASE_STUNSERVER_H_ #define P2P_BASE_STUNSERVER_H_ +#include <stddef.h> +#include <stdint.h> #include <memory> #include "p2p/base/stun.h" +#include "rtc_base/asyncpacketsocket.h" #include "rtc_base/asyncudpsocket.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/third_party/sigslot/sigslot.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/stunserver_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/stunserver_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/stunserver_unittest.cc @@ -8,16 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <string.h> #include <memory> #include <string> #include "absl/memory/memory.h" #include "p2p/base/stunserver.h" -#include "rtc_base/gunit.h" +#include "rtc_base/bytebuffer.h" +#include "rtc_base/ipaddress.h" #include "rtc_base/logging.h" #include "rtc_base/testclient.h" #include "rtc_base/thread.h" #include "rtc_base/virtualsocketserver.h" +#include "test/gtest.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/tcpport.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/tcpport.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/tcpport.cc @@ -66,10 +66,18 @@ #include "p2p/base/tcpport.h" +#include <errno.h> +#include <algorithm> #include <vector> +#include "p2p/base/p2pconstants.h" #include "rtc_base/checks.h" +#include "rtc_base/ipaddress.h" +#include "rtc_base/location.h" #include "rtc_base/logging.h" +#include "rtc_base/nethelper.h" +#include "rtc_base/ratetracker.h" +#include "rtc_base/third_party/sigslot/sigslot.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/tcpport_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/tcpport_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/tcpport_unittest.cc @@ -10,13 +10,20 @@ #include <list> #include <memory> +#include <vector> #include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/p2pconstants.h" #include "p2p/base/tcpport.h" +#include "p2p/base/transportdescription.h" #include "rtc_base/gunit.h" #include "rtc_base/helpers.h" +#include "rtc_base/ipaddress.h" +#include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" #include "rtc_base/virtualsocketserver.h" +#include "test/gtest.h" using rtc::SocketAddress; using cricket::Connection; Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/teststunserver.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/teststunserver.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/teststunserver.cc @@ -10,6 +10,9 @@ #include "p2p/base/teststunserver.h" +#include "rtc_base/asyncsocket.h" +#include "rtc_base/socketserver.h" + namespace cricket { TestStunServer* TestStunServer::Create(rtc::Thread* thread, Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/teststunserver.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/teststunserver.h +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/teststunserver.h @@ -11,7 +11,9 @@ #ifndef P2P_BASE_TESTSTUNSERVER_H_ #define P2P_BASE_TESTSTUNSERVER_H_ +#include "p2p/base/stun.h" #include "p2p/base/stunserver.h" +#include "rtc_base/asyncudpsocket.h" #include "rtc_base/socketaddress.h" #include "rtc_base/thread.h" Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/transportdescription.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/transportdescription.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/transportdescription.cc @@ -11,7 +11,6 @@ #include "p2p/base/transportdescription.h" #include "absl/strings/match.h" -#include "p2p/base/p2pconstants.h" #include "rtc_base/arraysize.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/transportdescriptionfactory.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/transportdescriptionfactory.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/transportdescriptionfactory.cc @@ -10,12 +10,12 @@ #include "p2p/base/transportdescriptionfactory.h" +#include <stddef.h> #include <memory> +#include <string> #include "p2p/base/transportdescription.h" -#include "rtc_base/helpers.h" #include "rtc_base/logging.h" -#include "rtc_base/messagedigest.h" #include "rtc_base/sslfingerprint.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/transportdescriptionfactory_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/transportdescriptionfactory_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/transportdescriptionfactory_unittest.cc @@ -8,6 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stddef.h> +#include <algorithm> #include <memory> #include <string> #include <vector> @@ -15,9 +17,12 @@ #include "p2p/base/p2pconstants.h" #include "p2p/base/transportdescription.h" #include "p2p/base/transportdescriptionfactory.h" +#include "rtc_base/copyonwritebuffer.h" #include "rtc_base/fakesslidentity.h" -#include "rtc_base/gunit.h" -#include "rtc_base/ssladapter.h" +#include "rtc_base/sslcertificate.h" +#include "rtc_base/sslfingerprint.h" +#include "rtc_base/sslidentity.h" +#include "test/gtest.h" using cricket::TransportDescriptionFactory; using cricket::TransportDescription; Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/turnport_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/turnport_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/turnport_unittest.cc @@ -16,29 +16,31 @@ #include <utility> #include <vector> -#include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/units/time_delta.h" #include "p2p/base/basicpacketsocketfactory.h" #include "p2p/base/p2pconstants.h" #include "p2p/base/portallocator.h" -#include "p2p/base/tcpport.h" +#include "p2p/base/stunport.h" #include "p2p/base/testturncustomizer.h" #include "p2p/base/testturnserver.h" +#include "p2p/base/transportdescription.h" #include "p2p/base/turnport.h" -#include "p2p/base/udpport.h" -#include "rtc_base/asynctcpsocket.h" +#include "p2p/base/turnserver.h" +#include "rtc_base/asyncsocket.h" #include "rtc_base/buffer.h" +#include "rtc_base/bytebuffer.h" #include "rtc_base/checks.h" -#include "rtc_base/dscp.h" #include "rtc_base/fakeclock.h" -#include "rtc_base/firewallsocketserver.h" #include "rtc_base/gunit.h" -#include "rtc_base/helpers.h" -#include "rtc_base/logging.h" -#include "rtc_base/socketadapters.h" +#include "rtc_base/location.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/nethelper.h" #include "rtc_base/socketaddress.h" -#include "rtc_base/ssladapter.h" #include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" #include "rtc_base/virtualsocketserver.h" +#include "test/gtest.h" using rtc::SocketAddress; Index: chromium-72.0.3626.53/third_party/webrtc/p2p/base/turnserver_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/base/turnserver_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/base/turnserver_unittest.cc @@ -9,9 +9,10 @@ */ #include "p2p/base/turnserver.h" + #include "p2p/base/basicpacketsocketfactory.h" -#include "rtc_base/gunit.h" #include "rtc_base/virtualsocketserver.h" +#include "test/gtest.h" // NOTE: This is a work in progress. Currently this file only has tests for // TurnServerConnection, a primitive class used by TurnServer. Index: chromium-72.0.3626.53/third_party/webrtc/p2p/client/basicportallocator_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/client/basicportallocator_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/client/basicportallocator_unittest.cc @@ -10,11 +10,13 @@ #include <algorithm> #include <memory> +#include <ostream> // no-presubmit-check TODO(webrtc:8982) #include "p2p/base/basicpacketsocketfactory.h" #include "p2p/base/p2pconstants.h" -#include "p2p/base/p2ptransportchannel.h" #include "p2p/base/stunport.h" +#include "p2p/base/stunrequest.h" +#include "p2p/base/stunserver.h" #include "p2p/base/testrelayserver.h" #include "p2p/base/teststunserver.h" #include "p2p/base/testturnserver.h" @@ -23,18 +25,23 @@ #include "rtc_base/fakenetwork.h" #include "rtc_base/firewallsocketserver.h" #include "rtc_base/gunit.h" -#include "rtc_base/helpers.h" #include "rtc_base/ipaddress.h" #include "rtc_base/logging.h" #include "rtc_base/natserver.h" #include "rtc_base/natsocketfactory.h" +#include "rtc_base/nattypes.h" +#include "rtc_base/nethelper.h" #include "rtc_base/nethelpers.h" #include "rtc_base/network.h" +#include "rtc_base/network_constants.h" +#include "rtc_base/networkmonitor.h" +#include "rtc_base/socket.h" #include "rtc_base/socketaddress.h" -#include "rtc_base/ssladapter.h" +#include "rtc_base/socketaddresspair.h" #include "rtc_base/thread.h" #include "rtc_base/virtualsocketserver.h" #include "system_wrappers/include/metrics.h" +#include "test/gtest.h" using rtc::IPAddress; using rtc::SocketAddress; Index: chromium-72.0.3626.53/third_party/webrtc/p2p/client/turnportfactory.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/client/turnportfactory.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/client/turnportfactory.cc @@ -13,6 +13,7 @@ #include <memory> #include <utility> +#include "p2p/base/portallocator.h" #include "p2p/base/turnport.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/client/turnportfactory.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/client/turnportfactory.h +++ chromium-72.0.3626.53/third_party/webrtc/p2p/client/turnportfactory.h @@ -13,7 +13,9 @@ #include <memory> +#include "p2p/base/port.h" #include "p2p/client/relayportfactoryinterface.h" +#include "rtc_base/asyncpacketsocket.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/p2p/stunprober/stunprober_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/p2p/stunprober/stunprober_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/p2p/stunprober/stunprober_unittest.cc @@ -9,18 +9,16 @@ */ #include <stdint.h> - #include <memory> #include "p2p/base/basicpacketsocketfactory.h" #include "p2p/base/teststunserver.h" #include "p2p/stunprober/stunprober.h" -#include "rtc_base/asyncresolverinterface.h" -#include "rtc_base/bind.h" -#include "rtc_base/checks.h" #include "rtc_base/gunit.h" +#include "rtc_base/ipaddress.h" #include "rtc_base/ssladapter.h" #include "rtc_base/virtualsocketserver.h" +#include "test/gtest.h" using stunprober::StunProber; using stunprober::AsyncCallback; Index: chromium-72.0.3626.53/third_party/webrtc/pc/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/pc/BUILD.gn @@ -67,10 +67,12 @@ rtc_static_library("rtc_pc_base") { deps = [ "..:webrtc_common", "../api:array_view", + "../api:audio_options_api", "../api:call_api", "../api:libjingle_peerconnection_api", "../api:ortc_api", "../api/video:video_frame", + "../call:call_interfaces", "../call:rtp_interfaces", "../call:rtp_receiver", "../common_video:common_video", @@ -78,6 +80,7 @@ rtc_static_library("rtc_pc_base") { "../media:rtc_data", "../media:rtc_h264_profile_id", "../media:rtc_media_base", + "../media:rtc_media_config", "../modules/rtp_rtcp:rtp_rtcp_format", "../p2p:rtc_p2p", "../rtc_base:checks", @@ -185,6 +188,8 @@ rtc_static_library("peerconnection") { deps = [ ":rtc_pc_base", "..:webrtc_common", + "../api:array_view", + "../api:audio_options_api", "../api:call_api", "../api:fec_controller_api", "../api:libjingle_peerconnection_api", @@ -269,9 +274,11 @@ if (rtc_include_tests) { ":rtc_pc", ":rtc_pc_base", "../api:array_view", + "../api:audio_options_api", "../api:fake_media_transport", "../api:libjingle_peerconnection_api", "../call:rtp_interfaces", + "../call:rtp_receiver", "../logging:rtc_event_log_api", "../media:rtc_media_base", "../media:rtc_media_tests_utils", @@ -308,24 +315,33 @@ if (rtc_include_tests) { ] deps = [ ":pc_test_utils", + "../api:audio_options_api", "../api:create_peerconnection_factory", "../api:libjingle_peerconnection_api", "../api:rtc_stats_api", + "../api/audio:audio_mixer_api", + "../api/audio_codecs:audio_codecs_api", "../api/audio_codecs:builtin_audio_decoder_factory", "../api/audio_codecs:builtin_audio_encoder_factory", "../api/video_codecs:builtin_video_decoder_factory", "../api/video_codecs:builtin_video_encoder_factory", + "../api/video_codecs:video_codecs_api", "../media:rtc_media_tests_utils", + "../modules/audio_device:audio_device_api", + "../modules/audio_processing:api", "../p2p:p2p_test_utils", "../p2p:rtc_p2p", "../pc:peerconnection", + "../rtc_base:checks", "../rtc_base:gunit_helpers", "../rtc_base:rtc_base", "../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_tests_utils", + "../system_wrappers:system_wrappers", "../test:perf_test", "../test:test_support", "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/types:optional", ] if (!build_with_chromium && is_clang) { # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). @@ -364,13 +380,17 @@ if (rtc_include_tests) { ":peerconnection", ":rtc_pc_base", "..:webrtc_common", + "../api:audio_options_api", "../api:create_peerconnection_factory", "../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_test_api", "../api:rtc_stats_api", + "../api/audio:audio_mixer_api", + "../api/audio_codecs:audio_codecs_api", "../api/video:video_frame", "../api/video_codecs:builtin_video_decoder_factory", "../api/video_codecs:builtin_video_encoder_factory", + "../api/video_codecs:video_codecs_api", "../call:call_interfaces", "../logging:rtc_event_log_api", "../media:rtc_data", @@ -381,6 +401,7 @@ if (rtc_include_tests) { "../modules/audio_processing:api", "../modules/audio_processing:audio_processing", "../p2p:p2p_test_utils", + "../p2p:rtc_p2p", "../rtc_base:checks", "../rtc_base:gunit_helpers", "../rtc_base:rtc_base", @@ -390,6 +411,7 @@ if (rtc_include_tests) { "../test:test_support", "../test:video_test_common", "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/types:optional", ] if (!build_with_chromium && is_clang) { @@ -453,19 +475,27 @@ if (rtc_include_tests) { deps = [ ":peerconnection", ":rtc_pc_base", + "../api:array_view", + "../api:audio_options_api", "../api:create_peerconnection_factory", "../api:fake_frame_decryptor", "../api:fake_frame_encryptor", + "../api:libjingle_logging_api", "../api:libjingle_peerconnection_api", "../api:loopback_media_transport", "../api:mock_rtp", + "../api/audio:audio_mixer_api", "../api/units:time_delta", "../logging:fake_rtc_event_log", + "../media:rtc_media_config", + "../modules/audio_device:audio_device_api", + "../modules/audio_processing:audio_processing_statistics", "../rtc_base:checks", "../rtc_base:gunit_helpers", "../rtc_base:rtc_base_tests_utils", "../rtc_base:stringutils", "../rtc_base/third_party/base64", + "../rtc_base/third_party/sigslot:sigslot", "../system_wrappers:metrics", "../test:fileutils", "//third_party/abseil-cpp/absl/memory", Index: chromium-72.0.3626.53/third_party/webrtc/pc/audiotrack.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/audiotrack.h +++ chromium-72.0.3626.53/third_party/webrtc/pc/audiotrack.h @@ -14,7 +14,6 @@ #include <string> #include "api/mediastreaminterface.h" -#include "api/notifier.h" #include "pc/mediastreamtrack.h" #include "rtc_base/constructormagic.h" #include "rtc_base/scoped_ref_ptr.h" Index: chromium-72.0.3626.53/third_party/webrtc/pc/channel_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/channel_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/channel_unittest.cc @@ -8,23 +8,34 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <cstdint> #include <memory> #include <utility> +#include "absl/memory/memory.h" #include "api/array_view.h" +#include "api/audio_options.h" +#include "api/rtpparameters.h" +#include "media/base/codec.h" #include "media/base/fakemediaengine.h" #include "media/base/fakertp.h" #include "media/base/mediachannel.h" -#include "p2p/base/fakecandidatepair.h" +#include "p2p/base/candidatepairinterface.h" #include "p2p/base/fakedtlstransport.h" #include "p2p/base/fakepackettransport.h" +#include "p2p/base/icetransportinternal.h" +#include "p2p/base/p2pconstants.h" #include "pc/channel.h" +#include "pc/dtlssrtptransport.h" +#include "pc/jseptransport.h" +#include "pc/rtptransport.h" +#include "rtc_base/arraysize.h" #include "rtc_base/buffer.h" +#include "rtc_base/byteorder.h" #include "rtc_base/checks.h" -#include "rtc_base/fakeclock.h" -#include "rtc_base/gunit.h" -#include "rtc_base/logging.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/rtccertificate.h" +#include "rtc_base/sslidentity.h" +#include "test/gtest.h" using cricket::DtlsTransportInternal; using cricket::FakeVoiceMediaChannel; Index: chromium-72.0.3626.53/third_party/webrtc/pc/channelmanager.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/channelmanager.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/channelmanager.cc @@ -15,9 +15,11 @@ #include "absl/memory/memory.h" #include "absl/strings/match.h" -#include "media/base/rtpdataengine.h" +#include "media/base/mediaconstants.h" #include "rtc_base/checks.h" +#include "rtc_base/location.h" #include "rtc_base/logging.h" +#include "rtc_base/thread_checker.h" #include "rtc_base/trace_event.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/pc/channelmanager.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/channelmanager.h +++ chromium-72.0.3626.53/third_party/webrtc/pc/channelmanager.h @@ -11,12 +11,23 @@ #ifndef PC_CHANNELMANAGER_H_ #define PC_CHANNELMANAGER_H_ +#include <stdint.h> #include <memory> #include <string> #include <vector> +#include "api/audio_options.h" +#include "api/crypto/cryptooptions.h" +#include "api/media_transport_interface.h" +#include "call/call.h" +#include "media/base/codec.h" +#include "media/base/mediachannel.h" +#include "media/base/mediaconfig.h" #include "media/base/mediaengine.h" #include "pc/channel.h" +#include "pc/rtptransportinternal.h" +#include "pc/sessiondescription.h" +#include "rtc_base/platform_file.h" #include "rtc_base/thread.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/pc/channelmanager_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/channelmanager_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/channelmanager_unittest.cc @@ -9,17 +9,22 @@ */ #include <memory> -#include <utility> +#include "absl/memory/memory.h" +#include "api/rtcerror.h" #include "api/test/fake_media_transport.h" #include "media/base/fakemediaengine.h" #include "media/base/testutils.h" #include "media/engine/fakewebrtccall.h" +#include "p2p/base/dtlstransportinternal.h" #include "p2p/base/fakedtlstransport.h" +#include "p2p/base/p2pconstants.h" +#include "p2p/base/packettransportinternal.h" #include "pc/channelmanager.h" -#include "rtc_base/gunit.h" -#include "rtc_base/logging.h" +#include "pc/dtlssrtptransport.h" +#include "rtc_base/checks.h" #include "rtc_base/thread.h" +#include "test/gtest.h" namespace { const bool kDefaultSrtpRequired = true; Index: chromium-72.0.3626.53/third_party/webrtc/pc/datachannel.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/datachannel.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/datachannel.cc @@ -16,8 +16,10 @@ #include "media/sctp/sctptransportinternal.h" #include "pc/sctputils.h" #include "rtc_base/checks.h" +#include "rtc_base/location.h" #include "rtc_base/logging.h" -#include "rtc_base/refcount.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/thread.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/datachannel_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/datachannel_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/datachannel_unittest.cc @@ -8,6 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <string.h> #include <memory> #include <vector> @@ -16,6 +17,7 @@ #include "pc/test/fakedatachannelprovider.h" #include "rtc_base/gunit.h" #include "rtc_base/numerics/safe_conversions.h" +#include "test/gtest.h" using webrtc::DataChannel; using webrtc::SctpSidAllocator; Index: chromium-72.0.3626.53/third_party/webrtc/pc/dtlssrtptransport.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/dtlssrtptransport.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/dtlssrtptransport.cc @@ -10,11 +10,12 @@ #include "pc/dtlssrtptransport.h" -#include <memory> +#include <string.h> #include <string> #include <utility> -#include "media/base/rtputils.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" #include "rtc_base/sslstreamadapter.h" namespace { Index: chromium-72.0.3626.53/third_party/webrtc/pc/dtlssrtptransport.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/dtlssrtptransport.h +++ chromium-72.0.3626.53/third_party/webrtc/pc/dtlssrtptransport.h @@ -11,13 +11,16 @@ #ifndef PC_DTLSSRTPTRANSPORT_H_ #define PC_DTLSSRTPTRANSPORT_H_ -#include <memory> -#include <string> #include <vector> +#include "absl/types/optional.h" +#include "api/cryptoparams.h" +#include "api/rtcerror.h" #include "p2p/base/dtlstransportinternal.h" +#include "p2p/base/packettransportinternal.h" #include "pc/srtptransport.h" #include "rtc_base/buffer.h" +#include "rtc_base/third_party/sigslot/sigslot.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/dtlssrtptransport_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/dtlssrtptransport_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/dtlssrtptransport_unittest.cc @@ -10,20 +10,26 @@ #include "pc/dtlssrtptransport.h" +#include <string.h> +#include <cstdint> #include <memory> -#include <utility> +#include <set> #include "absl/memory/memory.h" +#include "call/rtp_demuxer.h" #include "media/base/fakertp.h" #include "p2p/base/dtlstransportinternal.h" #include "p2p/base/fakedtlstransport.h" -#include "p2p/base/fakepackettransport.h" +#include "p2p/base/fakeicetransport.h" #include "p2p/base/p2pconstants.h" #include "pc/rtptransport.h" #include "pc/rtptransporttestutil.h" #include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/gunit.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/rtccertificate.h" +#include "rtc_base/sslidentity.h" +#include "test/gtest.h" using cricket::FakeDtlsTransport; using cricket::FakeIceTransport; Index: chromium-72.0.3626.53/third_party/webrtc/pc/dtmfsender.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/dtmfsender.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/dtmfsender.cc @@ -11,11 +11,12 @@ #include "pc/dtmfsender.h" #include <ctype.h> - +#include <string.h> #include <string> #include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/refcountedobject.h" #include "rtc_base/thread.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/dtmfsender_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/dtmfsender_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/dtmfsender_unittest.cc @@ -10,14 +10,16 @@ #include "pc/dtmfsender.h" +#include <stddef.h> #include <memory> -#include <set> #include <string> #include <vector> #include "rtc_base/fakeclock.h" #include "rtc_base/gunit.h" +#include "rtc_base/refcountedobject.h" #include "rtc_base/timeutils.h" +#include "test/gtest.h" using webrtc::DtmfProviderInterface; using webrtc::DtmfSender; Index: chromium-72.0.3626.53/third_party/webrtc/pc/externalhmac.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/externalhmac.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/externalhmac.cc @@ -11,11 +11,10 @@ #include "pc/externalhmac.h" #include <stdlib.h> // For malloc/free. +#include <string.h> #include "rtc_base/logging.h" #include "rtc_base/zero_memory.h" - -#include "third_party/libsrtp/crypto/include/crypto_kernel.h" #include "third_party/libsrtp/include/srtp.h" // Begin test case 0 */ Index: chromium-72.0.3626.53/third_party/webrtc/pc/externalhmac.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/externalhmac.h +++ chromium-72.0.3626.53/third_party/webrtc/pc/externalhmac.h @@ -31,6 +31,8 @@ #include <stdint.h> #include "third_party/libsrtp/crypto/include/auth.h" +#include "third_party/libsrtp/crypto/include/crypto_types.h" +#include "third_party/libsrtp/include/srtp.h" #define EXTERNAL_HMAC_SHA1 SRTP_HMAC_SHA1 + 1 #define HMAC_KEY_LENGTH 20 Index: chromium-72.0.3626.53/third_party/webrtc/pc/iceserverparsing.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/iceserverparsing.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/iceserverparsing.cc @@ -10,10 +10,17 @@ #include "pc/iceserverparsing.h" +#include <stddef.h> #include <cctype> // For std::isdigit. #include <string> +#include "p2p/base/portinterface.h" #include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" +#include "rtc_base/ipaddress.h" +#include "rtc_base/logging.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/stringencode.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/iceserverparsing.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/iceserverparsing.h +++ chromium-72.0.3626.53/third_party/webrtc/pc/iceserverparsing.h @@ -15,6 +15,8 @@ #include "api/peerconnectioninterface.h" #include "api/rtcerror.h" +#include "p2p/base/port.h" +#include "p2p/base/portallocator.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/iceserverparsing_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/iceserverparsing_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/iceserverparsing_unittest.cc @@ -11,8 +11,11 @@ #include <string> #include <vector> +#include "p2p/base/portinterface.h" #include "pc/iceserverparsing.h" -#include "rtc_base/gunit.h" +#include "rtc_base/ipaddress.h" +#include "rtc_base/socketaddress.h" +#include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/jsepicecandidate.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/jsepicecandidate.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/jsepicecandidate.cc @@ -10,7 +10,7 @@ #include "api/jsepicecandidate.h" -#include <vector> +#include <memory> #include "absl/memory/memory.h" #include "pc/webrtcsdp.h" Index: chromium-72.0.3626.53/third_party/webrtc/pc/jsepsessiondescription_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/jsepsessiondescription_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/jsepsessiondescription_unittest.cc @@ -8,20 +8,29 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stddef.h> +#include <stdint.h> #include <memory> #include <string> +#include <utility> +#include <vector> #include "absl/memory/memory.h" #include "api/candidate.h" +#include "api/jsep.h" #include "api/jsepicecandidate.h" #include "api/jsepsessiondescription.h" +#include "media/base/codec.h" #include "p2p/base/p2pconstants.h" #include "p2p/base/port.h" -#include "pc/mediasession.h" +#include "p2p/base/transportdescription.h" +#include "p2p/base/transportinfo.h" #include "pc/sessiondescription.h" #include "pc/webrtcsdp.h" -#include "rtc_base/gunit.h" +#include "rtc_base/helpers.h" +#include "rtc_base/socketaddress.h" #include "rtc_base/stringencode.h" +#include "test/gtest.h" using cricket::MediaProtocolType; using ::testing::Values; Index: chromium-72.0.3626.53/third_party/webrtc/pc/jseptransport.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/jseptransport.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/jseptransport.cc @@ -10,15 +10,19 @@ #include "pc/jseptransport.h" +#include <stddef.h> +#include <stdint.h> #include <memory> +#include <type_traits> #include <utility> // for std::pair +#include "absl/memory/memory.h" +#include "api/array_view.h" #include "api/candidate.h" #include "p2p/base/p2pconstants.h" #include "p2p/base/p2ptransportchannel.h" -#include "p2p/base/port.h" -#include "rtc_base/bind.h" #include "rtc_base/checks.h" +#include "rtc_base/copyonwritebuffer.h" #include "rtc_base/logging.h" #include "rtc_base/strings/string_builder.h" Index: chromium-72.0.3626.53/third_party/webrtc/pc/localaudiosource.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/localaudiosource.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/localaudiosource.cc @@ -10,9 +10,7 @@ #include "pc/localaudiosource.h" -#include <vector> - -#include "media/base/mediaengine.h" +#include "rtc_base/refcountedobject.h" using webrtc::MediaSourceInterface; Index: chromium-72.0.3626.53/third_party/webrtc/pc/localaudiosource.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/localaudiosource.h +++ chromium-72.0.3626.53/third_party/webrtc/pc/localaudiosource.h @@ -11,9 +11,10 @@ #ifndef PC_LOCALAUDIOSOURCE_H_ #define PC_LOCALAUDIOSOURCE_H_ +#include "api/audio_options.h" #include "api/mediastreaminterface.h" #include "api/notifier.h" -#include "media/base/mediachannel.h" +#include "rtc_base/scoped_ref_ptr.h" // LocalAudioSource implements AudioSourceInterface. // This contains settings for switching audio processing on and off. Index: chromium-72.0.3626.53/third_party/webrtc/pc/localaudiosource_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/localaudiosource_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/localaudiosource_unittest.cc @@ -10,12 +10,8 @@ #include "pc/localaudiosource.h" -#include <string> -#include <vector> - -#include "media/base/fakemediaengine.h" -#include "media/base/fakevideorenderer.h" -#include "rtc_base/gunit.h" +#include "absl/types/optional.h" +#include "test/gtest.h" using webrtc::LocalAudioSource; Index: chromium-72.0.3626.53/third_party/webrtc/pc/mediaconstraintsinterface_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/mediaconstraintsinterface_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/mediaconstraintsinterface_unittest.cc @@ -10,8 +10,10 @@ #include "api/mediaconstraintsinterface.h" +#include "absl/types/optional.h" #include "api/test/fakeconstraints.h" -#include "rtc_base/gunit.h" +#include "media/base/mediaconfig.h" +#include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/mediastream.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/mediastream.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/mediastream.cc @@ -9,8 +9,11 @@ */ #include "pc/mediastream.h" + +#include <stddef.h> +#include <vector> + #include "rtc_base/checks.h" -#include "rtc_base/logging.h" #include "rtc_base/refcountedobject.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/mediastream.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/mediastream.h +++ chromium-72.0.3626.53/third_party/webrtc/pc/mediastream.h @@ -14,10 +14,10 @@ #define PC_MEDIASTREAM_H_ #include <string> -#include <vector> #include "api/mediastreaminterface.h" #include "api/notifier.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/mediastream_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/mediastream_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/mediastream_unittest.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stddef.h> #include <string> #include "pc/audiotrack.h" #include "pc/mediastream.h" #include "pc/test/fakevideotracksource.h" #include "pc/videotrack.h" -#include "rtc_base/gunit.h" -#include "rtc_base/refcount.h" +#include "rtc_base/thread.h" #include "test/gmock.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/pc/mediastreamobserver.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/mediastreamobserver.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/mediastreamobserver.cc @@ -11,6 +11,8 @@ #include "pc/mediastreamobserver.h" #include <algorithm> +#include <string> +#include <vector> namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/peerconnection_datachannel_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/peerconnection_datachannel_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/peerconnection_datachannel_unittest.cc @@ -8,22 +8,45 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <tuple> +#include <memory> +#include <string> +#include <type_traits> +#include <utility> +#include <vector> +#include "absl/types/optional.h" +#include "api/call/callfactoryinterface.h" +#include "api/jsep.h" +#include "api/media_transport_interface.h" +#include "api/mediatypes.h" +#include "api/peerconnectioninterface.h" #include "api/peerconnectionproxy.h" #include "api/test/fake_media_transport.h" +#include "media/base/codec.h" #include "media/base/fakemediaengine.h" +#include "media/base/mediaconstants.h" +#include "media/base/mediaengine.h" +#include "media/sctp/sctptransportinternal.h" +#include "p2p/base/p2pconstants.h" +#include "p2p/base/portallocator.h" #include "pc/mediasession.h" #include "pc/peerconnection.h" #include "pc/peerconnectionfactory.h" #include "pc/peerconnectionwrapper.h" #include "pc/sdputils.h" +#include "pc/sessiondescription.h" +#include "pc/test/mockpeerconnectionobservers.h" +#include "rtc_base/checks.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/rtccertificategenerator.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/thread.h" +#include "test/gtest.h" #ifdef WEBRTC_ANDROID #include "pc/test/androidtestinitializer.h" #endif #include "absl/memory/memory.h" #include "pc/test/fakesctptransport.h" -#include "rtc_base/gunit.h" #include "rtc_base/virtualsocketserver.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/peerconnection_histogram_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/peerconnection_histogram_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/peerconnection_histogram_unittest.cc @@ -8,23 +8,38 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <tuple> +#include <memory> +#include <set> +#include <string> +#include <utility> +#include <vector> #include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/call/callfactoryinterface.h" #include "api/jsep.h" +#include "api/peerconnectioninterface.h" #include "api/peerconnectionproxy.h" +#include "api/rtcerror.h" #include "media/base/fakemediaengine.h" +#include "p2p/base/portallocator.h" #include "p2p/client/basicportallocator.h" -#include "pc/mediasession.h" #include "pc/peerconnection.h" #include "pc/peerconnectionfactory.h" #include "pc/peerconnectionwrapper.h" #include "pc/sdputils.h" -#include "pc/test/fakesctptransport.h" +#include "pc/test/mockpeerconnectionobservers.h" +#include "rtc_base/checks.h" #include "rtc_base/fakenetwork.h" #include "rtc_base/gunit.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/rtccertificategenerator.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/thread.h" #include "rtc_base/virtualsocketserver.h" #include "system_wrappers/include/metrics.h" +#include "test/gtest.h" namespace webrtc { @@ -71,6 +86,7 @@ class PeerConnectionFactoryForUsageHisto }; class PeerConnectionWrapperForUsageHistogramTest; + typedef PeerConnectionWrapperForUsageHistogramTest* RawWrapperPtr; class ObserverForUsageHistogramTest : public MockPeerConnectionObserver { Index: chromium-72.0.3626.53/third_party/webrtc/pc/peerconnection_rampup_tests.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/peerconnection_rampup_tests.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/peerconnection_rampup_tests.cc @@ -8,28 +8,55 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <memory> +#include <string> +#include <utility> +#include <vector> + +#include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/audio/audio_mixer.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "api/audio_codecs/audio_encoder_factory.h" #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" +#include "api/audio_options.h" #include "api/create_peerconnection_factory.h" +#include "api/jsep.h" +#include "api/mediastreaminterface.h" +#include "api/peerconnectioninterface.h" +#include "api/stats/rtcstats.h" #include "api/stats/rtcstats_objects.h" +#include "api/stats/rtcstatsreport.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" +#include "api/video_codecs/video_decoder_factory.h" +#include "api/video_codecs/video_encoder_factory.h" +#include "modules/audio_device/include/audio_device.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "p2p/base/portallocator.h" +#include "p2p/base/portinterface.h" #include "p2p/base/testturnserver.h" #include "p2p/client/basicportallocator.h" #include "pc/peerconnection.h" #include "pc/peerconnectionwrapper.h" #include "pc/test/fakeaudiocapturemodule.h" -#include "pc/test/fakeperiodicvideotracksource.h" -#include "pc/test/fakertccertificategenerator.h" -#include "pc/test/fakevideotrackrenderer.h" #include "pc/test/framegeneratorcapturervideotracksource.h" +#include "pc/test/mockpeerconnectionobservers.h" +#include "rtc_base/checks.h" #include "rtc_base/fakenetwork.h" #include "rtc_base/firewallsocketserver.h" #include "rtc_base/gunit.h" -#include "rtc_base/platform_thread.h" +#include "rtc_base/helpers.h" +#include "rtc_base/location.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/socketaddress.h" +#include "rtc_base/sslcertificate.h" #include "rtc_base/testcertificateverifier.h" +#include "rtc_base/thread.h" #include "rtc_base/virtualsocketserver.h" +#include "system_wrappers/include/clock.h" #include "test/gtest.h" #include "test/testsupport/perf_test.h" Index: chromium-72.0.3626.53/third_party/webrtc/pc/peerconnection_rtp_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/peerconnection_rtp_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/peerconnection_rtp_unittest.cc @@ -8,33 +8,54 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> #include <memory> +#include <string> +#include <utility> #include <vector> #include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/audio/audio_mixer.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "api/audio_codecs/audio_encoder_factory.h" #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/create_peerconnection_factory.h" #include "api/jsep.h" #include "api/mediastreaminterface.h" +#include "api/mediatypes.h" #include "api/peerconnectioninterface.h" +#include "api/rtcerror.h" +#include "api/rtpparameters.h" +#include "api/rtpreceiverinterface.h" +#include "api/rtpsenderinterface.h" +#include "api/rtptransceiverinterface.h" +#include "api/setremotedescriptionobserverinterface.h" #include "api/umametrics.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" +#include "api/video_codecs/video_decoder_factory.h" +#include "api/video_codecs/video_encoder_factory.h" +#include "media/base/streamparams.h" +#include "modules/audio_device/include/audio_device.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "p2p/base/portallocator.h" #include "pc/mediasession.h" -#include "pc/mediastream.h" -#include "pc/mediastreamtrack.h" #include "pc/peerconnectionwrapper.h" #include "pc/sdputils.h" +#include "pc/sessiondescription.h" #include "pc/test/fakeaudiocapturemodule.h" #include "pc/test/mockpeerconnectionobservers.h" #include "rtc_base/checks.h" #include "rtc_base/gunit.h" #include "rtc_base/refcountedobject.h" +#include "rtc_base/rtccertificategenerator.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread.h" #include "system_wrappers/include/metrics.h" #include "test/gmock.h" +#include "test/gtest.h" // This file contains tests for RTP Media API-related behavior of // |webrtc::PeerConnection|, see https://w3c.github.io/webrtc-pc/#rtp-media-api. Index: chromium-72.0.3626.53/third_party/webrtc/pc/peerconnectionfactory_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/peerconnectionfactory_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/peerconnectionfactory_unittest.cc @@ -8,22 +8,35 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stddef.h> #include <memory> #include <string> #include <utility> #include <vector> +#include "api/audio/audio_mixer.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "api/audio_codecs/audio_encoder_factory.h" #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/create_peerconnection_factory.h" +#include "api/datachannelinterface.h" +#include "api/jsep.h" #include "api/mediastreaminterface.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" +#include "api/video_codecs/video_decoder_factory.h" +#include "api/video_codecs/video_encoder_factory.h" #include "media/base/fakevideocapturer.h" +#include "modules/audio_device/include/audio_device.h" +#include "modules/audio_processing/include/audio_processing.h" #include "p2p/base/fakeportallocator.h" +#include "p2p/base/port.h" +#include "p2p/base/portinterface.h" #include "pc/peerconnectionfactory.h" #include "pc/test/fakeaudiocapturemodule.h" -#include "rtc_base/gunit.h" +#include "rtc_base/socketaddress.h" +#include "test/gtest.h" #ifdef WEBRTC_ANDROID #include "pc/test/androidtestinitializer.h" Index: chromium-72.0.3626.53/third_party/webrtc/pc/peerconnectioninterface_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/peerconnectioninterface_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/peerconnectioninterface_unittest.cc @@ -8,46 +8,86 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <algorithm> +#include <limits.h> +#include <stdint.h> +#include <string.h> #include <memory> -#include <sstream> #include <string> #include <utility> +#include <vector> #include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/audio/audio_mixer.h" +#include "api/audio_codecs/audio_decoder_factory.h" +#include "api/audio_codecs/audio_encoder_factory.h" #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" +#include "api/call/callfactoryinterface.h" #include "api/create_peerconnection_factory.h" +#include "api/datachannelinterface.h" +#include "api/jsep.h" #include "api/jsepsessiondescription.h" #include "api/mediastreaminterface.h" +#include "api/mediatypes.h" #include "api/peerconnectioninterface.h" +#include "api/rtcerror.h" +#include "api/rtceventlogoutput.h" #include "api/rtpreceiverinterface.h" #include "api/rtpsenderinterface.h" +#include "api/rtptransceiverinterface.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" +#include "api/video_codecs/video_decoder_factory.h" +#include "api/video_codecs/video_encoder_factory.h" #include "logging/rtc_event_log/output/rtc_event_log_output_file.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "logging/rtc_event_log/rtc_event_log_factory_interface.h" +#include "media/base/codec.h" #include "media/base/fakevideocapturer.h" +#include "media/base/mediaconfig.h" +#include "media/base/mediaengine.h" +#include "media/base/streamparams.h" +#include "media/base/videocapturer.h" #include "media/engine/webrtcmediaengine.h" #include "media/sctp/sctptransportinternal.h" +#include "modules/audio_device/include/audio_device.h" #include "modules/audio_processing/include/audio_processing.h" #include "p2p/base/fakeportallocator.h" +#include "p2p/base/p2pconstants.h" +#include "p2p/base/port.h" +#include "p2p/base/portallocator.h" +#include "p2p/base/transportdescription.h" +#include "p2p/base/transportinfo.h" #include "pc/audiotrack.h" #include "pc/mediasession.h" #include "pc/mediastream.h" #include "pc/peerconnection.h" +#include "pc/peerconnectionfactory.h" +#include "pc/rtcstatscollector.h" #include "pc/rtpsender.h" +#include "pc/sessiondescription.h" #include "pc/streamcollection.h" #include "pc/test/fakeaudiocapturemodule.h" #include "pc/test/fakertccertificategenerator.h" #include "pc/test/fakevideotracksource.h" #include "pc/test/mockpeerconnectionobservers.h" #include "pc/test/testsdpstrings.h" -#include "pc/videocapturertracksource.h" #include "pc/videotrack.h" +#include "rtc_base/checks.h" +#include "rtc_base/copyonwritebuffer.h" #include "rtc_base/gunit.h" +#include "rtc_base/platform_file.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/rtccertificategenerator.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/socketaddress.h" #include "rtc_base/stringutils.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" #include "rtc_base/virtualsocketserver.h" #include "test/gmock.h" +#include "test/gtest.h" #include "test/testsupport/fileutils.h" #ifdef WEBRTC_ANDROID Index: chromium-72.0.3626.53/third_party/webrtc/pc/peerconnectionwrapper.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/peerconnectionwrapper.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/peerconnectionwrapper.cc @@ -10,17 +10,21 @@ #include "pc/peerconnectionwrapper.h" +#include <stdint.h> #include <memory> #include <string> #include <utility> #include <vector> -#include "absl/memory/memory.h" -#include "api/jsepsessiondescription.h" +#include "api/setremotedescriptionobserverinterface.h" #include "pc/sdputils.h" #include "pc/test/fakevideotracksource.h" +#include "rtc_base/checks.h" #include "rtc_base/function_view.h" #include "rtc_base/gunit.h" +#include "rtc_base/logging.h" +#include "rtc_base/refcountedobject.h" +#include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/peerconnectionwrapper.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/peerconnectionwrapper.h +++ chromium-72.0.3626.53/third_party/webrtc/pc/peerconnectionwrapper.h @@ -11,14 +11,22 @@ #ifndef PC_PEERCONNECTIONWRAPPER_H_ #define PC_PEERCONNECTIONWRAPPER_H_ -#include <functional> #include <memory> #include <string> #include <vector> +#include "api/datachannelinterface.h" +#include "api/jsep.h" +#include "api/mediastreaminterface.h" +#include "api/mediatypes.h" #include "api/peerconnectioninterface.h" +#include "api/rtcerror.h" +#include "api/rtpsenderinterface.h" +#include "api/rtptransceiverinterface.h" +#include "api/stats/rtcstatsreport.h" #include "pc/test/mockpeerconnectionobservers.h" #include "rtc_base/function_view.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/remoteaudiosource.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/remoteaudiosource.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/remoteaudiosource.cc @@ -10,16 +10,18 @@ #include "pc/remoteaudiosource.h" +#include <stddef.h> #include <algorithm> -#include <functional> -#include <memory> -#include <utility> +#include <string> #include "absl/memory/memory.h" #include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" +#include "rtc_base/location.h" #include "rtc_base/logging.h" +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread.h" +#include "rtc_base/thread_checker.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/rtcpmuxfilter_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/rtcpmuxfilter_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/rtcpmuxfilter_unittest.cc @@ -9,7 +9,8 @@ */ #include "pc/rtcpmuxfilter.h" -#include "rtc_base/gunit.h" + +#include "test/gtest.h" TEST(RtcpMuxFilterTest, IsActiveSender) { cricket::RtcpMuxFilter filter; Index: chromium-72.0.3626.53/third_party/webrtc/pc/rtcstats_integrationtest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/rtcstats_integrationtest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/rtcstats_integrationtest.cc @@ -8,16 +8,27 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> +#include <string.h> #include <algorithm> +#include <memory> #include <set> +#include <string> #include <vector> +#include "api/audio_codecs/audio_decoder_factory.h" +#include "api/audio_codecs/audio_encoder_factory.h" #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" +#include "api/audio_options.h" #include "api/datachannelinterface.h" #include "api/peerconnectioninterface.h" +#include "api/rtpreceiverinterface.h" +#include "api/rtpsenderinterface.h" +#include "api/stats/rtcstats.h" #include "api/stats/rtcstats_objects.h" #include "api/stats/rtcstatsreport.h" +#include "api/test/fakeconstraints.h" #include "pc/rtcstatstraversal.h" #include "pc/test/peerconnectiontestwrapper.h" #include "pc/test/rtcstatsobtainer.h" @@ -27,8 +38,10 @@ #include "rtc_base/refcountedobject.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/stringutils.h" +#include "rtc_base/thread.h" #include "rtc_base/trace_event.h" #include "rtc_base/virtualsocketserver.h" +#include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/rtcstatstraversal.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/rtcstatstraversal.h +++ chromium-72.0.3626.53/third_party/webrtc/pc/rtcstatstraversal.h @@ -14,6 +14,7 @@ #include <string> #include <vector> +#include "api/stats/rtcstats.h" #include "api/stats/rtcstatsreport.h" #include "rtc_base/scoped_ref_ptr.h" Index: chromium-72.0.3626.53/third_party/webrtc/pc/rtcstatstraversal_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/rtcstatstraversal_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/rtcstatstraversal_unittest.cc @@ -15,8 +15,7 @@ #include <vector> #include "api/stats/rtcstats_objects.h" -#include "rtc_base/checks.h" -#include "rtc_base/gunit.h" +#include "test/gtest.h" // This file contains tests for TakeReferencedStats(). // GetStatsNeighborIds() is tested in rtcstats_integrationtest.cc. Index: chromium-72.0.3626.53/third_party/webrtc/pc/rtpmediautils.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/rtpmediautils.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/rtpmediautils.cc @@ -10,6 +10,8 @@ #include "pc/rtpmediautils.h" +#include "rtc_base/checks.h" + namespace webrtc { RtpTransceiverDirection RtpTransceiverDirectionFromSendRecv(bool send, Index: chromium-72.0.3626.53/third_party/webrtc/pc/rtpparametersconversion.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/rtpparametersconversion.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/rtpparametersconversion.cc @@ -10,10 +10,19 @@ #include "pc/rtpparametersconversion.h" +#include <cstdint> #include <set> +#include <string> +#include <unordered_map> #include <utility> +#include "api/array_view.h" +#include "api/mediatypes.h" +#include "media/base/mediaconstants.h" #include "media/base/rtputils.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" +#include "rtc_base/strings/string_builder.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/rtpparametersconversion.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/rtpparametersconversion.h +++ chromium-72.0.3626.53/third_party/webrtc/pc/rtpparametersconversion.h @@ -11,14 +11,15 @@ #ifndef PC_RTPPARAMETERSCONVERSION_H_ #define PC_RTPPARAMETERSCONVERSION_H_ -#include <memory> +#include <iosfwd> #include <vector> #include "absl/types/optional.h" #include "api/rtcerror.h" #include "api/rtpparameters.h" #include "media/base/codec.h" -#include "pc/mediasession.h" +#include "media/base/streamparams.h" +#include "pc/sessiondescription.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/rtpreceiver.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/rtpreceiver.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/rtpreceiver.cc @@ -10,6 +10,7 @@ #include "pc/rtpreceiver.h" +#include <stddef.h> #include <utility> #include <vector> @@ -19,6 +20,9 @@ #include "pc/audiotrack.h" #include "pc/mediastream.h" #include "pc/videotrack.h" +#include "rtc_base/checks.h" +#include "rtc_base/location.h" +#include "rtc_base/logging.h" #include "rtc_base/trace_event.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/rtpreceiver.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/rtpreceiver.h +++ chromium-72.0.3626.53/third_party/webrtc/pc/rtpreceiver.h @@ -16,15 +16,25 @@ #define PC_RTPRECEIVER_H_ #include <stdint.h> - #include <string> #include <vector> +#include "absl/types/optional.h" +#include "api/crypto/framedecryptorinterface.h" #include "api/mediastreaminterface.h" +#include "api/mediatypes.h" +#include "api/rtpparameters.h" #include "api/rtpreceiverinterface.h" +#include "api/video/video_frame.h" +#include "api/video/video_sink_interface.h" +#include "api/video/video_source_interface.h" +#include "media/base/mediachannel.h" #include "media/base/videobroadcaster.h" #include "pc/remoteaudiosource.h" #include "pc/videotracksource.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/thread.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/rtpsender.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/rtpsender.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/rtpsender.cc @@ -13,11 +13,14 @@ #include <utility> #include <vector> +#include "api/audio_options.h" #include "api/mediastreaminterface.h" -#include "pc/localaudiosource.h" +#include "media/base/mediaengine.h" #include "pc/statscollector.h" #include "rtc_base/checks.h" #include "rtc_base/helpers.h" +#include "rtc_base/location.h" +#include "rtc_base/logging.h" #include "rtc_base/trace_event.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/rtpsenderreceiver_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/rtpsenderreceiver_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/rtpsenderreceiver_unittest.cc @@ -8,30 +8,54 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stddef.h> +#include <cstdint> #include <memory> #include <string> #include <utility> +#include <vector> +#include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/audio_options.h" +#include "api/crypto/cryptooptions.h" +#include "api/crypto/framedecryptorinterface.h" +#include "api/crypto/frameencryptorinterface.h" +#include "api/dtmfsenderinterface.h" +#include "api/mediastreaminterface.h" +#include "api/rtcerror.h" #include "api/rtpparameters.h" #include "api/test/fake_frame_decryptor.h" #include "api/test/fake_frame_encryptor.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "media/base/codec.h" #include "media/base/fakemediaengine.h" +#include "media/base/mediachannel.h" +#include "media/base/mediaconfig.h" +#include "media/base/mediaengine.h" #include "media/base/rtpdataengine.h" +#include "media/base/streamparams.h" #include "media/base/testutils.h" #include "media/engine/fakewebrtccall.h" +#include "p2p/base/dtlstransportinternal.h" #include "p2p/base/fakedtlstransport.h" +#include "p2p/base/p2pconstants.h" #include "pc/audiotrack.h" +#include "pc/channel.h" #include "pc/channelmanager.h" +#include "pc/dtlssrtptransport.h" #include "pc/localaudiosource.h" #include "pc/mediastream.h" -#include "pc/remoteaudiosource.h" #include "pc/rtpreceiver.h" #include "pc/rtpsender.h" -#include "pc/streamcollection.h" +#include "pc/rtptransportinternal.h" #include "pc/test/fakevideotracksource.h" #include "pc/videotrack.h" -#include "pc/videotracksource.h" +#include "rtc_base/checks.h" #include "rtc_base/gunit.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/third_party/sigslot/sigslot.h" +#include "rtc_base/thread.h" #include "test/gmock.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/pc/rtptransceiver.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/rtptransceiver.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/rtptransceiver.cc @@ -10,9 +10,12 @@ #include "pc/rtptransceiver.h" +#include <algorithm> #include <string> #include "pc/rtpmediautils.h" +#include "rtc_base/checks.h" +#include "rtc_base/logging.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/rtptransceiver_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/rtptransceiver_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/rtptransceiver_unittest.cc @@ -11,8 +11,9 @@ // This file contains tests for |RtpTransceiver|. #include "pc/rtptransceiver.h" -#include "rtc_base/gunit.h" + #include "test/gmock.h" +#include "test/gtest.h" #include "test/mock_channelinterface.h" using ::testing::Return; Index: chromium-72.0.3626.53/third_party/webrtc/pc/rtptransport.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/rtptransport.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/rtptransport.cc @@ -10,14 +10,18 @@ #include "pc/rtptransport.h" +#include <errno.h> +#include <string> #include <utility> +#include "api/rtp_headers.h" +#include "api/rtpparameters.h" #include "media/base/rtputils.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" -#include "p2p/base/p2pconstants.h" -#include "p2p/base/packettransportinterface.h" #include "rtc_base/checks.h" #include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/logging.h" +#include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/trace_event.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/rtptransport_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/rtptransport_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/rtptransport_unittest.cc @@ -8,13 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <cstdint> +#include <set> #include <string> #include <utility> +#include "api/rtp_headers.h" +#include "api/rtpparameters.h" #include "p2p/base/fakepackettransport.h" #include "pc/rtptransport.h" #include "pc/rtptransporttestutil.h" -#include "rtc_base/gunit.h" +#include "rtc_base/buffer.h" +#include "rtc_base/third_party/sigslot/sigslot.h" +#include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/sctputils.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/sctputils.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/sctputils.cc @@ -10,6 +10,9 @@ #include "pc/sctputils.h" +#include <stddef.h> +#include <stdint.h> + #include "rtc_base/bytebuffer.h" #include "rtc_base/copyonwritebuffer.h" #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/pc/sctputils_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/sctputils_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/sctputils_unittest.cc @@ -9,9 +9,12 @@ */ #include "pc/sctputils.h" + +#include <stdint.h> + #include "rtc_base/bytebuffer.h" #include "rtc_base/copyonwritebuffer.h" -#include "rtc_base/gunit.h" +#include "test/gtest.h" class SctpUtilsTest : public testing::Test { public: Index: chromium-72.0.3626.53/third_party/webrtc/pc/sessiondescription.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/sessiondescription.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/sessiondescription.cc @@ -10,8 +10,11 @@ #include "pc/sessiondescription.h" +#include <algorithm> #include <utility> +#include "rtc_base/checks.h" + namespace cricket { namespace { Index: chromium-72.0.3626.53/third_party/webrtc/pc/sessiondescription.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/sessiondescription.h +++ chromium-72.0.3626.53/third_party/webrtc/pc/sessiondescription.h @@ -11,17 +11,21 @@ #ifndef PC_SESSIONDESCRIPTION_H_ #define PC_SESSIONDESCRIPTION_H_ +#include <stddef.h> +#include <stdint.h> +#include <iosfwd> #include <string> #include <vector> #include "api/cryptoparams.h" +#include "api/mediatypes.h" #include "api/rtpparameters.h" #include "api/rtptransceiverinterface.h" -#include "media/base/codec.h" #include "media/base/mediachannel.h" #include "media/base/streamparams.h" +#include "p2p/base/transportdescription.h" #include "p2p/base/transportinfo.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/socketaddress.h" namespace cricket { @@ -49,8 +53,8 @@ extern const char kMediaProtocolTcpDtlsS const int kAutoBandwidth = -1; class AudioContentDescription; -class VideoContentDescription; class DataContentDescription; +class VideoContentDescription; // Describes a session description media section. There are subclasses for each // media type (audio, video, data) that will have additional information. Index: chromium-72.0.3626.53/third_party/webrtc/pc/sessiondescription_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/sessiondescription_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/sessiondescription_unittest.cc @@ -8,7 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ #include "pc/sessiondescription.h" -#include "rtc_base/gunit.h" + +#include "test/gtest.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/pc/srtpfilter.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/srtpfilter.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/srtpfilter.cc @@ -11,16 +11,11 @@ #include "pc/srtpfilter.h" #include <string.h> -#include <algorithm> -#include <utility> +#include <cstdint> -#include "media/base/rtputils.h" -#include "pc/srtpsession.h" -#include "rtc_base/byteorder.h" -#include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/sslstreamadapter.h" #include "rtc_base/third_party/base64/base64.h" -#include "rtc_base/timeutils.h" #include "rtc_base/zero_memory.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/pc/srtpfilter_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/srtpfilter_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/srtpfilter_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <algorithm> - -#include "pc/srtpfilter.h" +#include <string.h> #include "api/cryptoparams.h" -#include "rtc_base/gunit.h" +#include "pc/srtpfilter.h" +#include "rtc_base/sslstreamadapter.h" +#include "test/gtest.h" using cricket::CryptoParams; using cricket::CS_LOCAL; Index: chromium-72.0.3626.53/third_party/webrtc/pc/srtpsession_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/srtpsession_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/srtpsession_unittest.cc @@ -10,14 +10,15 @@ #include "pc/srtpsession.h" +#include <string.h> #include <string> -#include "absl/memory/memory.h" #include "media/base/fakertp.h" #include "pc/srtptestutil.h" -#include "rtc_base/gunit.h" +#include "rtc_base/byteorder.h" #include "rtc_base/sslstreamadapter.h" // For rtc::SRTP_* #include "system_wrappers/include/metrics.h" +#include "test/gtest.h" #include "third_party/libsrtp/include/srtp.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/srtptransport.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/srtptransport.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/srtptransport.cc @@ -10,17 +10,22 @@ #include "pc/srtptransport.h" +#include <stdint.h> +#include <string.h> #include <string> #include <vector> -#include "absl/memory/memory.h" #include "media/base/rtputils.h" #include "pc/rtptransport.h" #include "pc/srtpsession.h" #include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/checks.h" #include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" +#include "rtc_base/sslstreamadapter.h" #include "rtc_base/third_party/base64/base64.h" +#include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/trace_event.h" #include "rtc_base/zero_memory.h" Index: chromium-72.0.3626.53/third_party/webrtc/pc/srtptransport.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/srtptransport.h +++ chromium-72.0.3626.53/third_party/webrtc/pc/srtptransport.h @@ -11,18 +11,22 @@ #ifndef PC_SRTPTRANSPORT_H_ #define PC_SRTPTRANSPORT_H_ +#include <stddef.h> +#include <cstdint> #include <memory> #include <string> -#include <utility> #include <vector> -#include "api/ortc/srtptransportinterface.h" -#include "p2p/base/dtlstransportinternal.h" -#include "p2p/base/icetransportinternal.h" +#include "absl/types/optional.h" +#include "api/cryptoparams.h" +#include "api/rtcerror.h" +#include "p2p/base/packettransportinternal.h" #include "pc/rtptransport.h" #include "pc/srtpsession.h" +#include "rtc_base/asyncpacketsocket.h" #include "rtc_base/buffer.h" -#include "rtc_base/checks.h" +#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/networkroute.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/srtptransport_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/srtptransport_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/srtptransport_unittest.cc @@ -8,20 +8,24 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <string.h> +#include <set> #include <vector> -#include "pc/srtptransport.h" - #include "absl/memory/memory.h" +#include "call/rtp_demuxer.h" #include "media/base/fakertp.h" #include "p2p/base/dtlstransportinternal.h" #include "p2p/base/fakepackettransport.h" -#include "pc/rtptransport.h" #include "pc/rtptransporttestutil.h" #include "pc/srtptestutil.h" +#include "pc/srtptransport.h" #include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/gunit.h" +#include "rtc_base/byteorder.h" +#include "rtc_base/checks.h" #include "rtc_base/sslstreamadapter.h" +#include "rtc_base/third_party/sigslot/sigslot.h" +#include "test/gtest.h" using rtc::kTestKey1; using rtc::kTestKey2; Index: chromium-72.0.3626.53/third_party/webrtc/pc/statscollector.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/statscollector.h +++ chromium-72.0.3626.53/third_party/webrtc/pc/statscollector.h @@ -14,6 +14,7 @@ #ifndef PC_STATSCOLLECTOR_H_ #define PC_STATSCOLLECTOR_H_ +#include <stdint.h> #include <map> #include <memory> #include <string> @@ -23,7 +24,10 @@ #include "api/mediastreaminterface.h" #include "api/peerconnectioninterface.h" #include "api/statstypes.h" +#include "p2p/base/port.h" #include "pc/peerconnectioninternal.h" +#include "rtc_base/network_constants.h" +#include "rtc_base/sslcertificate.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/statscollector_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/statscollector_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/statscollector_unittest.cc @@ -9,21 +9,37 @@ */ #include <stdio.h> - #include <algorithm> #include <memory> -#include <utility> - -#include "pc/statscollector.h" +#include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/audio_codecs/audio_encoder.h" +#include "api/candidate.h" +#include "api/datachannelinterface.h" +#include "call/call.h" +#include "media/base/mediachannel.h" +#include "modules/audio_processing/include/audio_processing_statistics.h" +#include "pc/datachannel.h" #include "pc/mediastream.h" #include "pc/mediastreamtrack.h" +#include "pc/statscollector.h" #include "pc/test/fakepeerconnectionforstats.h" #include "pc/test/fakevideotracksource.h" +#include "pc/transportstats.h" #include "pc/videotrack.h" #include "rtc_base/fakesslidentity.h" #include "rtc_base/messagedigest.h" +#include "rtc_base/nethelper.h" +#include "rtc_base/refcountedobject.h" +#include "rtc_base/rtccertificate.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/sslidentity.h" +#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/stringencode.h" #include "rtc_base/third_party/base64/base64.h" +#include "rtc_base/thread.h" #include "test/gtest.h" using cricket::ConnectionInfo; Index: chromium-72.0.3626.53/third_party/webrtc/pc/test/fakeaudiocapturemodule.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/test/fakeaudiocapturemodule.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/test/fakeaudiocapturemodule.cc @@ -10,8 +10,10 @@ #include "pc/test/fakeaudiocapturemodule.h" +#include <string.h> + #include "rtc_base/checks.h" -#include "rtc_base/refcount.h" +#include "rtc_base/location.h" #include "rtc_base/refcountedobject.h" #include "rtc_base/thread.h" #include "rtc_base/timeutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/pc/test/fakeaudiocapturemodule_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/test/fakeaudiocapturemodule_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/test/fakeaudiocapturemodule_unittest.cc @@ -10,11 +10,13 @@ #include "pc/test/fakeaudiocapturemodule.h" +#include <string.h> #include <algorithm> #include "rtc_base/criticalsection.h" #include "rtc_base/gunit.h" #include "rtc_base/scoped_ref_ptr.h" +#include "test/gtest.h" using std::min; Index: chromium-72.0.3626.53/third_party/webrtc/pc/transportstats.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/transportstats.h +++ chromium-72.0.3626.53/third_party/webrtc/pc/transportstats.h @@ -14,8 +14,9 @@ #include <string> #include <vector> -#include "p2p/base/dtlstransport.h" +#include "p2p/base/dtlstransportinternal.h" #include "p2p/base/port.h" +#include "rtc_base/sslstreamadapter.h" namespace cricket { Index: chromium-72.0.3626.53/third_party/webrtc/pc/videocapturertracksource_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/videocapturertracksource_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/videocapturertracksource_unittest.cc @@ -8,20 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stddef.h> #include <memory> -#include <string> #include <utility> #include <vector> #include "api/test/fakeconstraints.h" -#include "media/base/fakemediaengine.h" #include "media/base/fakevideocapturer.h" #include "media/base/fakevideorenderer.h" +#include "media/base/mediachannel.h" #include "pc/videocapturertracksource.h" #include "rtc_base/arraysize.h" #include "rtc_base/event.h" #include "rtc_base/gunit.h" #include "rtc_base/task_queue.h" +#include "test/gtest.h" using cricket::FOURCC_I420; using cricket::VideoFormat; Index: chromium-72.0.3626.53/third_party/webrtc/pc/videotrack.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/videotrack.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/videotrack.cc @@ -9,8 +9,12 @@ */ #include <string> +#include <vector> +#include "api/notifier.h" #include "pc/videotrack.h" +#include "rtc_base/checks.h" +#include "rtc_base/location.h" #include "rtc_base/refcountedobject.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/videotrack.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/videotrack.h +++ chromium-72.0.3626.53/third_party/webrtc/pc/videotrack.h @@ -12,12 +12,16 @@ #define PC_VIDEOTRACK_H_ #include <string> -#include <vector> +#include "api/mediastreaminterface.h" +#include "api/video/video_frame.h" +#include "api/video/video_sink_interface.h" +#include "api/video/video_source_interface.h" #include "media/base/videosourcebase.h" #include "pc/mediastreamtrack.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread.h" +#include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/videotrack_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/videotrack_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/videotrack_unittest.cc @@ -9,14 +9,14 @@ */ #include <memory> -#include <string> -#include "media/base/fakemediaengine.h" #include "media/base/fakevideocapturer.h" +#include "media/base/videocommon.h" #include "pc/test/fakevideotrackrenderer.h" -#include "pc/videocapturertracksource.h" #include "pc/videotrack.h" -#include "rtc_base/gunit.h" +#include "pc/videotracksource.h" +#include "rtc_base/refcountedobject.h" +#include "test/gtest.h" using webrtc::FakeVideoTrackRenderer; using webrtc::MediaSourceInterface; Index: chromium-72.0.3626.53/third_party/webrtc/pc/videotracksource.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/videotracksource.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/videotracksource.cc @@ -10,7 +10,7 @@ #include "pc/videotracksource.h" -#include <string> +#include "rtc_base/checks.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/pc/webrtcsdp_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/webrtcsdp_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/webrtcsdp_unittest.cc @@ -8,21 +8,34 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdio.h> +#include <string.h> +#include <cstdint> +#include <map> #include <memory> -#include <set> #include <string> +#include <utility> #include <vector> +#include "api/array_view.h" +#include "api/cryptoparams.h" #include "api/jsepsessiondescription.h" +#include "api/mediatypes.h" +#include "api/rtpparameters.h" +#include "api/rtptransceiverinterface.h" +#include "media/base/codec.h" #include "media/base/mediaconstants.h" -#include "media/engine/webrtcvideoengine.h" +#include "media/base/streamparams.h" #include "p2p/base/p2pconstants.h" #include "p2p/base/port.h" +#include "p2p/base/transportdescription.h" +#include "p2p/base/transportinfo.h" #include "pc/mediasession.h" +#include "pc/sessiondescription.h" #include "rtc_base/checks.h" -#include "rtc_base/gunit.h" -#include "rtc_base/logging.h" #include "rtc_base/messagedigest.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/sslfingerprint.h" #include "rtc_base/stringencode.h" #include "rtc_base/stringutils.h" #include "test/gmock.h" Index: chromium-72.0.3626.53/third_party/webrtc/pc/webrtcsessiondescriptionfactory.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/webrtcsessiondescriptionfactory.cc +++ chromium-72.0.3626.53/third_party/webrtc/pc/webrtcsessiondescriptionfactory.cc @@ -10,16 +10,25 @@ #include "pc/webrtcsessiondescriptionfactory.h" +#include <stddef.h> #include <algorithm> #include <string> #include <utility> #include <vector> #include "absl/memory/memory.h" +#include "absl/types/optional.h" #include "api/jsep.h" #include "api/jsepsessiondescription.h" +#include "api/rtcerror.h" +#include "pc/sessiondescription.h" #include "rtc_base/checks.h" +#include "rtc_base/location.h" +#include "rtc_base/logging.h" +#include "rtc_base/refcountedobject.h" #include "rtc_base/sslidentity.h" +#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/stringencode.h" using cricket::MediaSessionOptions; Index: chromium-72.0.3626.53/third_party/webrtc/pc/webrtcsessiondescriptionfactory.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/pc/webrtcsessiondescriptionfactory.h +++ chromium-72.0.3626.53/third_party/webrtc/pc/webrtcsessiondescriptionfactory.h @@ -11,17 +11,25 @@ #ifndef PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ #define PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ +#include <stdint.h> #include <memory> #include <queue> #include <string> +#include "api/jsep.h" +#include "api/peerconnectioninterface.h" +#include "p2p/base/transportdescription.h" #include "p2p/base/transportdescriptionfactory.h" #include "pc/mediasession.h" #include "pc/peerconnectioninternal.h" #include "rtc_base/constructormagic.h" #include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" #include "rtc_base/rtccertificate.h" #include "rtc_base/rtccertificategenerator.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/third_party/sigslot/sigslot.h" +#include "rtc_base/thread.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/BUILD.gn @@ -84,7 +84,7 @@ rtc_source_set("rtc_base_approved") { "system:arch", "system:unused", "third_party/base64", - "//third_party/abseil-cpp/absl/memory:memory", + "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/types:optional", ] @@ -992,7 +992,7 @@ rtc_source_set("testclient") { ":rtc_base", ":rtc_base_tests_utils", ":timeutils", - "//third_party/abseil-cpp/absl/memory:memory", + "//third_party/abseil-cpp/absl/memory", ] } @@ -1068,6 +1068,7 @@ if (rtc_include_tests) { ":gunit_helpers", ":rtc_base", ":rtc_base_tests_utils", + "../test:test_support", "third_party/sigslot", ] } @@ -1115,6 +1116,7 @@ if (rtc_include_tests) { "../system_wrappers:system_wrappers", "../test:fileutils", "../test:test_support", + "third_party/sigslot:sigslot", "//testing/gtest", "//third_party/abseil-cpp/absl/memory", ] @@ -1191,11 +1193,13 @@ if (rtc_include_tests) { ":stringutils", ":testclient", "../api:array_view", + "../api/units:time_delta", "../system_wrappers:system_wrappers", "../test:fileutils", "../test:test_support", "memory:unittests", "third_party/base64", + "third_party/sigslot:sigslot", "//third_party/abseil-cpp/absl/memory", ] } @@ -1217,6 +1221,7 @@ if (rtc_include_tests) { ":rtc_task_queue", ":rtc_task_queue_for_test", "../test:test_support", + "//third_party/abseil-cpp/absl/memory", ] } @@ -1251,6 +1256,7 @@ if (rtc_include_tests) { ":rtc_task_queue", ":weak_ptr", "../test:test_support", + "//third_party/abseil-cpp/absl/memory", ] } Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/asyncpacketsocket.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/asyncpacketsocket.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/asyncpacketsocket.h @@ -14,6 +14,7 @@ #include "rtc_base/constructormagic.h" #include "rtc_base/deprecation.h" #include "rtc_base/dscp.h" +#include "rtc_base/network/sent_packet.h" #include "rtc_base/socket.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/timeutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/asyncsocket.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/asyncsocket.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/asyncsocket.h @@ -11,7 +11,11 @@ #ifndef RTC_BASE_ASYNCSOCKET_H_ #define RTC_BASE_ASYNCSOCKET_H_ +#include <stddef.h> +#include <stdint.h> + #include "rtc_base/socket.h" +#include "rtc_base/socketaddress.h" #include "rtc_base/third_party/sigslot/sigslot.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/asynctcpsocket.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/asynctcpsocket.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/asynctcpsocket.cc @@ -10,14 +10,16 @@ #include "rtc_base/asynctcpsocket.h" +#include <stdint.h> #include <string.h> - #include <algorithm> #include <memory> #include "rtc_base/byteorder.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/network/sent_packet.h" +#include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/timeutils.h" // for TimeMillis #if defined(WEBRTC_POSIX) Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/asyncudpsocket.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/asyncudpsocket.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/asyncudpsocket.cc @@ -9,8 +9,15 @@ */ #include "rtc_base/asyncudpsocket.h" + +#include <stdint.h> +#include <string> + #include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/network/sent_packet.h" +#include "rtc_base/third_party/sigslot/sigslot.h" +#include "rtc_base/timeutils.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/base64_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/base64_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/base64_unittest.cc @@ -9,10 +9,14 @@ */ #include "rtc_base/third_party/base64/base64.h" -#include "rtc_base/gunit.h" -#include "rtc_base/logging.h" +#include <stdio.h> +#include <string.h> +#include <algorithm> + +#include "rtc_base/logging.h" #include "rtc_base/testbase64.h" +#include "test/gtest.h" using namespace std; using namespace rtc; Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/bind_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/bind_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/bind_unittest.cc @@ -8,13 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <type_traits> +#include <string> #include "rtc_base/bind.h" -#include "rtc_base/gunit.h" - #include "rtc_base/refcount.h" #include "rtc_base/refcountedobject.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/bitbuffer_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/bitbuffer_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/bitbuffer_unittest.cc @@ -9,9 +9,12 @@ */ #include "rtc_base/bitbuffer.h" + +#include <limits> + #include "rtc_base/arraysize.h" #include "rtc_base/bytebuffer.h" -#include "rtc_base/gunit.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/bitrateallocationstrategy_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/bitrateallocationstrategy_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/bitrateallocationstrategy_unittest.cc @@ -9,7 +9,10 @@ */ #include "rtc_base/bitrateallocationstrategy.h" -#include "rtc_base/gunit.h" + +#include <cstdint> + +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/buffer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/buffer.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/buffer.h @@ -11,6 +11,7 @@ #ifndef RTC_BASE_BUFFER_H_ #define RTC_BASE_BUFFER_H_ +#include <stdint.h> #include <algorithm> #include <cstring> #include <memory> Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/buffer_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/buffer_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/buffer_unittest.cc @@ -10,12 +10,12 @@ #include "rtc_base/buffer.h" -#include "api/array_view.h" -#include "rtc_base/gunit.h" - -#include <type_traits> +#include <cstdint> #include <utility> +#include "api/array_view.h" +#include "test/gtest.h" + namespace rtc { namespace { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/bufferqueue_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/bufferqueue_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/bufferqueue_unittest.cc @@ -9,7 +9,10 @@ */ #include "rtc_base/bufferqueue.h" -#include "rtc_base/gunit.h" + +#include <string.h> + +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/bytebuffer_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/bytebuffer_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/bytebuffer_unittest.cc @@ -9,9 +9,12 @@ */ #include "rtc_base/bytebuffer.h" + +#include <string.h> + #include "rtc_base/arraysize.h" #include "rtc_base/byteorder.h" -#include "rtc_base/gunit.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/byteorder_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/byteorder_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/byteorder_unittest.cc @@ -11,7 +11,7 @@ #include <stdint.h> #include "rtc_base/byteorder.h" -#include "rtc_base/gunit.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/callback_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/callback_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/callback_unittest.cc @@ -9,10 +9,11 @@ */ #include "rtc_base/callback.h" + #include "rtc_base/bind.h" -#include "rtc_base/gunit.h" #include "rtc_base/keep_ref_until_done.h" #include "rtc_base/refcount.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/cancelable_task_handle.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/cancelable_task_handle.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/cancelable_task_handle.cc @@ -12,6 +12,8 @@ #include <utility> +#include "rtc_base/checks.h" +#include "rtc_base/refcount.h" #include "rtc_base/refcounter.h" #include "rtc_base/sequenced_task_checker.h" #include "rtc_base/thread_annotations.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/copyonwritebuffer_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/copyonwritebuffer_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/copyonwritebuffer_unittest.cc @@ -9,7 +9,10 @@ */ #include "rtc_base/copyonwritebuffer.h" -#include "rtc_base/gunit.h" + +#include <cstdint> + +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/cpu_time.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/cpu_time.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/cpu_time.cc @@ -9,6 +9,7 @@ */ #include "rtc_base/cpu_time.h" + #include "rtc_base/logging.h" #include "rtc_base/timeutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/cpu_time_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/cpu_time_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/cpu_time_unittest.cc @@ -9,11 +9,9 @@ */ #include "rtc_base/cpu_time.h" -#include <algorithm> -#include <memory> + #include "rtc_base/platform_thread.h" #include "rtc_base/timeutils.h" -#include "system_wrappers/include/cpu_info.h" #include "system_wrappers/include/sleep.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/crc32_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/crc32_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/crc32_unittest.cc @@ -9,10 +9,11 @@ */ #include "rtc_base/crc32.h" -#include "rtc_base/gunit.h" #include <string> +#include "test/gtest.h" + namespace rtc { TEST(Crc32Test, TestBasic) { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/criticalsection_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/criticalsection_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/criticalsection_unittest.cc @@ -8,8 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stddef.h> +#include <stdint.h> #include <memory> #include <set> +#include <utility> #include <vector> #include "rtc_base/arraysize.h" @@ -17,9 +20,12 @@ #include "rtc_base/checks.h" #include "rtc_base/criticalsection.h" #include "rtc_base/event.h" -#include "rtc_base/gunit.h" +#include "rtc_base/location.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" #include "rtc_base/platform_thread.h" #include "rtc_base/thread.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/data_rate_limiter_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/data_rate_limiter_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/data_rate_limiter_unittest.cc @@ -9,7 +9,8 @@ */ #include "rtc_base/data_rate_limiter.h" -#include "rtc_base/gunit.h" + +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/event_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/event_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/event_unittest.cc @@ -9,8 +9,9 @@ */ #include "rtc_base/event.h" -#include "rtc_base/gunit.h" + #include "rtc_base/platform_thread.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/congestion_controller_experiment_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/experiments/congestion_controller_experiment_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/congestion_controller_experiment_unittest.cc @@ -9,8 +9,9 @@ */ #include "rtc_base/experiments/congestion_controller_experiment.h" -#include "rtc_base/gunit.h" + #include "test/field_trial.h" +#include "test/gtest.h" namespace webrtc { TEST(CongestionControllerExperimentTest, BbrDisabledByDefault) { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/cpu_speed_experiment.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/experiments/cpu_speed_experiment.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/cpu_speed_experiment.cc @@ -10,6 +10,7 @@ #include "rtc_base/experiments/cpu_speed_experiment.h" +#include <stdio.h> #include <string> #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/field_trial_units_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/experiments/field_trial_units_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/field_trial_units_unittest.cc @@ -9,9 +9,10 @@ */ #include <string> +#include "absl/types/optional.h" #include "rtc_base/experiments/field_trial_parser.h" #include "rtc_base/experiments/field_trial_units.h" -#include "rtc_base/gunit.h" +#include "test/gtest.h" namespace webrtc { namespace { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/jitter_upper_bound_experiment.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/experiments/jitter_upper_bound_experiment.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/jitter_upper_bound_experiment.cc @@ -10,7 +10,7 @@ #include "rtc_base/experiments/jitter_upper_bound_experiment.h" -#include <algorithm> +#include <stdio.h> #include <string> #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/normalize_simulcast_size_experiment.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/experiments/normalize_simulcast_size_experiment.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/normalize_simulcast_size_experiment.cc @@ -10,6 +10,7 @@ #include "rtc_base/experiments/normalize_simulcast_size_experiment.h" +#include <stdio.h> #include <string> #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/normalize_simulcast_size_experiment_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/experiments/normalize_simulcast_size_experiment_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/normalize_simulcast_size_experiment_unittest.cc @@ -10,8 +10,8 @@ #include "rtc_base/experiments/normalize_simulcast_size_experiment.h" -#include "rtc_base/gunit.h" #include "test/field_trial.h" +#include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/quality_scaling_experiment.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/experiments/quality_scaling_experiment.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/quality_scaling_experiment.cc @@ -9,6 +9,7 @@ */ #include "rtc_base/experiments/quality_scaling_experiment.h" +#include <stdio.h> #include <string> #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/quality_scaling_experiment_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/experiments/quality_scaling_experiment_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/quality_scaling_experiment_unittest.cc @@ -10,8 +10,8 @@ #include "rtc_base/experiments/quality_scaling_experiment.h" -#include "rtc_base/gunit.h" #include "test/field_trial.h" +#include "test/gtest.h" namespace webrtc { namespace { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/rtt_mult_experiment.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/experiments/rtt_mult_experiment.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/rtt_mult_experiment.cc @@ -9,6 +9,7 @@ */ #include "rtc_base/experiments/rtt_mult_experiment.h" +#include <stdio.h> #include <algorithm> #include <string> Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/rtt_mult_experiment_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/experiments/rtt_mult_experiment_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/experiments/rtt_mult_experiment_unittest.cc @@ -9,8 +9,9 @@ */ #include "rtc_base/experiments/rtt_mult_experiment.h" -#include "rtc_base/gunit.h" + #include "test/field_trial.h" +#include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/fakeclock.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/fakeclock.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/fakeclock.h @@ -11,8 +11,11 @@ #ifndef RTC_BASE_FAKECLOCK_H_ #define RTC_BASE_FAKECLOCK_H_ +#include <stdint.h> + #include "api/units/time_delta.h" #include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" #include "rtc_base/timeutils.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/fakesslidentity.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/fakesslidentity.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/fakesslidentity.cc @@ -10,7 +10,6 @@ #include "rtc_base/fakesslidentity.h" -#include <algorithm> #include <string> #include <utility> Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/file_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/file_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/file_unittest.cc @@ -8,12 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <limits> -#include <memory> +#include <string.h> #include <string> #include "rtc_base/file.h" -#include "rtc_base/gunit.h" +#include "test/gtest.h" #include "test/testsupport/fileutils.h" #if defined(WEBRTC_WIN) Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/filerotatingstream.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/filerotatingstream.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/filerotatingstream.cc @@ -25,6 +25,7 @@ #endif // WEBRTC_WIN #include "absl/strings/match.h" +#include "absl/types/optional.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/filerotatingstream_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/filerotatingstream_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/filerotatingstream_unittest.cc @@ -8,12 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <string.h> +#include <cstdint> #include <memory> #include "rtc_base/arraysize.h" -#include "rtc_base/checks.h" #include "rtc_base/filerotatingstream.h" -#include "rtc_base/gunit.h" +#include "test/gtest.h" #include "test/testsupport/fileutils.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/firewallsocketserver.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/firewallsocketserver.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/firewallsocketserver.cc @@ -10,7 +10,11 @@ #include "rtc_base/firewallsocketserver.h" +#include <errno.h> +#include <stddef.h> +#include <stdint.h> #include <algorithm> +#include <string> #include "rtc_base/asyncsocket.h" #include "rtc_base/checks.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/firewallsocketserver.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/firewallsocketserver.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/firewallsocketserver.h @@ -12,7 +12,12 @@ #define RTC_BASE_FIREWALLSOCKETSERVER_H_ #include <vector> + +#include "rtc_base/asyncsocket.h" #include "rtc_base/criticalsection.h" +#include "rtc_base/ipaddress.h" +#include "rtc_base/socket.h" +#include "rtc_base/socketaddress.h" #include "rtc_base/socketserver.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/function_view_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/function_view_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/function_view_unittest.cc @@ -12,7 +12,7 @@ #include <utility> #include "rtc_base/function_view.h" -#include "rtc_base/gunit.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/helpers.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/helpers.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/helpers.cc @@ -10,15 +10,13 @@ #include "rtc_base/helpers.h" +#include <openssl/rand.h> +#include <cstdint> #include <limits> #include <memory> -#include <openssl/rand.h> - #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/third_party/base64/base64.h" -#include "rtc_base/timeutils.h" // Protect against max macro inclusion. #undef max Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/helpers_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/helpers_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/helpers_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <string.h> #include <string> #include "rtc_base/buffer.h" -#include "rtc_base/gunit.h" #include "rtc_base/helpers.h" -#include "rtc_base/ssladapter.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/httpcommon.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/httpcommon.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/httpcommon.cc @@ -14,25 +14,24 @@ #include <windows.h> #include <winsock2.h> #include <ws2tcpip.h> + #define SECURITY_WIN32 #include <security.h> #endif #include <ctype.h> // for isspace #include <stdio.h> // for sprintf -#include <algorithm> #include <utility> // for pair #include <vector> #include "absl/strings/match.h" -#include "rtc_base/arraysize.h" -#include "rtc_base/checks.h" #include "rtc_base/cryptstring.h" // for CryptString #include "rtc_base/httpcommon.h" #include "rtc_base/logging.h" #include "rtc_base/messagedigest.h" #include "rtc_base/socketaddress.h" #include "rtc_base/strings/string_builder.h" +#include "rtc_base/stringutils.h" #include "rtc_base/third_party/base64/base64.h" // for Base64 #include "rtc_base/zero_memory.h" // for ExplicitZeroMemory Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/ipaddress.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/ipaddress.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/ipaddress.h @@ -23,7 +23,6 @@ #endif #include <string.h> #include <string> -#include <vector> #include "rtc_base/byteorder.h" #if defined(WEBRTC_WIN) Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/ipaddress_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/ipaddress_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/ipaddress_unittest.cc @@ -9,7 +9,8 @@ */ #include "rtc_base/ipaddress.h" -#include "rtc_base/gunit.h" + +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/key_derivation.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/key_derivation.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/key_derivation.cc @@ -11,6 +11,7 @@ #include "rtc_base/key_derivation.h" #include "absl/memory/memory.h" +#include "rtc_base/checks.h" #include "rtc_base/openssl_key_derivation_hkdf.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/key_derivation.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/key_derivation.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/key_derivation.h @@ -11,6 +11,8 @@ #ifndef RTC_BASE_KEY_DERIVATION_H_ #define RTC_BASE_KEY_DERIVATION_H_ +#include <stddef.h> +#include <stdint.h> #include <memory> #include "absl/types/optional.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/location.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/location.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/location.cc @@ -10,6 +10,8 @@ #include "rtc_base/location.h" +#include <stdio.h> + namespace rtc { Location::Location(const char* function_name, const char* file_and_line) Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/logging_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/logging_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/logging_unittest.cc @@ -9,13 +9,17 @@ */ #include "rtc_base/logging.h" + +#include <string.h> +#include <algorithm> + #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" #include "rtc_base/event.h" -#include "rtc_base/gunit.h" #include "rtc_base/platform_thread.h" #include "rtc_base/stream.h" -#include "test/testsupport/fileutils.h" +#include "rtc_base/timeutils.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/memory/aligned_array.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/memory/aligned_array.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/memory/aligned_array.h @@ -11,6 +11,8 @@ #ifndef RTC_BASE_MEMORY_ALIGNED_ARRAY_H_ #define RTC_BASE_MEMORY_ALIGNED_ARRAY_H_ +#include <stddef.h> + #include "rtc_base/checks.h" #include "rtc_base/memory/aligned_malloc.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/memory_stream.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/memory_stream.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/memory_stream.cc @@ -8,8 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <errno.h> +#include <string.h> #include <algorithm> +#include "rtc_base/checks.h" #include "rtc_base/memory_stream.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/memory_stream.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/memory_stream.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/memory_stream.h @@ -11,6 +11,8 @@ #ifndef RTC_BASE_MEMORY_STREAM_H_ #define RTC_BASE_MEMORY_STREAM_H_ +#include <stddef.h> + #include "rtc_base/stream.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/memory_usage.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/memory_usage.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/memory_usage.cc @@ -13,15 +13,13 @@ #if defined(WEBRTC_LINUX) #include <unistd.h> #include <cstdio> -#include <cstdlib> -#include <cstring> #elif defined(WEBRTC_MAC) #include <mach/mach.h> #elif defined(WEBRTC_WIN) // clang-format off // clang formating would change include order. #include <windows.h> -#include <psapi.h> // must come after windows.h +#include <psapi.h> // must come after windows.h // clang-format on #endif Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/memory_usage_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/memory_usage_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/memory_usage_unittest.cc @@ -9,7 +9,7 @@ */ #include "rtc_base/memory_usage.h" -#include <cstdio> + #include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/messagedigest_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/messagedigest_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/messagedigest_unittest.cc @@ -9,8 +9,9 @@ */ #include "rtc_base/messagedigest.h" -#include "rtc_base/gunit.h" + #include "rtc_base/stringencode.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/nat_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/nat_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/nat_unittest.cc @@ -8,21 +8,34 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <string.h> #include <algorithm> #include <memory> #include <string> +#include <vector> #include "absl/memory/memory.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/asyncsocket.h" #include "rtc_base/asynctcpsocket.h" +#include "rtc_base/asyncudpsocket.h" #include "rtc_base/gunit.h" +#include "rtc_base/ipaddress.h" #include "rtc_base/logging.h" #include "rtc_base/natserver.h" #include "rtc_base/natsocketfactory.h" +#include "rtc_base/nattypes.h" #include "rtc_base/nethelpers.h" #include "rtc_base/network.h" #include "rtc_base/physicalsocketserver.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/socketfactory.h" +#include "rtc_base/socketserver.h" #include "rtc_base/testclient.h" +#include "rtc_base/third_party/sigslot/sigslot.h" +#include "rtc_base/thread.h" #include "rtc_base/virtualsocketserver.h" +#include "test/gtest.h" using namespace rtc; Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/natsocketfactory.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/natsocketfactory.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/natsocketfactory.h @@ -11,14 +11,19 @@ #ifndef RTC_BASE_NATSOCKETFACTORY_H_ #define RTC_BASE_NATSOCKETFACTORY_H_ +#include <stddef.h> #include <map> #include <memory> #include <set> -#include <string> +#include "rtc_base/asyncsocket.h" #include "rtc_base/constructormagic.h" +#include "rtc_base/messagequeue.h" #include "rtc_base/natserver.h" +#include "rtc_base/nattypes.h" +#include "rtc_base/socket.h" #include "rtc_base/socketaddress.h" +#include "rtc_base/socketfactory.h" #include "rtc_base/socketserver.h" namespace rtc { @@ -80,6 +85,7 @@ class NATSocketFactory : public SocketFa class NATSocketServer : public SocketServer, public NATInternalSocketFactory { public: class Translator; + // holds a list of NATs class TranslatorMap : private std::map<SocketAddress, Translator*> { public: Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/nullsocketserver_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/nullsocketserver_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/nullsocketserver_unittest.cc @@ -9,7 +9,17 @@ */ #include "rtc_base/nullsocketserver.h" + +#include <stdint.h> +#include <memory> + #include "rtc_base/gunit.h" +#include "rtc_base/location.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/histogram_percentile_counter.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/numerics/histogram_percentile_counter.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/histogram_percentile_counter.h @@ -11,6 +11,7 @@ #ifndef RTC_BASE_NUMERICS_HISTOGRAM_PERCENTILE_COUNTER_H_ #define RTC_BASE_NUMERICS_HISTOGRAM_PERCENTILE_COUNTER_H_ +#include <stddef.h> #include <stdint.h> #include <map> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/histogram_percentile_counter_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/numerics/histogram_percentile_counter_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/histogram_percentile_counter_unittest.cc @@ -10,6 +10,7 @@ #include "rtc_base/numerics/histogram_percentile_counter.h" +#include <cstdint> #include <utility> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/mod_ops.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/numerics/mod_ops.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/mod_ops.h @@ -12,7 +12,6 @@ #define RTC_BASE_NUMERICS_MOD_OPS_H_ #include <algorithm> -#include <limits> #include <type_traits> #include "rtc_base/checks.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/mod_ops_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/numerics/mod_ops_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/mod_ops_unittest.cc @@ -9,6 +9,9 @@ */ #include "rtc_base/numerics/mod_ops.h" + +#include <stdint.h> + #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/moving_average.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/numerics/moving_average.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/moving_average.h @@ -11,6 +11,8 @@ #ifndef RTC_BASE_NUMERICS_MOVING_AVERAGE_H_ #define RTC_BASE_NUMERICS_MOVING_AVERAGE_H_ +#include <stddef.h> +#include <stdint.h> #include <vector> #include "absl/types/optional.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/moving_median_filter.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/numerics/moving_median_filter.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/moving_median_filter.h @@ -11,6 +11,7 @@ #ifndef RTC_BASE_NUMERICS_MOVING_MEDIAN_FILTER_H_ #define RTC_BASE_NUMERICS_MOVING_MEDIAN_FILTER_H_ +#include <stddef.h> #include <list> #include "rtc_base/checks.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/moving_median_filter_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/numerics/moving_median_filter_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/moving_median_filter_unittest.cc @@ -9,6 +9,9 @@ */ #include "rtc_base/numerics/moving_median_filter.h" + +#include <stdint.h> + #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/percentile_filter.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/numerics/percentile_filter.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/percentile_filter.h @@ -12,7 +12,6 @@ #define RTC_BASE_NUMERICS_PERCENTILE_FILTER_H_ #include <stdint.h> - #include <iterator> #include <set> Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/percentile_filter_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/numerics/percentile_filter_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/percentile_filter_unittest.cc @@ -8,8 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdlib.h> #include <algorithm> #include <climits> +#include <cstdint> #include <random> #include "rtc_base/constructormagic.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/sample_counter_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/numerics/sample_counter_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/sample_counter_unittest.cc @@ -10,8 +10,7 @@ #include "rtc_base/numerics/sample_counter.h" -#include <utility> -#include <vector> +#include <initializer_list> #include "test/gmock.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/sequence_number_util.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/numerics/sequence_number_util.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/sequence_number_util.h @@ -11,12 +11,13 @@ #ifndef RTC_BASE_NUMERICS_SEQUENCE_NUMBER_UTIL_H_ #define RTC_BASE_NUMERICS_SEQUENCE_NUMBER_UTIL_H_ +#include <stdint.h> #include <limits> #include <type_traits> #include "absl/types/optional.h" +#include "rtc_base/checks.h" #include "rtc_base/numerics/mod_ops.h" -#include "rtc_base/numerics/safe_compare.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/sequence_number_util_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/numerics/sequence_number_util_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/numerics/sequence_number_util_unittest.cc @@ -8,6 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <cstdint> +#include <iterator> #include <set> #include "rtc_base/numerics/sequence_number_util.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/onetimeevent_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/onetimeevent_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/onetimeevent_unittest.cc @@ -9,7 +9,8 @@ */ #include "rtc_base/onetimeevent.h" -#include "rtc_base/gunit.h" + +#include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/physicalsocketserver_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/physicalsocketserver_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/physicalsocketserver_unittest.cc @@ -9,16 +9,18 @@ */ #include <signal.h> -#include <stdarg.h> +#include <algorithm> #include <memory> #include "rtc_base/gunit.h" +#include "rtc_base/ipaddress.h" #include "rtc_base/logging.h" #include "rtc_base/networkmonitor.h" #include "rtc_base/physicalsocketserver.h" #include "rtc_base/socket_unittest.h" #include "rtc_base/testutils.h" #include "rtc_base/thread.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/proxyserver.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/proxyserver.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/proxyserver.cc @@ -10,6 +10,7 @@ #include "rtc_base/proxyserver.h" +#include <stddef.h> #include <algorithm> #include "rtc_base/checks.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/rate_limiter_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/rate_limiter_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/rate_limiter_unittest.cc @@ -8,13 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <algorithm> #include <memory> #include "rtc_base/event.h" #include "rtc_base/platform_thread.h" #include "rtc_base/rate_limiter.h" -#include "rtc_base/task_queue.h" #include "system_wrappers/include/clock.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/rate_statistics_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/rate_statistics_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/rate_statistics_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <algorithm> +#include <cstdlib> #include "rtc_base/rate_statistics.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/ratetracker_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/ratetracker_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/ratetracker_unittest.cc @@ -9,7 +9,8 @@ */ #include "rtc_base/ratetracker.h" -#include "rtc_base/gunit.h" + +#include "test/gtest.h" namespace rtc { namespace { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/refcountedobject.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/refcountedobject.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/refcountedobject.h @@ -10,6 +10,7 @@ #ifndef RTC_BASE_REFCOUNTEDOBJECT_H_ #define RTC_BASE_REFCOUNTEDOBJECT_H_ +#include <type_traits> #include <utility> #include "rtc_base/constructormagic.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/refcountedobject_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/refcountedobject_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/refcountedobject_unittest.cc @@ -8,11 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <memory> #include <string> +#include <utility> -#include "rtc_base/gunit.h" #include "rtc_base/refcount.h" #include "rtc_base/refcountedobject.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/rollingaccumulator.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/rollingaccumulator.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/rollingaccumulator.h @@ -11,6 +11,7 @@ #ifndef RTC_BASE_ROLLINGACCUMULATOR_H_ #define RTC_BASE_ROLLINGACCUMULATOR_H_ +#include <stddef.h> #include <algorithm> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/rollingaccumulator_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/rollingaccumulator_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/rollingaccumulator_unittest.cc @@ -9,7 +9,8 @@ */ #include "rtc_base/rollingaccumulator.h" -#include "rtc_base/gunit.h" + +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/rtccertificate_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/rtccertificate_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/rtccertificate_unittest.cc @@ -8,18 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <time.h> #include <memory> #include <utility> #include "rtc_base/checks.h" -#include "rtc_base/fakesslidentity.h" -#include "rtc_base/gunit.h" -#include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/rtccertificate.h" #include "rtc_base/sslidentity.h" -#include "rtc_base/thread.h" #include "rtc_base/timeutils.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/rtccertificategenerator_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/rtccertificategenerator_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/rtccertificategenerator_unittest.cc @@ -15,9 +15,9 @@ #include "absl/types/optional.h" #include "rtc_base/checks.h" #include "rtc_base/gunit.h" -#include "rtc_base/logging.h" #include "rtc_base/refcountedobject.h" #include "rtc_base/thread.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/sanitizer_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/sanitizer_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/sanitizer_unittest.cc @@ -10,8 +10,10 @@ #include "rtc_base/sanitizer.h" -#include "rtc_base/gunit.h" +#include <stdint.h> + #include "rtc_base/logging.h" +#include "test/gtest.h" #if RTC_HAS_MSAN #include <sanitizer/msan_interface.h> Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/sequenced_task_checker_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/sequenced_task_checker_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/sequenced_task_checker_unittest.cc @@ -10,6 +10,9 @@ #include "rtc_base/sequenced_task_checker.h" +#include <memory> +#include <utility> + #include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" #include "rtc_base/event.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/signalthread_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/signalthread_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/signalthread_unittest.cc @@ -13,7 +13,9 @@ #include "rtc_base/constructormagic.h" #include "rtc_base/gunit.h" #include "rtc_base/signalthread.h" +#include "rtc_base/socketserver.h" #include "rtc_base/thread.h" +#include "test/gtest.h" using namespace rtc; Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/sigslot_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/sigslot_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/sigslot_unittest.cc @@ -9,8 +9,9 @@ */ #include "rtc_base/third_party/sigslot/sigslot.h" -#include "rtc_base/gunit.h" + #include "rtc_base/sigslotrepeater.h" +#include "test/gtest.h" // This function, when passed a has_slots or signalx, will break the build if // its threading requirement is not single threaded Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/sigslottester_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/sigslottester_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/sigslottester_unittest.cc @@ -12,8 +12,8 @@ #include <string> -#include "rtc_base/gunit.h" #include "rtc_base/third_party/sigslot/sigslot.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/socket.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/socket.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/socket.h @@ -26,7 +26,6 @@ #endif #include "rtc_base/constructormagic.h" -#include "rtc_base/network/sent_packet.h" #include "rtc_base/socketaddress.h" // Rather than converting errors into a private namespace, Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/socket_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/socket_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/socket_unittest.cc @@ -8,20 +8,32 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <errno.h> +#include <stdint.h> +#include <string.h> #include <memory> -#include "rtc_base/socket_unittest.h" - #include "absl/memory/memory.h" #include "rtc_base/arraysize.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/asyncsocket.h" #include "rtc_base/asyncudpsocket.h" #include "rtc_base/buffer.h" #include "rtc_base/gunit.h" +#include "rtc_base/location.h" +#include "rtc_base/logging.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" #include "rtc_base/nethelpers.h" +#include "rtc_base/socket.h" +#include "rtc_base/socket_unittest.h" +#include "rtc_base/socketaddress.h" #include "rtc_base/socketserver.h" #include "rtc_base/testclient.h" #include "rtc_base/testutils.h" +#include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" +#include "rtc_base/timeutils.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/socketaddress_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/socketaddress_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/socketaddress_unittest.cc @@ -12,9 +12,11 @@ #include <netinet/in.h> // for sockaddr_in #endif -#include "rtc_base/gunit.h" +#include <string.h> + #include "rtc_base/ipaddress.h" #include "rtc_base/socketaddress.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/socketstream.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/socketstream.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/socketstream.h @@ -11,9 +11,12 @@ #ifndef RTC_BASE_SOCKETSTREAM_H_ #define RTC_BASE_SOCKETSTREAM_H_ +#include <stddef.h> + #include "rtc_base/asyncsocket.h" #include "rtc_base/constructormagic.h" #include "rtc_base/stream.h" +#include "rtc_base/third_party/sigslot/sigslot.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/sslidentity_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/sslidentity_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/sslidentity_unittest.cc @@ -8,17 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <string.h> #include <memory> #include <string> +#include <vector> +#include "rtc_base/checks.h" #include "rtc_base/fakesslidentity.h" -#include "rtc_base/gunit.h" #include "rtc_base/helpers.h" +#include "rtc_base/logging.h" #include "rtc_base/messagedigest.h" -#include "rtc_base/ssladapter.h" #include "rtc_base/sslfingerprint.h" #include "rtc_base/sslidentity.h" #include "rtc_base/stringutils.h" +#include "test/gtest.h" using rtc::SSLIdentity; Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/sslstreamadapter.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/sslstreamadapter.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/sslstreamadapter.h @@ -11,12 +11,16 @@ #ifndef RTC_BASE_SSLSTREAMADAPTER_H_ #define RTC_BASE_SSLSTREAMADAPTER_H_ +#include <stddef.h> +#include <stdint.h> #include <memory> #include <string> #include <vector> +#include "rtc_base/sslcertificate.h" #include "rtc_base/sslidentity.h" #include "rtc_base/stream.h" +#include "rtc_base/third_party/sigslot/sigslot.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/stream_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/stream_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/stream_unittest.cc @@ -9,7 +9,10 @@ */ #include "rtc_base/stream.h" -#include "rtc_base/gunit.h" + +#include <string.h> + +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/string_to_number_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/string_to_number_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/string_to_number_unittest.cc @@ -10,11 +10,11 @@ #include "rtc_base/string_to_number.h" +#include <stdint.h> #include <limits> #include <string> -#include <type_traits> -#include "rtc_base/gunit.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/stringencode_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/stringencode_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/stringencode_unittest.cc @@ -9,12 +9,12 @@ */ #include "rtc_base/stringencode.h" -#include "rtc_base/arraysize.h" -#include "rtc_base/gunit.h" -#include "rtc_base/stringutils.h" +#include <string.h> #include <sstream> // no-presubmit-check TODO(webrtc:8982) +#include "test/gtest.h" + namespace rtc { class HexEncodeTest : public testing::Test { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/strings/json_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/strings/json_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/strings/json_unittest.cc @@ -12,7 +12,7 @@ #include <vector> -#include "rtc_base/gunit.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/strings/string_builder_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/strings/string_builder_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/strings/string_builder_unittest.cc @@ -10,8 +10,9 @@ #include "rtc_base/strings/string_builder.h" +#include <string.h> + #include "rtc_base/checks.h" -#include "rtc_base/stringutils.h" #include "test/gmock.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/stringutils_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/stringutils_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/stringutils_unittest.cc @@ -9,7 +9,8 @@ */ #include "rtc_base/stringutils.h" -#include "rtc_base/gunit.h" + +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/swap_queue.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/swap_queue.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/swap_queue.h @@ -11,7 +11,7 @@ #ifndef RTC_BASE_SWAP_QUEUE_H_ #define RTC_BASE_SWAP_QUEUE_H_ -#include <algorithm> +#include <stddef.h> #include <utility> #include <vector> @@ -19,6 +19,7 @@ #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" #include "rtc_base/system/unused.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/swap_queue_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/swap_queue_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/swap_queue_unittest.cc @@ -10,6 +10,7 @@ #include "rtc_base/swap_queue.h" +#include <cstdint> #include <vector> #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/task_queue.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/task_queue.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/task_queue.h @@ -11,6 +11,7 @@ #ifndef RTC_BASE_TASK_QUEUE_H_ #define RTC_BASE_TASK_QUEUE_H_ +#include <stdint.h> #include <memory> #include <type_traits> #include <utility> @@ -233,6 +234,7 @@ class RTC_LOCKABLE RTC_EXPORT TaskQueue private: class Impl; + const scoped_refptr<Impl> impl_; RTC_DISALLOW_COPY_AND_ASSIGN(TaskQueue); Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/task_queue_for_test.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/task_queue_for_test.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/task_queue_for_test.h @@ -11,11 +11,11 @@ #ifndef RTC_BASE_TASK_QUEUE_FOR_TEST_H_ #define RTC_BASE_TASK_QUEUE_FOR_TEST_H_ -#include <utility> - #include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" #include "rtc_base/event.h" #include "rtc_base/task_queue.h" +#include "rtc_base/thread_annotations.h" namespace rtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/task_queue_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/task_queue_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/task_queue_unittest.cc @@ -15,14 +15,18 @@ // clang-format on #endif +#include <stdint.h> #include <memory> +#include <utility> #include <vector> +#include "absl/memory/memory.h" #include "rtc_base/bind.h" #include "rtc_base/event.h" -#include "rtc_base/gunit.h" +#include "rtc_base/task_queue.h" #include "rtc_base/task_queue_for_test.h" #include "rtc_base/timeutils.h" +#include "test/gtest.h" using rtc::test::TaskQueueForTest; Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/testclient.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/testclient.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/testclient.cc @@ -10,6 +10,9 @@ #include "rtc_base/testclient.h" +#include <string.h> +#include <utility> + #include "absl/memory/memory.h" #include "rtc_base/gunit.h" #include "rtc_base/thread.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/testclient_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/testclient_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/testclient_unittest.cc @@ -9,12 +9,19 @@ */ #include "rtc_base/testclient.h" + +#include <utility> + #include "absl/memory/memory.h" -#include "rtc_base/gunit.h" +#include "rtc_base/asyncsocket.h" +#include "rtc_base/asynctcpsocket.h" +#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/logging.h" #include "rtc_base/nethelpers.h" -#include "rtc_base/physicalsocketserver.h" +#include "rtc_base/socketserver.h" #include "rtc_base/testechoserver.h" #include "rtc_base/thread.h" +#include "test/gtest.h" using namespace rtc; Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/testechoserver.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/testechoserver.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/testechoserver.cc @@ -10,6 +10,8 @@ #include "rtc_base/testechoserver.h" +#include "rtc_base/socketserver.h" + namespace rtc { TestEchoServer::TestEchoServer(Thread* thread, const SocketAddress& addr) Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/testechoserver.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/testechoserver.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/testechoserver.h @@ -11,12 +11,18 @@ #ifndef RTC_BASE_TESTECHOSERVER_H_ #define RTC_BASE_TESTECHOSERVER_H_ +#include <stddef.h> +#include <stdint.h> +#include <algorithm> #include <list> #include <memory> +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/asyncsocket.h" #include "rtc_base/asynctcpsocket.h" #include "rtc_base/constructormagic.h" #include "rtc_base/socketaddress.h" +#include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/testutils.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/testutils.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/testutils.h @@ -13,13 +13,12 @@ // Utilities for testing rtc infrastructure in unittests -#include <algorithm> #include <map> -#include <memory> -#include <vector> +#include <utility> + #include "rtc_base/asyncsocket.h" -#include "rtc_base/checks.h" #include "rtc_base/stream.h" +#include "rtc_base/third_party/sigslot/sigslot.h" namespace webrtc { namespace testing { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/thread_checker_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/thread_checker_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/thread_checker_unittest.cc @@ -11,10 +11,12 @@ // Borrowed from Chromium's src/base/threading/thread_checker_unittest.cc. #include <memory> +#include <utility> #include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" #include "rtc_base/nullsocketserver.h" +#include "rtc_base/socketserver.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread.h" #include "rtc_base/thread_checker.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/timestampaligner_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/timestampaligner_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/timestampaligner_unittest.cc @@ -9,13 +9,13 @@ */ #include <math.h> - #include <algorithm> #include <limits> -#include "rtc_base/gunit.h" #include "rtc_base/random.h" #include "rtc_base/timestampaligner.h" +#include "rtc_base/timeutils.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/timeutils_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/timeutils_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/timeutils_unittest.cc @@ -9,11 +9,17 @@ */ #include "rtc_base/timeutils.h" + +#include <memory> + +#include "api/units/time_delta.h" #include "rtc_base/event.h" #include "rtc_base/fakeclock.h" -#include "rtc_base/gunit.h" #include "rtc_base/helpers.h" +#include "rtc_base/location.h" +#include "rtc_base/messagehandler.h" #include "rtc_base/thread.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/unittest_main.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/unittest_main.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/unittest_main.cc @@ -15,13 +15,13 @@ #endif #include "rtc_base/flags.h" -#include "rtc_base/gunit.h" #include "rtc_base/logging.h" #include "rtc_base/ssladapter.h" #include "rtc_base/sslstreamadapter.h" #include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/metrics.h" #include "test/field_trial.h" +#include "test/gtest.h" #if defined(WEBRTC_WIN) #include "rtc_base/win32socketinit.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/virtualsocket_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/virtualsocket_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/virtualsocket_unittest.cc @@ -9,23 +9,39 @@ */ #include <math.h> +#include <stdint.h> +#include <stdlib.h> +#include <string.h> #include <time.h> #if defined(WEBRTC_POSIX) #include <netinet/in.h> #endif +#include <algorithm> #include <memory> +#include <utility> #include "absl/memory/memory.h" #include "rtc_base/arraysize.h" +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/asyncsocket.h" +#include "rtc_base/asyncudpsocket.h" #include "rtc_base/fakeclock.h" #include "rtc_base/gunit.h" +#include "rtc_base/ipaddress.h" +#include "rtc_base/location.h" #include "rtc_base/logging.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/socket.h" +#include "rtc_base/socketaddress.h" #include "rtc_base/testclient.h" #include "rtc_base/testutils.h" +#include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" #include "rtc_base/timeutils.h" #include "rtc_base/virtualsocketserver.h" +#include "test/gtest.h" using namespace rtc; Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/weak_ptr_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/weak_ptr_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/weak_ptr_unittest.cc @@ -8,12 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <memory> #include <string> +#include "absl/memory/memory.h" #include "rtc_base/event.h" -#include "rtc_base/gunit.h" #include "rtc_base/task_queue.h" #include "rtc_base/weak_ptr.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_base/zero_memory_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_base/zero_memory_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_base/zero_memory_unittest.cc @@ -10,9 +10,10 @@ #include "rtc_base/zero_memory.h" +#include <stdint.h> + #include "api/array_view.h" -#include "rtc_base/buffer.h" -#include "rtc_base/gunit.h" +#include "test/gtest.h" namespace rtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/BUILD.gn @@ -67,6 +67,7 @@ rtc_static_library("video_file_reader") deps = [ "../api/video:video_frame", "../api/video:video_frame_i420", + "../rtc_base:checks", "../rtc_base:rtc_base_approved", "//third_party/abseil-cpp/absl/types:optional", ] @@ -124,6 +125,7 @@ rtc_executable("frame_analyzer") { ":video_file_reader", ":video_file_writer", ":video_quality_analysis", + "../rtc_base:ptr_util", "../rtc_base:stringutils", "../test:perf_test", ] @@ -154,6 +156,8 @@ if (!build_with_chromium) { ":command_line_parser", ":video_file_reader", ":video_quality_analysis", + "../api/video:video_frame", + "../rtc_base:ptr_util", ] } @@ -166,6 +170,8 @@ if (!build_with_chromium) { deps = [ ":video_file_reader", ":video_quality_analysis", + "../api/video:video_frame", + "../rtc_base:ptr_util", ] } @@ -295,7 +301,11 @@ if (rtc_include_tests) { defines = [ "ENABLE_RTC_EVENT_LOG" ] deps = [ ":event_log_visualizer_utils", + "../logging:rtc_event_log_api", "../logging:rtc_event_log_parser", + "../modules/audio_coding:neteq", + "../modules/rtp_rtcp:rtp_rtcp_format", + "../rtc_base:checks", "../rtc_base:protobuf_utils", "../rtc_base:rtc_base_approved", "../system_wrappers:field_trial", @@ -366,6 +376,9 @@ if (rtc_include_tests) { ":video_file_reader", ":video_file_writer", ":video_quality_analysis", + "../:webrtc_common", + "../api/video:video_frame", + "../api/video:video_frame_i420", "../common_video:common_video", "../rtc_base", "../rtc_base:checks", Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/DEPS =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/DEPS +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/DEPS @@ -1,9 +1,11 @@ include_rules = [ "+call", + "+common_audio", "+common_video", "+logging/rtc_event_log", "+modules/audio_device", "+modules/audio_coding/audio_network_adaptor", + "+modules/audio_coding/neteq/include", "+modules/audio_coding/neteq/tools", "+modules/audio_processing", "+modules/bitrate_controller", Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/agc/activity_metric.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/agc/activity_metric.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/agc/activity_metric.cc @@ -8,17 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <math.h> +#include <assert.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> - -#include <algorithm> +#include <string.h> +#include <iostream> #include <memory> #include "api/audio/audio_frame.h" -#include "modules/audio_processing/agc/agc.h" #include "modules/audio_processing/agc/loudness_histogram.h" -#include "modules/audio_processing/agc/utility.h" #include "modules/audio_processing/vad/common.h" #include "modules/audio_processing/vad/pitch_based_vad.h" #include "modules/audio_processing/vad/standalone_vad.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/converter/converter.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/converter/converter.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/converter/converter.cc @@ -7,14 +7,15 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ +#include "rtc_tools/converter/converter.h" + #include <stdio.h> -#include <stdlib.h> #include <sys/stat.h> - #include <iomanip> #include <sstream> -#include "rtc_tools/converter/converter.h" +#include "third_party/libyuv/include/libyuv/compare.h" +#include "third_party/libyuv/include/libyuv/convert.h" #ifdef WIN32 #define SEPARATOR '\\' Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/converter/converter.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/converter/converter.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/converter/converter.h @@ -11,11 +11,9 @@ #ifndef RTC_TOOLS_CONVERTER_CONVERTER_H_ #define RTC_TOOLS_CONVERTER_CONVERTER_H_ +#include <stdio.h> #include <string> -#include "third_party/libyuv/include/libyuv/compare.h" -#include "third_party/libyuv/include/libyuv/convert.h" - namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/converter/rgba_to_i420_converter.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/converter/rgba_to_i420_converter.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/converter/rgba_to_i420_converter.cc @@ -10,10 +10,7 @@ #include <stdio.h> #include <stdlib.h> - -#include <map> #include <string> -#include <vector> #include "rtc_tools/converter/converter.h" #include "rtc_tools/simple_command_line_parser.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/event_log_visualizer/main.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/event_log_visualizer/main.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/event_log_visualizer/main.cc @@ -8,9 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdio.h> +#include <string.h> #include <iostream> +#include <map> +#include <memory> +#include <string> +#include <utility> +#include "logging/rtc_event_log/rtc_event_log.h" #include "logging/rtc_event_log/rtc_event_log_parser_new.h" +#include "modules/audio_coding/neteq/include/neteq.h" +#include "modules/rtp_rtcp/source/rtcp_packet/report_block.h" +#include "rtc_base/checks.h" #include "rtc_base/flags.h" #include "rtc_tools/event_log_visualizer/analyzer.h" #include "rtc_tools/event_log_visualizer/plot_base.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/event_log_visualizer/plot_base.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/event_log_visualizer/plot_base.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/event_log_visualizer/plot_base.cc @@ -11,7 +11,6 @@ #include "rtc_tools/event_log_visualizer/plot_base.h" #include <algorithm> -#include <limits> #include "rtc_base/checks.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.cc @@ -10,7 +10,10 @@ #include "rtc_tools/event_log_visualizer/plot_protobuf.h" +#include <stddef.h> +#include <iostream> #include <memory> +#include <vector> namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/event_log_visualizer/plot_python.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/event_log_visualizer/plot_python.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/event_log_visualizer/plot_python.cc @@ -11,8 +11,9 @@ #include "rtc_tools/event_log_visualizer/plot_python.h" #include <stdio.h> - #include <memory> +#include <string> +#include <vector> #include "rtc_base/checks.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/frame_analyzer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_analyzer/frame_analyzer.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/frame_analyzer.cc @@ -10,11 +10,11 @@ #include <stdio.h> #include <stdlib.h> - -#include <map> +#include <cstddef> #include <string> #include <vector> +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/stringutils.h" #include "rtc_tools/frame_analyzer/video_color_aligner.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/linear_least_squares.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_analyzer/linear_least_squares.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/linear_least_squares.cc @@ -10,7 +10,12 @@ #include "rtc_tools/frame_analyzer/linear_least_squares.h" +#include <math.h> +#include <cstdint> +#include <cstdlib> +#include <functional> #include <numeric> +#include <type_traits> #include <utility> #include "rtc_base/checks.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/linear_least_squares.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_analyzer/linear_least_squares.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/linear_least_squares.h @@ -11,8 +11,10 @@ #ifndef RTC_TOOLS_FRAME_ANALYZER_LINEAR_LEAST_SQUARES_H_ #define RTC_TOOLS_FRAME_ANALYZER_LINEAR_LEAST_SQUARES_H_ +#include <stdint.h> #include <valarray> #include <vector> + #include "absl/types/optional.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/linear_least_squares_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_analyzer/linear_least_squares_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/linear_least_squares_unittest.cc @@ -10,6 +10,8 @@ #include "rtc_tools/frame_analyzer/linear_least_squares.h" +#include <cstdint> + #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.cc @@ -8,12 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ #include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <iostream> #include <numeric> #include <vector> +#include "api/video/video_frame_buffer.h" #include "rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h" #include "rtc_tools/frame_analyzer/video_quality_analysis.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h @@ -11,9 +11,11 @@ #ifndef RTC_TOOLS_FRAME_ANALYZER_REFERENCE_LESS_VIDEO_ANALYSIS_LIB_H_ #define RTC_TOOLS_FRAME_ANALYZER_REFERENCE_LESS_VIDEO_ANALYSIS_LIB_H_ +#include <stddef.h> #include <string> #include <vector> +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_tools/video_file_reader.h" // Returns true if the frame is frozen based on psnr and ssim freezing Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc @@ -7,13 +7,11 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include <stdio.h> -#include <string.h> -#include <cstring> -#include <iostream> #include <vector> +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h" +#include "rtc_tools/video_file_reader.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_color_aligner.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_analyzer/video_color_aligner.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_color_aligner.cc @@ -10,20 +10,17 @@ #include "rtc_tools/frame_analyzer/video_color_aligner.h" +#include <stddef.h> #include <algorithm> #include <cmath> -#include <deque> -#include <limits> +#include <cstdint> #include <vector> #include "api/array_view.h" #include "api/video/i420_buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" #include "rtc_base/refcountedobject.h" #include "rtc_tools/frame_analyzer/linear_least_squares.h" -#include "rtc_tools/frame_analyzer/video_quality_analysis.h" -#include "third_party/libyuv/include/libyuv/compare.h" #include "third_party/libyuv/include/libyuv/planar_functions.h" #include "third_party/libyuv/include/libyuv/scale.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_color_aligner.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_analyzer/video_color_aligner.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_color_aligner.h @@ -13,6 +13,8 @@ #include <array> +#include "api/video/video_frame_buffer.h" +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_tools/video_file_reader.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_color_aligner_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_analyzer/video_color_aligner_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_color_aligner_unittest.cc @@ -10,11 +10,13 @@ #include "rtc_tools/frame_analyzer/video_color_aligner.h" +#include <stdint.h> + +#include "api/video/i420_buffer.h" #include "rtc_tools/frame_analyzer/video_quality_analysis.h" #include "rtc_tools/video_file_reader.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" -#include "third_party/libyuv/include/libyuv/scale.h" namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_geometry_aligner_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_analyzer/video_geometry_aligner_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_geometry_aligner_unittest.cc @@ -12,6 +12,7 @@ #include <vector> +#include "api/video/i420_buffer.h" #include "rtc_tools/frame_analyzer/video_quality_analysis.h" #include "rtc_tools/video_file_reader.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_quality_analysis.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_analyzer/video_quality_analysis.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_quality_analysis.cc @@ -11,12 +11,13 @@ #include "rtc_tools/frame_analyzer/video_quality_analysis.h" #include <algorithm> -#include <numeric> +#include <array> +#include <cstddef> +#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "test/testsupport/perf_test.h" #include "third_party/libyuv/include/libyuv/compare.h" -#include "third_party/libyuv/include/libyuv/convert.h" namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_quality_analysis.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_analyzer/video_quality_analysis.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_quality_analysis.h @@ -11,11 +11,12 @@ #ifndef RTC_TOOLS_FRAME_ANALYZER_VIDEO_QUALITY_ANALYSIS_H_ #define RTC_TOOLS_FRAME_ANALYZER_VIDEO_QUALITY_ANALYSIS_H_ +#include <stdio.h> #include <string> -#include <utility> #include <vector> -#include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_tools/video_file_reader.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc @@ -12,6 +12,7 @@ // to stdout by void functions, but it's still useful as it executes the code. #include <stdio.h> +#include <cstddef> #include <fstream> #include <string> Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_temporal_aligner.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_analyzer/video_temporal_aligner.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_temporal_aligner.cc @@ -12,15 +12,16 @@ #include <algorithm> #include <cmath> +#include <cstddef> #include <deque> +#include <iterator> #include <limits> #include <vector> #include "api/video/i420_buffer.h" -#include "rtc_base/checks.h" +#include "api/video/video_frame_buffer.h" #include "rtc_base/refcountedobject.h" #include "rtc_tools/frame_analyzer/video_quality_analysis.h" -#include "third_party/libyuv/include/libyuv/compare.h" namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_temporal_aligner.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_analyzer/video_temporal_aligner.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_temporal_aligner.h @@ -11,8 +11,10 @@ #ifndef RTC_TOOLS_FRAME_ANALYZER_VIDEO_TEMPORAL_ALIGNER_H_ #define RTC_TOOLS_FRAME_ANALYZER_VIDEO_TEMPORAL_ALIGNER_H_ +#include <stddef.h> #include <vector> +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_tools/video_file_reader.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_temporal_aligner_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_analyzer/video_temporal_aligner_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_analyzer/video_temporal_aligner_unittest.cc @@ -10,6 +10,8 @@ #include "rtc_tools/frame_analyzer/video_temporal_aligner.h" +#include <cstddef> + #include "rtc_tools/frame_analyzer/video_quality_analysis.h" #include "rtc_tools/video_file_reader.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_editing/frame_editing.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_editing/frame_editing.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_editing/frame_editing.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_tools/frame_editing/frame_editing_lib.h" - #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <string> +#include "rtc_tools/frame_editing/frame_editing_lib.h" #include "rtc_tools/simple_command_line_parser.h" // A command-line tool to edit a YUV-video (I420 sub-sampled). Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_editing/frame_editing_lib.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_editing/frame_editing_lib.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_editing/frame_editing_lib.cc @@ -9,11 +9,11 @@ */ #include <stdio.h> -#include <stdlib.h> - +#include <cstdint> #include <memory> #include <string> +#include "common_types.h" // NOLINT(build/include) #include "common_video/libyuv/include/webrtc_libyuv.h" #include "rtc_tools/frame_editing/frame_editing_lib.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_editing/frame_editing_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/frame_editing/frame_editing_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/frame_editing/frame_editing_unittest.cc @@ -9,11 +9,12 @@ */ #include <stdio.h> -#include <stdlib.h> - +#include <string.h> #include <fstream> #include <memory> +#include <string> +#include "common_types.h" // NOLINT(build/include) #include "common_video/libyuv/include/webrtc_libyuv.h" #include "rtc_tools/frame_editing/frame_editing_lib.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/network_tester/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/network_tester/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/network_tester/BUILD.gn @@ -48,6 +48,7 @@ if (rtc_enable_protobuf) { "../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_task_queue", "../../rtc_base:sequenced_task_checker", + "../../rtc_base/third_party/sigslot:sigslot", "//third_party/abseil-cpp/absl/types:optional", ] Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/network_tester/config_reader.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/network_tester/config_reader.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/network_tester/config_reader.cc @@ -9,8 +9,9 @@ */ #include "rtc_tools/network_tester/config_reader.h" +#include <fstream> +#include <iterator> #include <string> -#include <vector> #include "rtc_base/checks.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/network_tester/network_tester_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/network_tester/network_tester_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/network_tester/network_tester_unittest.cc @@ -10,9 +10,10 @@ #ifdef WEBRTC_NETWORK_TESTER_TEST_ENABLED -#include "rtc_tools/network_tester/test_controller.h" +#include <string> #include "rtc_base/gunit.h" +#include "rtc_tools/network_tester/test_controller.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/network_tester/packet_sender.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/network_tester/packet_sender.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/network_tester/packet_sender.cc @@ -11,9 +11,11 @@ #include "rtc_tools/network_tester/packet_sender.h" #include <algorithm> +#include <memory> #include <string> #include <utility> +#include "absl/types/optional.h" #include "rtc_base/timeutils.h" #include "rtc_tools/network_tester/config_reader.h" #include "rtc_tools/network_tester/test_controller.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/network_tester/test_controller.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/network_tester/test_controller.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/network_tester/test_controller.cc @@ -10,7 +10,11 @@ #include "rtc_tools/network_tester/test_controller.h" +#include <limits> + #include "absl/types/optional.h" +#include "rtc_base/checks.h" +#include "rtc_base/ipaddress.h" #include "rtc_base/thread.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/network_tester/test_controller.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/network_tester/test_controller.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/network_tester/test_controller.h @@ -11,22 +11,30 @@ #ifndef RTC_TOOLS_NETWORK_TESTER_TEST_CONTROLLER_H_ #define RTC_TOOLS_NETWORK_TESTER_TEST_CONTROLLER_H_ +#include <stddef.h> +#include <stdint.h> #include <array> -#include <limits> #include <memory> #include <string> -#include <utility> +#include "absl/types/optional.h" #include "p2p/base/basicpacketsocketfactory.h" #include "rtc_base/asyncpacketsocket.h" #include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" #include "rtc_base/ignore_wundef.h" +#include "rtc_base/sequenced_task_checker.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/third_party/sigslot/sigslot.h" +#include "rtc_base/thread_annotations.h" +#include "rtc_base/thread_checker.h" #include "rtc_tools/network_tester/packet_logger.h" #include "rtc_tools/network_tester/packet_sender.h" #ifdef WEBRTC_NETWORK_TESTER_PROTO RTC_PUSH_IGNORING_WUNDEF() #include "rtc_tools/network_tester/network_tester_packet.pb.h" + RTC_POP_IGNORING_WUNDEF() using webrtc::network_tester::packet::NetworkTesterPacket; #else Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc @@ -10,9 +10,11 @@ #include <stdio.h> #include <stdlib.h> - +#include <algorithm> #include <string> +#include "api/video/video_frame_buffer.h" +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_tools/frame_analyzer/video_quality_analysis.h" #include "rtc_tools/simple_command_line_parser.h" #include "rtc_tools/video_file_reader.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/simple_command_line_parser_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/simple_command_line_parser_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/simple_command_line_parser_unittest.cc @@ -9,6 +9,9 @@ */ #include "rtc_tools/simple_command_line_parser.h" + +#include <string.h> + #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/unpack_aecdump/unpack.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/unpack_aecdump/unpack.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/unpack_aecdump/unpack.cc @@ -13,10 +13,14 @@ // The debug files are dumped as protobuf blobs. For analysis, it's necessary // to unpack the file into its component parts: audio and other data. +#include <inttypes.h> +#include <stdint.h> #include <stdio.h> - +#include <stdlib.h> #include <memory> +#include <string> +#include "common_audio/wav_file.h" #include "modules/audio_processing/test/protobuf_utils.h" #include "modules/audio_processing/test/test_utils.h" #include "rtc_base/flags.h" @@ -26,6 +30,7 @@ RTC_PUSH_IGNORING_WUNDEF() #include "modules/audio_processing/debug.pb.h" + RTC_POP_IGNORING_WUNDEF() // TODO(andrew): unpack more of the data. Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/video_file_reader.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/video_file_reader.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/video_file_reader.cc @@ -10,14 +10,13 @@ #include "rtc_tools/video_file_reader.h" -#include <algorithm> -#include <cmath> #include <cstdio> #include <string> -#include <utility> +#include <vector> #include "absl/types/optional.h" #include "api/video/i420_buffer.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/refcountedobject.h" #include "rtc_base/string_to_number.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/video_file_reader.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/video_file_reader.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/video_file_reader.h @@ -10,13 +10,14 @@ #ifndef RTC_TOOLS_VIDEO_FILE_READER_H_ #define RTC_TOOLS_VIDEO_FILE_READER_H_ +#include <stddef.h> #include <cstdio> #include <iterator> #include <string> -#include <vector> -#include "api/video/video_frame.h" +#include "api/video/video_frame_buffer.h" #include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/video_file_reader_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/video_file_reader_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/video_file_reader_unittest.cc @@ -9,6 +9,10 @@ */ #include "rtc_tools/video_file_reader.h" + +#include <stdint.h> +#include <string> + #include "test/gtest.h" #include "test/testsupport/fileutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/video_file_writer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/video_file_writer.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/video_file_writer.cc @@ -10,11 +10,12 @@ #include "rtc_tools/video_file_writer.h" +#include <stdint.h> +#include <cstdio> #include <string> -#include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" #include "rtc_base/logging.h" -#include "rtc_base/refcountedobject.h" #include "rtc_base/stringutils.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/video_file_writer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/video_file_writer.h +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/video_file_writer.h @@ -10,10 +10,9 @@ #ifndef RTC_TOOLS_VIDEO_FILE_WRITER_H_ #define RTC_TOOLS_VIDEO_FILE_WRITER_H_ -#include <cstdio> #include <string> -#include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_tools/video_file_reader.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/rtc_tools/video_file_writer_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/rtc_tools/video_file_writer_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/rtc_tools/video_file_writer_unittest.cc @@ -8,9 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> +#include <cstdio> #include <string> -#include "rtc_base/refcountedobject.h" +#include "api/video/video_frame_buffer.h" #include "rtc_tools/video_file_reader.h" #include "rtc_tools/video_file_writer.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/stats/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/stats/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/stats/BUILD.gn @@ -25,6 +25,7 @@ rtc_static_library("rtc_stats") { deps = [ "../api:rtc_stats_api", + "../rtc_base:checks", "../rtc_base:rtc_base_approved", ] } @@ -40,6 +41,7 @@ rtc_source_set("rtc_stats_test_utils") { deps = [ ":rtc_stats", "../api:rtc_stats_api", + "../rtc_base:checks", "../rtc_base/system:rtc_export", ] } @@ -61,6 +63,7 @@ if (rtc_include_tests) { "../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_tests_main", "../rtc_base:rtc_json", + "../test:test_support", ] if (is_android) { Index: chromium-72.0.3626.53/third_party/webrtc/stats/rtcstats_objects.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/stats/rtcstats_objects.cc +++ chromium-72.0.3626.53/third_party/webrtc/stats/rtcstats_objects.cc @@ -10,6 +10,10 @@ #include "api/stats/rtcstats_objects.h" +#include <utility> + +#include "rtc_base/checks.h" + namespace webrtc { const char* const RTCDataChannelState::kConnecting = "connecting"; Index: chromium-72.0.3626.53/third_party/webrtc/stats/rtcstats_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/stats/rtcstats_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/stats/rtcstats_unittest.cc @@ -11,12 +11,14 @@ #include "api/stats/rtcstats.h" #include <cmath> +#include <cstdint> #include <cstring> +#include <iostream> #include "rtc_base/checks.h" -#include "rtc_base/gunit.h" #include "rtc_base/strings/json.h" #include "stats/test/rtcteststats.h" +#include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/stats/rtcstatsreport.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/stats/rtcstatsreport.cc +++ chromium-72.0.3626.53/third_party/webrtc/stats/rtcstatsreport.cc @@ -11,6 +11,10 @@ #include "api/stats/rtcstatsreport.h" #include <sstream> +#include <type_traits> +#include <utility> + +#include "rtc_base/checks.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/stats/rtcstatsreport_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/stats/rtcstatsreport_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/stats/rtcstatsreport_unittest.cc @@ -12,7 +12,7 @@ #include "api/stats/rtcstats.h" #include "rtc_base/checks.h" -#include "rtc_base/gunit.h" +#include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/stats/test/rtcteststats.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/stats/test/rtcteststats.cc +++ chromium-72.0.3626.53/third_party/webrtc/stats/test/rtcteststats.cc @@ -10,6 +10,8 @@ #include "stats/test/rtcteststats.h" +#include "rtc_base/checks.h" + namespace webrtc { WEBRTC_RTCSTATS_IMPL(RTCTestStats, Index: chromium-72.0.3626.53/third_party/webrtc/stats/test/rtcteststats.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/stats/test/rtcteststats.h +++ chromium-72.0.3626.53/third_party/webrtc/stats/test/rtcteststats.h @@ -11,6 +11,7 @@ #ifndef STATS_TEST_RTCTESTSTATS_H_ #define STATS_TEST_RTCTESTSTATS_H_ +#include <cstdint> #include <string> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/system_wrappers/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/system_wrappers/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/system_wrappers/BUILD.gn @@ -174,6 +174,7 @@ if (rtc_include_tests) { ":metrics", ":system_wrappers", "..:webrtc_common", + "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../test:test_main", "../test:test_support", Index: chromium-72.0.3626.53/third_party/webrtc/system_wrappers/include/metrics.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/system_wrappers/include/metrics.h +++ chromium-72.0.3626.53/third_party/webrtc/system_wrappers/include/metrics.h @@ -11,6 +11,7 @@ #ifndef SYSTEM_WRAPPERS_INCLUDE_METRICS_H_ #define SYSTEM_WRAPPERS_INCLUDE_METRICS_H_ +#include <stddef.h> #include <map> #include <memory> #include <string> Index: chromium-72.0.3626.53/third_party/webrtc/system_wrappers/source/metrics_default_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/system_wrappers/source/metrics_default_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/system_wrappers/source/metrics_default_unittest.cc @@ -8,6 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <map> +#include <memory> +#include <string> +#include <utility> + +#include "rtc_base/checks.h" #include "system_wrappers/include/metrics.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/system_wrappers/source/rtp_to_ntp_estimator_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/system_wrappers/source/rtp_to_ntp_estimator_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/system_wrappers/source/rtp_to_ntp_estimator_unittest.cc @@ -9,6 +9,9 @@ */ #include "system_wrappers/include/rtp_to_ntp_estimator.h" + +#include <stddef.h> + #include "rtc_base/random.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/test/BUILD.gn @@ -219,11 +219,12 @@ if (rtc_include_tests) { ":field_trial", ":perf_test", ":test_support", + "../rtc_base:checks", "../rtc_base:rtc_base", "../system_wrappers:field_trial", "../system_wrappers:metrics", "//testing/gtest", - "//third_party/abseil-cpp/absl/memory:memory", + "//third_party/abseil-cpp/absl/memory", # TODO(bugs.webrtc.org/9792): This is needed for downstream projects on # Android, where it's replaced by an internal version of fileutils that @@ -339,6 +340,7 @@ if (rtc_include_tests) { "../api:simulcast_test_fixture_api", "../api/test/video:function_video_factory", "../api/video:builtin_video_bitrate_allocator_factory", + "../api/video:video_frame", "../api/video:video_frame_i420", "../modules/rtp_rtcp:rtp_rtcp", "../modules/video_capture", @@ -607,10 +609,14 @@ rtc_source_set("fake_video_codecs") { deps = [ "..:webrtc_common", "../api/video:encoded_image", + "../api/video:video_bitrate_allocation", + "../api/video:video_frame", "../api/video:video_frame_i420", "../api/video_codecs:create_vp8_temporal_layers", "../api/video_codecs:video_codecs_api", "../common_video:common_video", + "../modules:module_api", + "../modules/video_coding:codec_globals_headers", "../modules/video_coding:video_codec_interface", "../modules/video_coding:video_coding_utility", "../modules/video_coding:webrtc_h264", @@ -621,6 +627,7 @@ rtc_source_set("fake_video_codecs") { "../rtc_base:rtc_task_queue", "../rtc_base:sequenced_task_checker", "../system_wrappers", + "//third_party/abseil-cpp/absl/types:optional", ] } @@ -668,6 +675,7 @@ rtc_source_set("test_common") { ":rtp_test_utils", ":test_support", ":video_test_common", + "../:webrtc_common", "../api:libjingle_peerconnection_api", "../api:simulated_network_api", "../api:transport_api", @@ -682,6 +690,7 @@ rtc_source_set("test_common") { "../call", "../call:call_interfaces", "../call:fake_network", + "../call:rtp_interfaces", "../call:rtp_sender", "../call:simulated_network", "../call:simulated_packet_receiver", @@ -699,6 +708,8 @@ rtc_source_set("test_common") { "../modules/rtp_rtcp", "../modules/rtp_rtcp:mock_rtp_rtcp", "../modules/rtp_rtcp:rtp_rtcp_format", + "../modules/rtp_rtcp:rtp_video_header", + "../modules/video_coding:codec_globals_headers", "../modules/video_coding:video_coding_utility", "../modules/video_coding:webrtc_h264", "../modules/video_coding:webrtc_multiplex", Index: chromium-72.0.3626.53/third_party/webrtc/test/configurable_frame_size_encoder.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/configurable_frame_size_encoder.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/configurable_frame_size_encoder.cc @@ -11,9 +11,14 @@ #include "test/configurable_frame_size_encoder.h" #include <string.h> +#include <cstdint> +#include <type_traits> +#include <utility> #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_error_codes.h" #include "rtc_base/checks.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/test/configurable_frame_size_encoder.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/configurable_frame_size_encoder.h +++ chromium-72.0.3626.53/third_party/webrtc/test/configurable_frame_size_encoder.h @@ -11,10 +11,19 @@ #ifndef TEST_CONFIGURABLE_FRAME_SIZE_ENCODER_H_ #define TEST_CONFIGURABLE_FRAME_SIZE_ENCODER_H_ +#include <stddef.h> +#include <stdint.h> +#include <functional> #include <memory> #include <vector> +#include "absl/types/optional.h" +#include "api/video/video_bitrate_allocation.h" +#include "api/video/video_frame.h" +#include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_encoder.h" +#include "common_types.h" // NOLINT(build/include) +#include "modules/video_coding/include/video_codec_interface.h" namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/test/direct_transport_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/direct_transport_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/direct_transport_unittest.cc @@ -8,6 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ #include "test/direct_transport.h" + +#include <string.h> + #include "test/gtest.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/test/drifting_clock.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/drifting_clock.h +++ chromium-72.0.3626.53/third_party/webrtc/test/drifting_clock.h @@ -10,7 +10,10 @@ #ifndef TEST_DRIFTING_CLOCK_H_ #define TEST_DRIFTING_CLOCK_H_ +#include <stdint.h> + #include "system_wrappers/include/clock.h" +#include "system_wrappers/include/ntp_time.h" namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/test/encoder_settings.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/encoder_settings.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/encoder_settings.cc @@ -12,7 +12,11 @@ #include <algorithm> #include <string> +#include "api/video_codecs/sdp_video_format.h" +#include "call/rtp_config.h" +#include "rtc_base/checks.h" #include "rtc_base/refcountedobject.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/test/encoder_settings.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/encoder_settings.h +++ chromium-72.0.3626.53/third_party/webrtc/test/encoder_settings.h @@ -10,10 +10,14 @@ #ifndef TEST_ENCODER_SETTINGS_H_ #define TEST_ENCODER_SETTINGS_H_ +#include <stddef.h> +#include <string> #include <vector> +#include "api/video_codecs/video_encoder_config.h" #include "call/video_receive_stream.h" #include "call/video_send_stream.h" +#include "common_types.h" // NOLINT(build/include) namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/test/fake_decoder.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/fake_decoder.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/fake_decoder.cc @@ -10,7 +10,15 @@ #include "test/fake_decoder.h" +#include <string.h> + #include "api/video/i420_buffer.h" +#include "api/video/video_frame.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "rtc_base/checks.h" +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/timeutils.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/test/fake_decoder.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/fake_decoder.h +++ chromium-72.0.3626.53/third_party/webrtc/test/fake_decoder.h @@ -11,10 +11,12 @@ #ifndef TEST_FAKE_DECODER_H_ #define TEST_FAKE_DECODER_H_ -#include <vector> +#include <stdint.h> +#include "api/video/encoded_image.h" +#include "api/video_codecs/video_codec.h" +#include "api/video_codecs/video_decoder.h" #include "modules/video_coding/include/video_codec_interface.h" -#include "system_wrappers/include/clock.h" namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/test/fake_encoder.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/fake_encoder.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/fake_encoder.cc @@ -11,12 +11,16 @@ #include "test/fake_encoder.h" #include <string.h> - #include <algorithm> +#include <cstdint> #include <memory> +#include <string> -#include "api/video_codecs/vp8_temporal_layers.h" +#include "api/video/video_content_type.h" +#include "common_types.h" // NOLINT(build/include) +#include "modules/video_coding/codecs/h264/include/h264_globals.h" #include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/checks.h" #include "system_wrappers/include/sleep.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/fake_encoder.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/fake_encoder.h +++ chromium-72.0.3626.53/third_party/webrtc/test/fake_encoder.h @@ -11,13 +11,23 @@ #ifndef TEST_FAKE_ENCODER_H_ #define TEST_FAKE_ENCODER_H_ +#include <stddef.h> +#include <stdint.h> #include <memory> #include <vector> +#include "api/video/encoded_image.h" +#include "api/video/video_bitrate_allocation.h" +#include "api/video/video_frame.h" +#include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_encoder.h" +#include "common_types.h" // NOLINT(build/include) +#include "modules/include/module_common_types.h" +#include "modules/video_coding/include/video_codec_interface.h" #include "rtc_base/criticalsection.h" #include "rtc_base/sequenced_task_checker.h" #include "rtc_base/task_queue.h" +#include "rtc_base/thread_annotations.h" #include "system_wrappers/include/clock.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/test/fake_texture_frame.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/fake_texture_frame.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/fake_texture_frame.cc @@ -10,6 +10,9 @@ #include "test/fake_texture_frame.h" +#include "api/video/i420_buffer.h" +#include "rtc_base/refcountedobject.h" + namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/test/fake_vp8_decoder.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/fake_vp8_decoder.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/fake_vp8_decoder.cc @@ -10,7 +10,15 @@ #include "test/fake_vp8_decoder.h" +#include <stddef.h> + +#include "absl/types/optional.h" #include "api/video/i420_buffer.h" +#include "api/video/video_frame.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" +#include "modules/video_coding/include/video_error_codes.h" +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/timeutils.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/test/fake_vp8_decoder.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/fake_vp8_decoder.h +++ chromium-72.0.3626.53/third_party/webrtc/test/fake_vp8_decoder.h @@ -11,8 +11,12 @@ #ifndef TEST_FAKE_VP8_DECODER_H_ #define TEST_FAKE_VP8_DECODER_H_ +#include <stdint.h> + +#include "api/video/encoded_image.h" +#include "api/video_codecs/video_codec.h" +#include "api/video_codecs/video_decoder.h" #include "modules/video_coding/include/video_codec_interface.h" -#include "system_wrappers/include/clock.h" namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/test/fake_vp8_encoder.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/fake_vp8_encoder.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/fake_vp8_encoder.cc @@ -10,15 +10,16 @@ #include "test/fake_vp8_encoder.h" +#include <algorithm> + +#include "absl/types/optional.h" #include "api/video_codecs/create_vp8_temporal_layers.h" #include "api/video_codecs/vp8_temporal_layers.h" +#include "common_types.h" // NOLINT(build/include) +#include "modules/video_coding/codecs/interface/common_constants.h" #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_error_codes.h" #include "modules/video_coding/utility/simulcast_utility.h" -#include "rtc_base/checks.h" -#include "rtc_base/logging.h" -#include "rtc_base/random.h" -#include "rtc_base/timeutils.h" namespace { Index: chromium-72.0.3626.53/third_party/webrtc/test/fake_vp8_encoder.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/fake_vp8_encoder.h +++ chromium-72.0.3626.53/third_party/webrtc/test/fake_vp8_encoder.h @@ -11,14 +11,22 @@ #ifndef TEST_FAKE_VP8_ENCODER_H_ #define TEST_FAKE_VP8_ENCODER_H_ +#include <stddef.h> +#include <stdint.h> #include <memory> #include <vector> +#include "api/video/encoded_image.h" +#include "api/video_codecs/video_codec.h" +#include "api/video_codecs/video_encoder.h" #include "api/video_codecs/vp8_temporal_layers.h" -#include "test/fake_encoder.h" - -#include "rtc_base/criticalsection.h" +#include "common_types.h" // NOLINT(build/include) +#include "modules/include/module_common_types.h" +#include "modules/video_coding/include/video_codec_interface.h" #include "rtc_base/sequenced_task_checker.h" +#include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/clock.h" +#include "test/fake_encoder.h" namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/test/frame_generator.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/frame_generator.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/frame_generator.cc @@ -9,19 +9,23 @@ */ #include "test/frame_generator.h" -#include <math.h> -#include <stdio.h> #include <string.h> - +#include <cstdint> +#include <cstdio> #include <memory> #include "api/video/i010_buffer.h" #include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" +#include "common_types.h" // NOLINT(build/include) #include "common_video/include/video_frame_buffer.h" #include "common_video/libyuv/include/webrtc_libyuv.h" +#include "rtc_base/bind.h" #include "rtc_base/checks.h" #include "rtc_base/keep_ref_until_done.h" #include "rtc_base/random.h" +#include "rtc_base/scoped_ref_ptr.h" #include "system_wrappers/include/clock.h" #include "test/frame_utils.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/frame_generator_capturer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/frame_generator_capturer.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/frame_generator_capturer.cc @@ -10,11 +10,14 @@ #include "test/frame_generator_capturer.h" +#include <algorithm> +#include <cmath> +#include <limits> #include <utility> #include <vector> #include "absl/memory/memory.h" -#include "call/video_send_stream.h" +#include "rtc_base/checks.h" #include "rtc_base/criticalsection.h" #include "rtc_base/logging.h" #include "rtc_base/task_queue.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/frame_generator_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/frame_generator_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/frame_generator_unittest.cc @@ -8,11 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <assert.h> #include <stdio.h> - +#include <string.h> +#include <cstdint> #include <memory> #include <string> +#include "api/video/video_frame_buffer.h" +#include "rtc_base/scoped_ref_ptr.h" #include "test/frame_generator.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/gl/gl_renderer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/gl/gl_renderer.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/gl/gl_renderer.cc @@ -12,6 +12,7 @@ #include <string.h> +#include "common_types.h" // NOLINT(build/include) #include "common_video/libyuv/include/webrtc_libyuv.h" #include "rtc_base/checks.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/gl/gl_renderer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/gl/gl_renderer.h +++ chromium-72.0.3626.53/third_party/webrtc/test/gl/gl_renderer.h @@ -17,6 +17,10 @@ #include <GL/gl.h> #endif +#include <stddef.h> +#include <stdint.h> + +#include "api/video/video_frame.h" #include "test/video_renderer.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/test/layer_filtering_transport.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/layer_filtering_transport.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/layer_filtering_transport.cc @@ -8,12 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <string.h> +#include <algorithm> #include <memory> +#include <utility> +#include "api/rtp_headers.h" +#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/rtp_format.h" #include "modules/rtp_rtcp/source/rtp_utility.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" #include "rtc_base/checks.h" #include "test/layer_filtering_transport.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/layer_filtering_transport.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/layer_filtering_transport.h +++ chromium-72.0.3626.53/third_party/webrtc/test/layer_filtering_transport.h @@ -10,9 +10,13 @@ #ifndef TEST_LAYER_FILTERING_TRANSPORT_H_ #define TEST_LAYER_FILTERING_TRANSPORT_H_ +#include <stddef.h> +#include <stdint.h> #include <map> +#include <memory> -#include "api/test/simulated_network.h" +#include "api/call/transport.h" +#include "api/mediatypes.h" #include "call/call.h" #include "call/simulated_packet_receiver.h" #include "test/direct_transport.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/linux/glx_renderer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/linux/glx_renderer.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/linux/glx_renderer.cc @@ -10,14 +10,11 @@ #include "test/linux/glx_renderer.h" +#include <X11/Xlib.h> +#include <X11/Xutil.h> #include <assert.h> #include <stdlib.h> -#include <X11/Xatom.h> -#include <X11/Xlib.h> - -#include "common_video/libyuv/include/webrtc_libyuv.h" - namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/test/linux/glx_renderer.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/linux/glx_renderer.h +++ chromium-72.0.3626.53/third_party/webrtc/test/linux/glx_renderer.h @@ -12,8 +12,11 @@ #define TEST_LINUX_GLX_RENDERER_H_ #include <GL/glx.h> +#include <X11/X.h> #include <X11/Xlib.h> +#include <stddef.h> +#include "api/video/video_frame.h" #include "test/gl/gl_renderer.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/test/linux/video_renderer_linux.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/linux/video_renderer_linux.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/linux/video_renderer_linux.cc @@ -7,9 +7,10 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "test/video_renderer.h" +#include <stddef.h> #include "test/linux/glx_renderer.h" +#include "test/video_renderer.h" namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/test/rtcp_packet_parser.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/rtcp_packet_parser.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/rtcp_packet_parser.cc @@ -9,6 +9,9 @@ */ #include "test/rtcp_packet_parser.h" + +#include "modules/rtp_rtcp/source/rtcp_packet/psfb.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/rtcp_packet_parser.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/rtcp_packet_parser.h +++ chromium-72.0.3626.53/third_party/webrtc/test/rtcp_packet_parser.h @@ -12,6 +12,9 @@ #ifndef TEST_RTCP_PACKET_PARSER_H_ #define TEST_RTCP_PACKET_PARSER_H_ +#include <stddef.h> +#include <stdint.h> + #include "api/array_view.h" #include "modules/rtp_rtcp/source/rtcp_packet/app.h" #include "modules/rtp_rtcp/source/rtcp_packet/bye.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/rtp_file_writer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/rtp_file_writer.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/rtp_file_writer.cc @@ -10,8 +10,8 @@ #include "test/rtp_file_writer.h" +#include <stdint.h> #include <stdio.h> - #include <string> #include "rtc_base/checks.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/rtp_file_writer_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/rtp_file_writer_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/rtp_file_writer_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> #include <string.h> - #include <memory> #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/run_test.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/run_test.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/run_test.cc @@ -10,8 +10,6 @@ #include "test/run_test.h" -#include <stdio.h> - namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/test/scenario/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/scenario/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/test/scenario/BUILD.gn @@ -37,12 +37,15 @@ if (rtc_include_tests) { "../:test_common", "../:test_support", "../:video_test_common", + "../../:webrtc_common", "../../api:libjingle_peerconnection_api", "../../api:transport_api", "../../api/audio_codecs:builtin_audio_decoder_factory", "../../api/audio_codecs:builtin_audio_encoder_factory", "../../api/test/video:function_video_factory", + "../../api/transport:network_control", "../../api/units:data_rate", + "../../api/units:data_size", "../../api/units:time_delta", "../../api/units:timestamp", "../../api/video:builtin_video_bitrate_allocator_factory", Index: chromium-72.0.3626.53/third_party/webrtc/test/scenario/scenario_config.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/scenario/scenario_config.h +++ chromium-72.0.3626.53/third_party/webrtc/test/scenario/scenario_config.h @@ -10,15 +10,15 @@ #ifndef TEST_SCENARIO_SCENARIO_CONFIG_H_ #define TEST_SCENARIO_SCENARIO_CONFIG_H_ -#include <memory> +#include <stddef.h> #include <string> -#include <vector> #include "absl/types/optional.h" #include "api/rtpparameters.h" #include "api/units/data_rate.h" +#include "api/units/data_size.h" #include "api/units/time_delta.h" -#include "api/video_codecs/video_codec.h" +#include "common_types.h" // NOLINT(build/include) #include "test/frame_generator.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/test/scenario/simulated_time.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/scenario/simulated_time.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/scenario/simulated_time.cc @@ -9,9 +9,14 @@ */ #include "test/scenario/simulated_time.h" +#include <inttypes.h> +#include <string.h> #include <algorithm> +#include <cstdint> +#include <utility> -#include "rtc_base/format_macros.h" +#include "absl/types/optional.h" +#include "rtc_base/checks.h" namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/test/scenario/simulated_time.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/scenario/simulated_time.h +++ chromium-72.0.3626.53/third_party/webrtc/test/scenario/simulated_time.h @@ -10,16 +10,22 @@ #ifndef TEST_SCENARIO_SIMULATED_TIME_H_ #define TEST_SCENARIO_SIMULATED_TIME_H_ +#include <stdint.h> +#include <stdio.h> #include <deque> #include <map> #include <memory> -#include <set> #include <string> -#include <utility> #include <vector> +#include "api/transport/network_control.h" +#include "api/transport/network_types.h" +#include "api/units/data_rate.h" +#include "api/units/data_size.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" +#include "rtc_base/copyonwritebuffer.h" #include "test/scenario/call_client.h" -#include "test/scenario/column_printer.h" #include "test/scenario/network_node.h" #include "test/scenario/scenario_config.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/statistics.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/statistics.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/statistics.cc @@ -10,8 +10,8 @@ #include "test/statistics.h" #include <math.h> - #include <algorithm> +#include <limits> namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/test/test_main_lib.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/test_main_lib.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/test_main_lib.cc @@ -14,6 +14,7 @@ #include <string> #include "absl/memory/memory.h" +#include "rtc_base/checks.h" #include "rtc_base/flags.h" #include "rtc_base/logging.h" #include "rtc_base/thread.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/test_video_capturer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/test_video_capturer.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/test_video_capturer.cc @@ -10,7 +10,10 @@ #include "test/test_video_capturer.h" -#include "rtc_base/constructormagic.h" +#include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" +#include "api/video/video_rotation.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/test/testsupport/fileutils.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/testsupport/fileutils.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/testsupport/fileutils.cc @@ -26,12 +26,11 @@ #include "Shlwapi.h" #include "WinDef.h" - #include "rtc_base/win32.h" + #define GET_CURRENT_DIR _getcwd #else #include <dirent.h> -#include <unistd.h> #define GET_CURRENT_DIR getcwd #endif @@ -43,9 +42,8 @@ #include <stdio.h> #include <stdlib.h> -#include <string.h> - #include <memory> +#include <type_traits> #include <utility> #if defined(WEBRTC_IOS) @@ -56,7 +54,6 @@ #include "test/testsupport/macfileutils.h" #endif -#include "rtc_base/arraysize.h" #include "rtc_base/checks.h" #include "rtc_base/stringutils.h" #include "test/testsupport/fileutils_override.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/testsupport/fileutils_override.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/testsupport/fileutils_override.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/testsupport/fileutils_override.cc @@ -10,6 +10,9 @@ #include "test/testsupport/fileutils_override.h" +#include <limits.h> +#include <stdio.h> + #if defined(WEBRTC_WIN) #include <direct.h> #include <tchar.h> @@ -20,12 +23,12 @@ #include "Shlwapi.h" #include "WinDef.h" - #include "rtc_base/win32.h" + #define GET_CURRENT_DIR _getcwd #else -#include <dirent.h> #include <unistd.h> + #define GET_CURRENT_DIR getcwd #endif Index: chromium-72.0.3626.53/third_party/webrtc/test/testsupport/fileutils_override.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/testsupport/fileutils_override.h +++ chromium-72.0.3626.53/third_party/webrtc/test/testsupport/fileutils_override.h @@ -8,7 +8,6 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <stdio.h> #include <string> #ifndef TEST_TESTSUPPORT_FILEUTILS_OVERRIDE_H_ Index: chromium-72.0.3626.53/third_party/webrtc/test/testsupport/fileutils_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/testsupport/fileutils_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/testsupport/fileutils_unittest.cc @@ -11,10 +11,8 @@ #include "test/testsupport/fileutils.h" #include <stdio.h> - +#include <algorithm> #include <fstream> -#include <iostream> -#include <list> #include <string> #include "absl/types/optional.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/testsupport/perf_test_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/testsupport/perf_test_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/testsupport/perf_test_unittest.cc @@ -10,6 +10,7 @@ #include "test/testsupport/perf_test.h" +#include <algorithm> #include <limits> #include <string> Index: chromium-72.0.3626.53/third_party/webrtc/test/testsupport/test_artifacts.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/testsupport/test_artifacts.h +++ chromium-72.0.3626.53/third_party/webrtc/test/testsupport/test_artifacts.h @@ -11,8 +11,8 @@ #ifndef TEST_TESTSUPPORT_TEST_ARTIFACTS_H_ #define TEST_TESTSUPPORT_TEST_ARTIFACTS_H_ +#include <stdint.h> #include <stdlib.h> - #include <string> namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/test/testsupport/test_artifacts_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/testsupport/test_artifacts_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/testsupport/test_artifacts_unittest.cc @@ -11,12 +11,10 @@ #include "test/testsupport/test_artifacts.h" #include <string.h> - #include <string> #include "rtc_base/file.h" #include "rtc_base/flags.h" -#include "rtc_base/platform_file.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/testsupport/y4m_frame_writer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/testsupport/y4m_frame_writer.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/testsupport/y4m_frame_writer.cc @@ -8,7 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/checks.h" +#include <stdint.h> +#include <stdio.h> +#include <string> + #include "test/testsupport/frame_writer.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/test/testsupport/y4m_frame_writer_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/testsupport/y4m_frame_writer_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/testsupport/y4m_frame_writer_unittest.cc @@ -8,6 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> +#include <stdio.h> +#include <string.h> #include <memory> #include <string> Index: chromium-72.0.3626.53/third_party/webrtc/test/testsupport/yuv_frame_reader.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/testsupport/yuv_frame_reader.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/testsupport/yuv_frame_reader.cc @@ -8,11 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "test/testsupport/frame_reader.h" +#include <stdio.h> +#include <string> #include "api/video/i420_buffer.h" +#include "rtc_base/scoped_ref_ptr.h" #include "test/frame_utils.h" #include "test/testsupport/fileutils.h" +#include "test/testsupport/frame_reader.h" namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/test/testsupport/yuv_frame_reader_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/testsupport/yuv_frame_reader_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/testsupport/yuv_frame_reader_unittest.cc @@ -8,10 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> +#include <stdio.h> #include <memory> #include <string> #include "api/video/i420_buffer.h" +#include "api/video/video_frame_buffer.h" +#include "rtc_base/scoped_ref_ptr.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" #include "test/testsupport/frame_reader.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/testsupport/yuv_frame_writer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/testsupport/yuv_frame_writer.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/testsupport/yuv_frame_writer.cc @@ -8,6 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> +#include <stdio.h> +#include <string> + #include "rtc_base/checks.h" #include "test/testsupport/frame_writer.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/testsupport/yuv_frame_writer_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/testsupport/yuv_frame_writer_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/testsupport/yuv_frame_writer_unittest.cc @@ -8,7 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stdint.h> +#include <stdio.h> +#include <string.h> #include <memory> +#include <string> #include "test/gtest.h" #include "test/testsupport/fileutils.h" Index: chromium-72.0.3626.53/third_party/webrtc/test/vcm_capturer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/test/vcm_capturer.cc +++ chromium-72.0.3626.53/third_party/webrtc/test/vcm_capturer.cc @@ -10,9 +10,15 @@ #include "test/vcm_capturer.h" -#include "call/video_send_stream.h" +#include <stdint.h> +#include <memory> + +#include "absl/types/optional.h" +#include "common_types.h" // NOLINT(build/include) #include "modules/video_capture/video_capture_factory.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" + namespace webrtc { namespace test { Index: chromium-72.0.3626.53/third_party/webrtc/video/BUILD.gn =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/BUILD.gn +++ chromium-72.0.3626.53/third_party/webrtc/video/BUILD.gn @@ -53,9 +53,13 @@ rtc_static_library("video") { deps = [ ":frame_dumping_decoder", + "..:webrtc_common", + "../api:array_view", "../api:fec_controller_api", "../api:libjingle_peerconnection_api", "../api:transport_api", + "../api/video:encoded_image", + "../api/video:video_bitrate_allocation", "../api/video:video_bitrate_allocator", "../api/video:video_frame", "../api/video:video_frame_i420", @@ -67,6 +71,8 @@ rtc_static_library("video") { "../call:rtp_interfaces", "../call:rtp_sender", "../call:video_stream_api", + "../media:rtc_h264_profile_id", + "../modules:module_api_public", "../modules/rtp_rtcp:rtp_rtcp_format", "../modules/rtp_rtcp:rtp_video_header", "../modules/video_coding:codec_globals_headers", @@ -143,6 +149,7 @@ rtc_source_set("frame_dumping_decoder") deps = [ "../api/video:encoded_frame", + "../api/video:encoded_image", "../api/video_codecs:video_codecs_api", "../modules/video_coding:video_codec_interface", "../modules/video_coding:video_coding", @@ -276,7 +283,11 @@ if (rtc_include_tests) { ] deps = [ ":video_quality_test", + "../:webrtc_common", + "../api:simulated_network_api", "../api:test_dependency_factory", + "../api:video_quality_test_fixture_api", + "../api/video_codecs:video_codecs_api", "../media:rtc_vp9_profile", "../modules/pacing:pacing", "../modules/video_coding:webrtc_vp9", @@ -287,6 +298,7 @@ if (rtc_include_tests) { "../test:test_common", "../test:test_support", "//testing/gtest", + "//third_party/abseil-cpp/absl/memory", ] if (!build_with_chromium && is_clang) { # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). @@ -304,6 +316,11 @@ if (rtc_include_tests) { ] deps = [ ":video_quality_test", + "../api:libjingle_peerconnection_api", + "../api:simulated_network_api", + "../api:video_quality_test_fixture_api", + "../api/video_codecs:video_codecs_api", + "../rtc_base:checks", "../rtc_base:logging", "../rtc_base:rtc_base_approved", "../system_wrappers:field_trial", @@ -314,6 +331,7 @@ if (rtc_include_tests) { "../test:test_renderer", "../test:test_support", "//testing/gtest", + "//third_party/abseil-cpp/absl/memory", ] if (!build_with_chromium && is_clang) { # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). @@ -329,6 +347,11 @@ if (rtc_include_tests) { deps = [ ":video_quality_test", + "../api:libjingle_peerconnection_api", + "../api:simulated_network_api", + "../api:video_quality_test_fixture_api", + "../api/video_codecs:video_codecs_api", + "../rtc_base:checks", "../rtc_base:logging", "../rtc_base:rtc_base_approved", "../system_wrappers:field_trial", @@ -338,6 +361,8 @@ if (rtc_include_tests) { "../test:test_common", "../test:test_renderer", "../test:test_support", + "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/types:optional", ] if (!build_with_chromium && is_clang) { # Suppress warnings from Chrome's Clang plugins. @@ -353,6 +378,11 @@ if (rtc_include_tests) { ] deps = [ ":video_quality_test", + "../api:libjingle_peerconnection_api", + "../api:simulated_network_api", + "../api:video_quality_test_fixture_api", + "../api/video_codecs:video_codecs_api", + "../rtc_base:checks", "../rtc_base:logging", "../rtc_base:rtc_base_approved", "../system_wrappers:field_trial", @@ -363,6 +393,7 @@ if (rtc_include_tests) { "../test:test_renderer", "../test:test_support", "//testing/gtest", + "//third_party/abseil-cpp/absl/memory", ] if (!build_with_chromium && is_clang) { # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). @@ -451,8 +482,10 @@ if (rtc_include_tests) { ":video", ":video_mocks", ":video_stream_encoder_impl", + "../:webrtc_common", "../api:fake_frame_decryptor", "../api:fake_frame_encryptor", + "../api:libjingle_peerconnection_api", "../api:simulated_network_api", "../api/test/video:function_video_factory", "../api/video:builtin_video_bitrate_allocator_factory", @@ -465,9 +498,11 @@ if (rtc_include_tests) { "../call:fake_network", "../call:mock_bitrate_allocator", "../call:mock_rtp_interfaces", + "../call:rtp_interfaces", "../call:rtp_receiver", "../call:rtp_sender", "../call:simulated_network", + "../call:simulated_packet_receiver", "../call:video_stream_api", "../common_video", "../logging:rtc_event_log_api", Index: chromium-72.0.3626.53/third_party/webrtc/video/call_stats.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/call_stats.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/call_stats.cc @@ -11,12 +11,11 @@ #include "video/call_stats.h" #include <algorithm> +#include <memory> #include "modules/utility/include/process_thread.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" #include "rtc_base/location.h" -#include "rtc_base/logging.h" #include "rtc_base/task_queue.h" #include "system_wrappers/include/metrics.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/cpu_scaling_tests.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/cpu_scaling_tests.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/cpu_scaling_tests.cc @@ -8,9 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <limits> +#include <vector> + +#include "api/rtpparameters.h" +#include "api/video/video_frame.h" +#include "api/video/video_sink_interface.h" +#include "api/video/video_source_interface.h" +#include "api/video_codecs/video_encoder_config.h" +#include "call/video_receive_stream.h" +#include "call/video_send_stream.h" +#include "rtc_base/checks.h" +#include "rtc_base/event.h" #include "test/call_test.h" #include "test/field_trial.h" #include "test/frame_generator_capturer.h" +#include "test/gtest.h" namespace webrtc { namespace { Index: chromium-72.0.3626.53/third_party/webrtc/video/end_to_end_tests/config_tests.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/end_to_end_tests/config_tests.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/end_to_end_tests/config_tests.cc @@ -8,6 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <map> +#include <vector> + +#include "api/crypto/cryptooptions.h" +#include "api/rtp_headers.h" +#include "call/flexfec_receive_stream.h" +#include "call/rtp_config.h" +#include "call/video_receive_stream.h" +#include "call/video_send_stream.h" #include "test/call_test.h" #include "test/gtest.h" #include "test/null_transport.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/end_to_end_tests/extended_reports_tests.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/end_to_end_tests/extended_reports_tests.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/end_to_end_tests/extended_reports_tests.cc @@ -8,13 +8,39 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <stddef.h> +#include <stdint.h> +#include <memory> +#include <string> +#include <utility> +#include <vector> + +#include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/rtp_headers.h" +#include "api/test/simulated_network.h" +#include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_encoder_config.h" +#include "call/call.h" #include "call/fake_network_pipe.h" +#include "call/rtp_config.h" #include "call/simulated_network.h" +#include "call/simulated_packet_receiver.h" +#include "call/video_receive_stream.h" +#include "call/video_send_stream.h" +#include "common_types.h" // NOLINT(build/include) +#include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/event.h" +#include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/clock.h" #include "test/call_test.h" #include "test/field_trial.h" #include "test/gtest.h" #include "test/rtcp_packet_parser.h" +#include "test/rtp_rtcp_observer.h" +#include "test/single_threaded_task_queue.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/video/end_to_end_tests/multi_stream_tests.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/end_to_end_tests/multi_stream_tests.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/end_to_end_tests/multi_stream_tests.cc @@ -8,12 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "logging/rtc_event_log/rtc_event_log.h" -#include "modules/video_coding/codecs/vp8/include/vp8.h" +#include <stddef.h> +#include <stdint.h> +#include <memory> +#include <vector> + +#include "api/video/video_frame.h" +#include "api/video/video_sink_interface.h" +#include "api/video_codecs/video_encoder_config.h" +#include "call/rtp_config.h" +#include "call/video_receive_stream.h" +#include "call/video_send_stream.h" +#include "rtc_base/event.h" #include "test/call_test.h" -#include "test/encoder_settings.h" -#include "test/field_trial.h" +#include "test/frame_generator_capturer.h" #include "test/gtest.h" +#include "test/single_threaded_task_queue.h" #include "video/end_to_end_tests/multi_stream_tester.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/video/frame_dumping_decoder.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/frame_dumping_decoder.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/frame_dumping_decoder.cc @@ -13,6 +13,7 @@ #include <utility> #include "modules/video_coding/include/video_codec_interface.h" +#include "rtc_base/file.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/video/frame_dumping_decoder.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/frame_dumping_decoder.h +++ chromium-72.0.3626.53/third_party/webrtc/video/frame_dumping_decoder.h @@ -11,9 +11,13 @@ #ifndef VIDEO_FRAME_DUMPING_DECODER_H_ #define VIDEO_FRAME_DUMPING_DECODER_H_ +#include <stdint.h> #include <memory> +#include "api/video/encoded_image.h" +#include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_decoder.h" +#include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/utility/ivf_file_writer.h" #include "rtc_base/platform_file.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/full_stack_tests.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/full_stack_tests.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/full_stack_tests.cc @@ -7,12 +7,22 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include <stdio.h> +#include <memory> +#include <string> +#include <utility> +#include <vector> +#include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/test/simulated_network.h" #include "api/test/test_dependency_factory.h" +#include "api/test/video_quality_test_fixture.h" +#include "api/video_codecs/sdp_video_format.h" +#include "api/video_codecs/video_codec.h" +#include "api/video_codecs/video_encoder_config.h" +#include "common_types.h" // NOLINT(build/include) #include "media/base/vp9_profile.h" #include "modules/video_coding/codecs/vp9/include/vp9.h" -#include "rtc_base/experiments/alr_experiment.h" #include "rtc_base/flags.h" #include "system_wrappers/include/field_trial.h" #include "test/field_trial.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/quality_threshold.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/quality_threshold.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/quality_threshold.cc @@ -11,7 +11,6 @@ #include "video/quality_threshold.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/video/receive_statistics_proxy_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/receive_statistics_proxy_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/receive_statistics_proxy_unittest.cc @@ -12,12 +12,13 @@ #include <limits> #include <memory> -#include <utility> +#include <string> #include "api/video/i420_buffer.h" #include "api/video/video_frame.h" +#include "api/video/video_frame_buffer.h" #include "api/video/video_rotation.h" -#include "modules/video_coding/include/video_codec_interface.h" +#include "rtc_base/scoped_ref_ptr.h" #include "system_wrappers/include/metrics.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/report_block_stats.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/report_block_stats.h +++ chromium-72.0.3626.53/third_party/webrtc/video/report_block_stats.h @@ -11,6 +11,7 @@ #ifndef VIDEO_REPORT_BLOCK_STATS_H_ #define VIDEO_REPORT_BLOCK_STATS_H_ +#include <stdint.h> #include <map> #include <vector> Index: chromium-72.0.3626.53/third_party/webrtc/video/rtp_streams_synchronizer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/rtp_streams_synchronizer.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/rtp_streams_synchronizer.cc @@ -10,12 +10,12 @@ #include "video/rtp_streams_synchronizer.h" +#include "absl/types/optional.h" #include "call/syncable.h" -#include "modules/video_coding/video_coding_impl.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" #include "rtc_base/timeutils.h" #include "rtc_base/trace_event.h" +#include "system_wrappers/include/rtp_to_ntp_estimator.h" namespace webrtc { namespace { Index: chromium-72.0.3626.53/third_party/webrtc/video/screenshare_loopback.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/screenshare_loopback.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/screenshare_loopback.cc @@ -9,9 +9,20 @@ */ #include <stdio.h> +#include <memory> +#include <string> +#include <vector> +#include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/bitrate_constraints.h" +#include "api/test/simulated_network.h" +#include "api/test/video_quality_test_fixture.h" +#include "api/video_codecs/video_codec.h" +#include "rtc_base/checks.h" #include "rtc_base/flags.h" #include "rtc_base/logging.h" +#include "rtc_base/stringencode.h" #include "system_wrappers/include/field_trial.h" #include "test/field_trial.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/send_delay_stats.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/send_delay_stats.h +++ chromium-72.0.3626.53/third_party/webrtc/video/send_delay_stats.h @@ -11,11 +11,15 @@ #ifndef VIDEO_SEND_DELAY_STATS_H_ #define VIDEO_SEND_DELAY_STATS_H_ +#include <stddef.h> +#include <stdint.h> #include <map> #include <memory> #include <set> #include "call/video_send_stream.h" +#include "common_types.h" // NOLINT(build/include) +#include "modules/include/module_common_types_public.h" #include "rtc_base/criticalsection.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/clock.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/send_delay_stats_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/send_delay_stats_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/send_delay_stats_unittest.cc @@ -10,6 +10,10 @@ #include "video/send_delay_stats.h" +#include <cstdint> +#include <vector> + +#include "call/rtp_config.h" #include "system_wrappers/include/metrics.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/stream_synchronization.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/stream_synchronization.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/stream_synchronization.cc @@ -11,9 +11,7 @@ #include "video/stream_synchronization.h" #include <assert.h> -#include <math.h> #include <stdlib.h> - #include <algorithm> #include "rtc_base/logging.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/stream_synchronization.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/stream_synchronization.h +++ chromium-72.0.3626.53/third_party/webrtc/video/stream_synchronization.h @@ -11,7 +11,7 @@ #ifndef VIDEO_STREAM_SYNCHRONIZATION_H_ #define VIDEO_STREAM_SYNCHRONIZATION_H_ -#include <list> +#include <stdint.h> #include "system_wrappers/include/rtp_to_ntp_estimator.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/stream_synchronization_unittest.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/stream_synchronization_unittest.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/stream_synchronization_unittest.cc @@ -8,10 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <math.h> - #include <algorithm> +#include "system_wrappers/include/ntp_time.h" #include "test/gtest.h" #include "video/stream_synchronization.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/sv_loopback.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/sv_loopback.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/sv_loopback.cc @@ -9,9 +9,20 @@ */ #include <stdio.h> +#include <memory> +#include <string> +#include <vector> +#include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/bitrate_constraints.h" +#include "api/test/simulated_network.h" +#include "api/test/video_quality_test_fixture.h" +#include "api/video_codecs/video_codec.h" +#include "rtc_base/checks.h" #include "rtc_base/flags.h" #include "rtc_base/logging.h" +#include "rtc_base/stringencode.h" #include "system_wrappers/include/field_trial.h" #include "test/field_trial.h" #include "test/gtest.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/transport_adapter.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/transport_adapter.h +++ chromium-72.0.3626.53/third_party/webrtc/video/transport_adapter.h @@ -10,6 +10,8 @@ #ifndef VIDEO_TRANSPORT_ADAPTER_H_ #define VIDEO_TRANSPORT_ADAPTER_H_ +#include <stddef.h> +#include <stdint.h> #include <atomic> #include "api/call/transport.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/video_loopback.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/video_loopback.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/video_loopback.cc @@ -9,7 +9,17 @@ */ #include <stdio.h> +#include <memory> +#include <string> +#include <vector> +#include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "api/bitrate_constraints.h" +#include "api/test/simulated_network.h" +#include "api/test/video_quality_test_fixture.h" +#include "api/video_codecs/video_codec.h" +#include "rtc_base/checks.h" #include "rtc_base/flags.h" #include "rtc_base/logging.h" #include "system_wrappers/include/field_trial.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/video_quality_observer.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/video_quality_observer.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/video_quality_observer.cc @@ -11,9 +11,9 @@ #include "video/video_quality_observer.h" #include <algorithm> +#include <cstdint> #include <string> -#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/strings/string_builder.h" #include "system_wrappers/include/metrics.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/video_receive_stream.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/video_receive_stream.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/video_receive_stream.cc @@ -11,23 +11,29 @@ #include "video/video_receive_stream.h" #include <stdlib.h> - +#include <string.h> #include <set> #include <string> #include <utility> #include "absl/memory/memory.h" #include "absl/types/optional.h" +#include "api/array_view.h" +#include "api/crypto/framedecryptorinterface.h" +#include "api/video/encoded_image.h" +#include "api/video_codecs/sdp_video_format.h" +#include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_decoder_factory.h" +#include "api/video_codecs/video_encoder.h" #include "call/rtp_stream_receiver_controller_interface.h" #include "call/rtx_receive_stream.h" -#include "common_video/h264/profile_level_id.h" +#include "common_types.h" // NOLINT(build/include) #include "common_video/include/incoming_video_stream.h" -#include "common_video/libyuv/include/webrtc_libyuv.h" -#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "media/base/h264_profile_level_id.h" #include "modules/utility/include/process_thread.h" -#include "modules/video_coding/frame_object.h" -#include "modules/video_coding/include/video_coding.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "modules/video_coding/include/video_coding_defines.h" +#include "modules/video_coding/include/video_error_codes.h" #include "modules/video_coding/jitter_estimator.h" #include "modules/video_coding/timing.h" #include "modules/video_coding/utility/vp8_header_parser.h" @@ -36,6 +42,7 @@ #include "rtc_base/logging.h" #include "rtc_base/platform_file.h" #include "rtc_base/strings/string_builder.h" +#include "rtc_base/timeutils.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/field_trial.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/video_send_stream.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/video_send_stream.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/video_send_stream.cc @@ -11,10 +11,15 @@ #include <utility> +#include "api/array_view.h" #include "api/video/video_stream_encoder_create.h" +#include "api/video/video_stream_encoder_settings.h" +#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "modules/rtp_rtcp/source/rtp_header_extension_size.h" #include "modules/rtp_rtcp/source/rtp_sender.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "system_wrappers/include/clock.h" #include "system_wrappers/include/field_trial.h" #include "video/video_send_stream_impl.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/video_send_stream_impl.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/video_send_stream_impl.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/video_send_stream_impl.cc @@ -9,20 +9,30 @@ */ #include "video/video_send_stream_impl.h" +#include <stdio.h> #include <algorithm> +#include <cstdint> #include <string> #include <utility> +#include "api/crypto/cryptooptions.h" +#include "api/rtpparameters.h" +#include "api/video_codecs/video_codec.h" #include "call/rtp_transport_controller_send_interface.h" -#include "modules/pacing/packet_router.h" -#include "modules/rtp_rtcp/source/rtp_sender.h" +#include "call/video_send_stream.h" +#include "common_types.h" // NOLINT(build/include) +#include "modules/pacing/paced_sender.h" +#include "rtc_base/atomicops.h" #include "rtc_base/checks.h" #include "rtc_base/experiments/alr_experiment.h" -#include "rtc_base/file.h" -#include "rtc_base/location.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" +#include "rtc_base/scoped_ref_ptr.h" +#include "rtc_base/sequenced_task_checker.h" +#include "rtc_base/thread_checker.h" +#include "rtc_base/timeutils.h" #include "rtc_base/trace_event.h" +#include "system_wrappers/include/clock.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { Index: chromium-72.0.3626.53/third_party/webrtc/video/video_send_stream_impl.h =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/video_send_stream_impl.h +++ chromium-72.0.3626.53/third_party/webrtc/video/video_send_stream_impl.h @@ -10,15 +10,32 @@ #ifndef VIDEO_VIDEO_SEND_STREAM_IMPL_H_ #define VIDEO_VIDEO_SEND_STREAM_IMPL_H_ +#include <stddef.h> +#include <stdint.h> #include <map> #include <memory> #include <vector> +#include "absl/types/optional.h" +#include "api/fec_controller.h" +#include "api/video/encoded_image.h" +#include "api/video/video_bitrate_allocation.h" #include "api/video/video_bitrate_allocator.h" #include "api/video/video_stream_encoder_interface.h" +#include "api/video_codecs/video_encoder.h" +#include "api/video_codecs/video_encoder_config.h" #include "call/bitrate_allocator.h" +#include "call/rtp_config.h" +#include "call/rtp_transport_controller_send_interface.h" #include "call/rtp_video_sender_interface.h" +#include "logging/rtc_event_log/rtc_event_log.h" +#include "modules/include/module_common_types.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/utility/include/process_thread.h" +#include "modules/video_coding/include/video_codec_interface.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/task_queue.h" +#include "rtc_base/thread_annotations.h" #include "rtc_base/weak_ptr.h" #include "video/call_stats.h" #include "video/encoder_rtcp_feedback.h" Index: chromium-72.0.3626.53/third_party/webrtc/video/video_stream_decoder.cc =================================================================== --- chromium-72.0.3626.53.orig/third_party/webrtc/video/video_stream_decoder.cc +++ chromium-72.0.3626.53/third_party/webrtc/video/video_stream_decoder.cc @@ -10,15 +10,9 @@ #include "video/video_stream_decoder.h" -#include <algorithm> -#include <map> -#include <vector> - +#include "modules/video_coding/include/video_coding.h" #include "modules/video_coding/video_coding_impl.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" -#include "system_wrappers/include/metrics.h" -#include "video/call_stats.h" #include "video/receive_statistics_proxy.h" namespace webrtc {
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
