diff --git a/audio/BUILD.gn b/audio/BUILD.gn index 1e417b6da0..ccbf9fd2e3 100644 --- a/audio/BUILD.gn +++ b/audio/BUILD.gn @@ -47,6 +47,7 @@ rtc_library("audio") { "../api:rtp_headers", "../api:rtp_parameters", "../api:scoped_refptr", + "../api:sequence_checker", "../api:transport_api", "../api/audio:aec3_factory", "../api/audio:audio_frame_api", @@ -93,7 +94,6 @@ rtc_library("audio") { "../rtc_base:threading", "../rtc_base/experiments:field_trial_parser", "../rtc_base/synchronization:mutex", - "../rtc_base/synchronization:sequence_checker", "../rtc_base/system:no_unique_address", "../rtc_base/task_utils:to_queued_task", "../system_wrappers", diff --git a/audio/audio_receive_stream.h b/audio/audio_receive_stream.h index 4d882d193f..0ccd21e9cb 100644 --- a/audio/audio_receive_stream.h +++ b/audio/audio_receive_stream.h @@ -17,11 +17,11 @@ #include "api/audio/audio_mixer.h" #include "api/neteq/neteq_factory.h" #include "api/rtp_headers.h" +#include "api/sequence_checker.h" #include "audio/audio_state.h" #include "call/audio_receive_stream.h" #include "call/syncable.h" #include "modules/rtp_rtcp/source/source_tracker.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/audio/audio_send_stream.h b/audio/audio_send_stream.h index 113d2593af..25346ae373 100644 --- a/audio/audio_send_stream.h +++ b/audio/audio_send_stream.h @@ -15,6 +15,7 @@ #include #include +#include "api/sequence_checker.h" #include "audio/audio_level.h" #include "audio/channel_send.h" #include "call/audio_send_stream.h" @@ -24,7 +25,6 @@ #include "rtc_base/experiments/struct_parameters_parser.h" #include "rtc_base/race_checker.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_queue.h" namespace webrtc { diff --git a/audio/audio_state.h b/audio/audio_state.h index 5a8818eec7..89c748dc4e 100644 --- a/audio/audio_state.h +++ b/audio/audio_state.h @@ -15,11 +15,11 @@ #include #include +#include "api/sequence_checker.h" #include "audio/audio_transport_impl.h" #include "audio/null_audio_poller.h" #include "call/audio_state.h" #include "rtc_base/ref_count.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/audio/channel_receive.cc b/audio/channel_receive.cc index 5c2b91803a..1316ccb03b 100644 --- a/audio/channel_receive.cc +++ b/audio/channel_receive.cc @@ -22,6 +22,7 @@ #include "api/crypto/frame_decryptor_interface.h" #include "api/frame_transformer_interface.h" #include "api/rtc_event_log/rtc_event_log.h" +#include "api/sequence_checker.h" #include "audio/audio_level.h" #include "audio/channel_receive_frame_transformer_delegate.h" #include "audio/channel_send.h" @@ -46,7 +47,6 @@ #include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/race_checker.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/time_utils.h" #include "system_wrappers/include/metrics.h" diff --git a/audio/channel_receive_frame_transformer_delegate.h b/audio/channel_receive_frame_transformer_delegate.h index 3227c55914..0af748e37f 100644 --- a/audio/channel_receive_frame_transformer_delegate.h +++ b/audio/channel_receive_frame_transformer_delegate.h @@ -14,7 +14,7 @@ #include #include "api/frame_transformer_interface.h" -#include "rtc_base/synchronization/sequence_checker.h" +#include "api/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread.h" diff --git a/audio/channel_send.cc b/audio/channel_send.cc index bdb047be77..80affd2047 100644 --- a/audio/channel_send.cc +++ b/audio/channel_send.cc @@ -21,6 +21,7 @@ #include "api/call/transport.h" #include "api/crypto/frame_encryptor_interface.h" #include "api/rtc_event_log/rtc_event_log.h" +#include "api/sequence_checker.h" #include "audio/channel_send_frame_transformer_delegate.h" #include "audio/utility/audio_frame_operations.h" #include "call/rtp_transport_controller_send_interface.h" @@ -40,7 +41,6 @@ #include "rtc_base/race_checker.h" #include "rtc_base/rate_limiter.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_queue.h" #include "rtc_base/time_utils.h" #include "system_wrappers/include/clock.h" diff --git a/audio/channel_send_frame_transformer_delegate.h b/audio/channel_send_frame_transformer_delegate.h index 531d1bc110..9b7eb33b5c 100644 --- a/audio/channel_send_frame_transformer_delegate.h +++ b/audio/channel_send_frame_transformer_delegate.h @@ -14,10 +14,10 @@ #include #include "api/frame_transformer_interface.h" +#include "api/sequence_checker.h" #include "modules/audio_coding/include/audio_coding_module_typedefs.h" #include "rtc_base/buffer.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_queue.h" namespace webrtc { diff --git a/audio/null_audio_poller.h b/audio/null_audio_poller.h index 99b48c2b6d..47e67a91da 100644 --- a/audio/null_audio_poller.h +++ b/audio/null_audio_poller.h @@ -13,9 +13,9 @@ #include +#include "api/sequence_checker.h" #include "modules/audio_device/include/audio_device_defines.h" #include "rtc_base/message_handler.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { namespace internal { diff --git a/audio/voip/BUILD.gn b/audio/voip/BUILD.gn index d90e5c425f..5311d7242b 100644 --- a/audio/voip/BUILD.gn +++ b/audio/voip/BUILD.gn @@ -89,6 +89,7 @@ rtc_library("audio_egress") { ] deps = [ "..:audio", + "../../api:sequence_checker", "../../api/audio_codecs:audio_codecs_api", "../../api/task_queue", "../../call:audio_sender_interface", @@ -99,7 +100,6 @@ rtc_library("audio_egress") { "../../rtc_base:rtc_task_queue", "../../rtc_base:timeutils", "../../rtc_base/synchronization:mutex", - "../../rtc_base/synchronization:sequence_checker", "../../rtc_base/system:no_unique_address", "../utility:audio_frame_operations", ] diff --git a/audio/voip/audio_egress.h b/audio/voip/audio_egress.h index 4fdbb5de23..a39c7e225a 100644 --- a/audio/voip/audio_egress.h +++ b/audio/voip/audio_egress.h @@ -15,6 +15,7 @@ #include #include "api/audio_codecs/audio_format.h" +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_factory.h" #include "audio/audio_level.h" #include "audio/utility/audio_frame_operations.h" @@ -24,7 +25,6 @@ #include "modules/rtp_rtcp/source/rtp_rtcp_interface.h" #include "modules/rtp_rtcp/source/rtp_sender_audio.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_queue.h" #include "rtc_base/time_utils.h" diff --git a/call/BUILD.gn b/call/BUILD.gn index 3183fa001b..0e3e89d5d4 100644 --- a/call/BUILD.gn +++ b/call/BUILD.gn @@ -132,6 +132,7 @@ rtc_library("rtp_receiver") { ":rtp_interfaces", "../api:array_view", "../api:rtp_headers", + "../api:sequence_checker", "../modules/rtp_rtcp", "../modules/rtp_rtcp:rtp_rtcp_format", "../rtc_base:checks", @@ -158,6 +159,7 @@ rtc_library("rtp_sender") { "../api:fec_controller_api", "../api:network_state_predictor_api", "../api:rtp_parameters", + "../api:sequence_checker", "../api:transport_api", "../api/rtc_event_log", "../api/transport:field_trial_based_config", @@ -226,13 +228,13 @@ rtc_library("bitrate_allocator") { ] deps = [ "../api:bitrate_allocation", + "../api:sequence_checker", "../api/transport:network_control", "../api/units:data_rate", "../api/units:time_delta", "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../rtc_base:safe_minmax", - "../rtc_base/synchronization:sequence_checker", "../rtc_base/system:no_unique_address", "../system_wrappers", "../system_wrappers:field_trial", @@ -269,6 +271,7 @@ rtc_library("call") { "../api:fec_controller_api", "../api:rtp_headers", "../api:rtp_parameters", + "../api:sequence_checker", "../api:simulated_network_api", "../api:transport_api", "../api/rtc_event_log", @@ -293,7 +296,6 @@ rtc_library("call") { "../rtc_base:safe_minmax", "../rtc_base/experiments:field_trial_parser", "../rtc_base/network:sent_packet", - "../rtc_base/synchronization:sequence_checker", "../rtc_base/system:no_unique_address", "../rtc_base/task_utils:pending_task_safety_flag", "../system_wrappers", @@ -344,6 +346,7 @@ rtc_library("simulated_network") { "simulated_network.h", ] deps = [ + "../api:sequence_checker", "../api:simulated_network_api", "../api/units:data_rate", "../api/units:data_size", @@ -352,7 +355,6 @@ rtc_library("simulated_network") { "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../rtc_base/synchronization:mutex", - "../rtc_base/synchronization:sequence_checker", ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } @@ -375,13 +377,13 @@ rtc_library("fake_network") { ":simulated_network", ":simulated_packet_receiver", "../api:rtp_parameters", + "../api:sequence_checker", "../api:simulated_network_api", "../api:transport_api", "../modules/utility", "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../rtc_base/synchronization:mutex", - "../rtc_base/synchronization:sequence_checker", "../system_wrappers", ] } diff --git a/call/adaptation/BUILD.gn b/call/adaptation/BUILD.gn index f782a8d5bc..10a46a3d43 100644 --- a/call/adaptation/BUILD.gn +++ b/call/adaptation/BUILD.gn @@ -34,6 +34,7 @@ rtc_library("resource_adaptation") { deps = [ "../../api:rtp_parameters", "../../api:scoped_refptr", + "../../api:sequence_checker", "../../api/adaptation:resource_adaptation_api", "../../api/task_queue:task_queue", "../../api/video:video_adaptation", @@ -46,7 +47,6 @@ rtc_library("resource_adaptation") { "../../rtc_base:rtc_task_queue", "../../rtc_base/experiments:balanced_degradation_settings", "../../rtc_base/synchronization:mutex", - "../../rtc_base/synchronization:sequence_checker", "../../rtc_base/system:no_unique_address", "../../rtc_base/task_utils:to_queued_task", ] @@ -108,11 +108,11 @@ if (rtc_include_tests) { deps = [ ":resource_adaptation", "../../api:scoped_refptr", + "../../api:sequence_checker", "../../api/adaptation:resource_adaptation_api", "../../api/task_queue:task_queue", "../../api/video:video_stream_encoder", "../../rtc_base:rtc_base_approved", - "../../rtc_base/synchronization:sequence_checker", "../../rtc_base/task_utils:to_queued_task", "../../test:test_support", ] diff --git a/call/adaptation/resource_adaptation_processor.cc b/call/adaptation/resource_adaptation_processor.cc index ac1b1db174..4925b6410a 100644 --- a/call/adaptation/resource_adaptation_processor.cc +++ b/call/adaptation/resource_adaptation_processor.cc @@ -15,12 +15,12 @@ #include #include "absl/algorithm/container.h" +#include "api/sequence_checker.h" #include "api/video/video_adaptation_counters.h" #include "call/adaptation/video_stream_adapter.h" #include "rtc_base/logging.h" #include "rtc_base/ref_counted_object.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_utils/to_queued_task.h" namespace webrtc { diff --git a/call/adaptation/video_stream_adapter.cc b/call/adaptation/video_stream_adapter.cc index 13eb0349a3..f81e217d05 100644 --- a/call/adaptation/video_stream_adapter.cc +++ b/call/adaptation/video_stream_adapter.cc @@ -16,6 +16,7 @@ #include "absl/types/optional.h" #include "absl/types/variant.h" +#include "api/sequence_checker.h" #include "api/video/video_adaptation_counters.h" #include "api/video/video_adaptation_reason.h" #include "api/video_codecs/video_encoder.h" @@ -25,7 +26,6 @@ #include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/call/bitrate_allocator.h b/call/bitrate_allocator.h index 481d91b23c..c0d664b6f0 100644 --- a/call/bitrate_allocator.h +++ b/call/bitrate_allocator.h @@ -20,8 +20,8 @@ #include #include "api/call/bitrate_allocation.h" +#include "api/sequence_checker.h" #include "api/transport/network_types.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" namespace webrtc { diff --git a/call/call.cc b/call/call.cc index 46bf52862f..6bffbd8bcb 100644 --- a/call/call.cc +++ b/call/call.cc @@ -21,6 +21,7 @@ #include "absl/types/optional.h" #include "api/rtc_event_log/rtc_event_log.h" +#include "api/sequence_checker.h" #include "api/transport/network_control.h" #include "audio/audio_receive_stream.h" #include "audio/audio_send_stream.h" @@ -51,7 +52,6 @@ #include "rtc_base/location.h" #include "rtc_base/logging.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/task_utils/pending_task_safety_flag.h" #include "rtc_base/thread_annotations.h" diff --git a/call/call_factory.h b/call/call_factory.h index 2426caae47..469bec39e1 100644 --- a/call/call_factory.h +++ b/call/call_factory.h @@ -12,9 +12,9 @@ #define CALL_CALL_FACTORY_H_ #include "api/call/call_factory_interface.h" +#include "api/sequence_checker.h" #include "call/call.h" #include "call/call_config.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" namespace webrtc { diff --git a/call/rtp_stream_receiver_controller.h b/call/rtp_stream_receiver_controller.h index 261156116a..284c9fa12f 100644 --- a/call/rtp_stream_receiver_controller.h +++ b/call/rtp_stream_receiver_controller.h @@ -12,9 +12,9 @@ #include +#include "api/sequence_checker.h" #include "call/rtp_demuxer.h" #include "call/rtp_stream_receiver_controller_interface.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/call/rtp_video_sender.h b/call/rtp_video_sender.h index 0cf3f016d8..cf71f1eff6 100644 --- a/call/rtp_video_sender.h +++ b/call/rtp_video_sender.h @@ -22,6 +22,7 @@ #include "api/fec_controller.h" #include "api/fec_controller_override.h" #include "api/rtc_event_log/rtc_event_log.h" +#include "api/sequence_checker.h" #include "api/transport/field_trial_based_config.h" #include "api/video_codecs/video_encoder.h" #include "call/rtp_config.h" @@ -38,7 +39,6 @@ #include "rtc_base/constructor_magic.h" #include "rtc_base/rate_limiter.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/call/simulated_network.h b/call/simulated_network.h index 1840430013..68d066cb82 100644 --- a/call/simulated_network.h +++ b/call/simulated_network.h @@ -17,13 +17,13 @@ #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "api/test/simulated_network.h" #include "api/units/data_size.h" #include "api/units/timestamp.h" #include "rtc_base/race_checker.h" #include "rtc_base/random.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn index 91f0f0b4ad..57c4158e7e 100644 --- a/common_video/BUILD.gn +++ b/common_video/BUILD.gn @@ -42,6 +42,7 @@ rtc_library("common_video") { deps = [ "../api:scoped_refptr", + "../api:sequence_checker", "../api/task_queue", "../api/units:time_delta", "../api/units:timestamp", diff --git a/common_video/include/incoming_video_stream.h b/common_video/include/incoming_video_stream.h index 08a21497b0..d616c5a2ec 100644 --- a/common_video/include/incoming_video_stream.h +++ b/common_video/include/incoming_video_stream.h @@ -13,12 +13,12 @@ #include +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_factory.h" #include "api/video/video_frame.h" #include "api/video/video_sink_interface.h" #include "common_video/video_render_frames.h" #include "rtc_base/race_checker.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread_annotations.h" diff --git a/examples/androidnativeapi/jni/android_call_client.h b/examples/androidnativeapi/jni/android_call_client.h index 8dc6f0a3af..c9153d09bd 100644 --- a/examples/androidnativeapi/jni/android_call_client.h +++ b/examples/androidnativeapi/jni/android_call_client.h @@ -18,8 +18,8 @@ #include "api/peer_connection_interface.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "sdk/android/native_api/jni/scoped_java_ref.h" #include "sdk/android/native_api/video/video_source.h" diff --git a/examples/objcnativeapi/objc/objc_call_client.h b/examples/objcnativeapi/objc/objc_call_client.h index 24b8243c1e..cb8501d9ce 100644 --- a/examples/objcnativeapi/objc/objc_call_client.h +++ b/examples/objcnativeapi/objc/objc_call_client.h @@ -18,8 +18,8 @@ #include "api/peer_connection_interface.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" @class RTC_OBJC_TYPE(RTCVideoCapturer); @protocol RTC_OBJC_TYPE diff --git a/logging/BUILD.gn b/logging/BUILD.gn index 13185c3476..25f275ae0e 100644 --- a/logging/BUILD.gn +++ b/logging/BUILD.gn @@ -261,13 +261,13 @@ if (rtc_enable_protobuf) { ":rtc_event_log_api", ":rtc_event_log_impl_encoder", "../api:libjingle_logging_api", + "../api:sequence_checker", "../api/rtc_event_log", "../api/task_queue", "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../rtc_base:rtc_task_queue", "../rtc_base:safe_minmax", - "../rtc_base/synchronization:sequence_checker", "../rtc_base/system:no_unique_address", ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] diff --git a/logging/rtc_event_log/rtc_event_log_impl.h b/logging/rtc_event_log/rtc_event_log_impl.h index bdbde612eb..0b6a71b24b 100644 --- a/logging/rtc_event_log/rtc_event_log_impl.h +++ b/logging/rtc_event_log/rtc_event_log_impl.h @@ -21,9 +21,9 @@ #include "api/rtc_event_log/rtc_event.h" #include "api/rtc_event_log/rtc_event_log.h" #include "api/rtc_event_log_output.h" +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_factory.h" #include "logging/rtc_event_log/encoder/rtc_event_log_encoder.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread_annotations.h" diff --git a/media/BUILD.gn b/media/BUILD.gn index d1689fcb18..8ac9f26f74 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -88,6 +88,7 @@ rtc_library("rtc_media_base") { "../api:rtc_error", "../api:rtp_parameters", "../api:scoped_refptr", + "../api:sequence_checker", "../api/audio:audio_frame_processor", "../api/audio_codecs:audio_codecs_api", "../api/crypto:frame_decryptor_interface", @@ -116,7 +117,6 @@ rtc_library("rtc_media_base") { "../rtc_base:socket", "../rtc_base:stringutils", "../rtc_base/synchronization:mutex", - "../rtc_base/synchronization:sequence_checker", "../rtc_base/system:file_wrapper", "../rtc_base/system:rtc_export", "../rtc_base/third_party/sigslot", @@ -183,6 +183,7 @@ rtc_library("rtc_simulcast_encoder_adapter") { ":rtc_media_base", "../api:fec_controller_api", "../api:scoped_refptr", + "../api:sequence_checker", "../api/video:video_codec_constants", "../api/video:video_frame", "../api/video:video_rtp_headers", @@ -195,7 +196,6 @@ rtc_library("rtc_simulcast_encoder_adapter") { "../rtc_base:rtc_base_approved", "../rtc_base/experiments:encoder_info_settings", "../rtc_base/experiments:rate_control_settings", - "../rtc_base/synchronization:sequence_checker", "../rtc_base/system:no_unique_address", "../rtc_base/system:rtc_export", "../system_wrappers", @@ -288,6 +288,7 @@ rtc_library("rtc_audio_video") { "../api:media_stream_interface", "../api:rtp_parameters", "../api:scoped_refptr", + "../api:sequence_checker", "../api:transport_api", "../api/audio:audio_frame_processor", "../api/audio:audio_mixer_api", @@ -411,6 +412,7 @@ rtc_library("rtc_data") { deps = [ ":rtc_media_base", "../api:call_api", + "../api:sequence_checker", "../api:transport_api", "../p2p:rtc_p2p", "../rtc_base", diff --git a/media/base/video_broadcaster.h b/media/base/video_broadcaster.h index ba298866fd..2f4e578224 100644 --- a/media/base/video_broadcaster.h +++ b/media/base/video_broadcaster.h @@ -12,11 +12,11 @@ #define MEDIA_BASE_VIDEO_BROADCASTER_H_ #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "api/video/video_frame_buffer.h" #include "api/video/video_source_interface.h" #include "media/base/video_source_base.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread_annotations.h" namespace rtc { diff --git a/media/base/video_source_base.h b/media/base/video_source_base.h index c61e2988b3..59b7dab164 100644 --- a/media/base/video_source_base.h +++ b/media/base/video_source_base.h @@ -13,10 +13,10 @@ #include +#include "api/sequence_checker.h" #include "api/video/video_frame.h" #include "api/video/video_sink_interface.h" #include "api/video/video_source_interface.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace rtc { diff --git a/media/engine/simulcast_encoder_adapter.h b/media/engine/simulcast_encoder_adapter.h index c65256ce62..2cb29edfd6 100644 --- a/media/engine/simulcast_encoder_adapter.h +++ b/media/engine/simulcast_encoder_adapter.h @@ -21,6 +21,7 @@ #include "absl/types/optional.h" #include "api/fec_controller_override.h" +#include "api/sequence_checker.h" #include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_encoder.h" #include "api/video_codecs/video_encoder_factory.h" @@ -28,7 +29,6 @@ #include "modules/video_coding/utility/framerate_controller.h" #include "rtc_base/atomic_ops.h" #include "rtc_base/experiments/encoder_info_settings.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/system/rtc_export.h" diff --git a/media/engine/webrtc_video_engine.h b/media/engine/webrtc_video_engine.h index b6ef2bff51..c4b5921ad7 100644 --- a/media/engine/webrtc_video_engine.h +++ b/media/engine/webrtc_video_engine.h @@ -19,6 +19,7 @@ #include "absl/types/optional.h" #include "api/call/transport.h" +#include "api/sequence_checker.h" #include "api/transport/field_trial_based_config.h" #include "api/video/video_bitrate_allocator_factory.h" #include "api/video/video_frame.h" @@ -34,7 +35,6 @@ #include "media/engine/unhandled_packets_buffer.h" #include "rtc_base/network_route.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_utils/pending_task_safety_flag.h" #include "rtc_base/thread_annotations.h" diff --git a/media/engine/webrtc_voice_engine.h b/media/engine/webrtc_voice_engine.h index 205adf665f..f7f1bfcb03 100644 --- a/media/engine/webrtc_voice_engine.h +++ b/media/engine/webrtc_voice_engine.h @@ -18,6 +18,7 @@ #include "api/audio_codecs/audio_encoder_factory.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_factory.h" #include "api/transport/rtp/rtp_source.h" #include "api/transport/webrtc_key_value_config.h" @@ -28,7 +29,6 @@ #include "modules/async_audio_processing/async_audio_processing.h" #include "rtc_base/buffer.h" #include "rtc_base/network_route.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_queue.h" #include "rtc_base/task_utils/pending_task_safety_flag.h" diff --git a/media/sctp/sctp_transport.cc b/media/sctp/sctp_transport.cc index 13d5680c01..0f11c2e04d 100644 --- a/media/sctp/sctp_transport.cc +++ b/media/sctp/sctp_transport.cc @@ -34,6 +34,7 @@ constexpr int kSctpSuccessReturn = 1; #include "absl/algorithm/container.h" #include "absl/base/attributes.h" #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "media/base/codec.h" #include "media/base/media_channel.h" #include "media/base/media_constants.h" @@ -47,7 +48,6 @@ constexpr int kSctpSuccessReturn = 1; #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/string_utils.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_utils/to_queued_task.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/trace_event.h" diff --git a/modules/async_audio_processing/BUILD.gn b/modules/async_audio_processing/BUILD.gn index 6a2a95ecf3..9330b67f92 100644 --- a/modules/async_audio_processing/BUILD.gn +++ b/modules/async_audio_processing/BUILD.gn @@ -18,13 +18,13 @@ rtc_library("async_audio_processing") { deps = [ "../../api:scoped_refptr", + "../../api:sequence_checker", "../../api/audio:audio_frame_api", "../../api/audio:audio_frame_processor", "../../api/task_queue:task_queue", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_task_queue", - "../../rtc_base/synchronization:sequence_checker", ] } diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn index 17bbe89cfc..05f883948d 100644 --- a/modules/audio_device/BUILD.gn +++ b/modules/audio_device/BUILD.gn @@ -68,6 +68,7 @@ rtc_library("audio_device_buffer") { deps = [ ":audio_device_api", "../../api:array_view", + "../../api:sequence_checker", "../../api/task_queue", "../../common_audio:common_audio_c", "../../rtc_base:checks", @@ -164,6 +165,7 @@ rtc_library("audio_device_impl") { "../../api:array_view", "../../api:refcountedbase", "../../api:scoped_refptr", + "../../api:sequence_checker", "../../api/task_queue", "../../common_audio", "../../common_audio:common_audio_c", @@ -382,6 +384,7 @@ if (rtc_include_tests && !build_with_chromium) { ":mock_audio_device", "../../api:array_view", "../../api:scoped_refptr", + "../../api:sequence_checker", "../../api/task_queue", "../../api/task_queue:default_task_queue_factory", "../../common_audio", diff --git a/modules/audio_device/android/aaudio_player.h b/modules/audio_device/android/aaudio_player.h index 18bde3ca6c..9e9182aed8 100644 --- a/modules/audio_device/android/aaudio_player.h +++ b/modules/audio_device/android/aaudio_player.h @@ -15,10 +15,10 @@ #include +#include "api/sequence_checker.h" #include "modules/audio_device/android/aaudio_wrapper.h" #include "modules/audio_device/include/audio_device_defines.h" #include "rtc_base/message_handler.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/audio_device/android/aaudio_recorder.h b/modules/audio_device/android/aaudio_recorder.h index 6ab37557e1..bbf2cacf9b 100644 --- a/modules/audio_device/android/aaudio_recorder.h +++ b/modules/audio_device/android/aaudio_recorder.h @@ -15,10 +15,10 @@ #include +#include "api/sequence_checker.h" #include "modules/audio_device/android/aaudio_wrapper.h" #include "modules/audio_device/include/audio_device_defines.h" #include "rtc_base/message_handler.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" namespace webrtc { diff --git a/modules/audio_device/android/aaudio_wrapper.h b/modules/audio_device/android/aaudio_wrapper.h index 08c352f162..1f925b96d3 100644 --- a/modules/audio_device/android/aaudio_wrapper.h +++ b/modules/audio_device/android/aaudio_wrapper.h @@ -13,8 +13,8 @@ #include +#include "api/sequence_checker.h" #include "modules/audio_device/include/audio_device_defines.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/modules/audio_device/android/audio_device_template.h b/modules/audio_device/android/audio_device_template.h index 04cfc7f875..3ea248f79e 100644 --- a/modules/audio_device/android/audio_device_template.h +++ b/modules/audio_device/android/audio_device_template.h @@ -11,11 +11,11 @@ #ifndef MODULES_AUDIO_DEVICE_ANDROID_AUDIO_DEVICE_TEMPLATE_H_ #define MODULES_AUDIO_DEVICE_ANDROID_AUDIO_DEVICE_TEMPLATE_H_ +#include "api/sequence_checker.h" #include "modules/audio_device/android/audio_manager.h" #include "modules/audio_device/audio_device_generic.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/modules/audio_device/android/audio_manager.h b/modules/audio_device/android/audio_manager.h index 03b6c77069..900fc78a68 100644 --- a/modules/audio_device/android/audio_manager.h +++ b/modules/audio_device/android/audio_manager.h @@ -16,6 +16,7 @@ #include +#include "api/sequence_checker.h" #include "modules/audio_device/android/audio_common.h" #include "modules/audio_device/android/opensles_common.h" #include "modules/audio_device/audio_device_config.h" @@ -23,7 +24,6 @@ #include "modules/audio_device/include/audio_device_defines.h" #include "modules/utility/include/helpers_android.h" #include "modules/utility/include/jvm_android.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/modules/audio_device/android/audio_record_jni.h b/modules/audio_device/android/audio_record_jni.h index b4d93d20e2..c445360d6c 100644 --- a/modules/audio_device/android/audio_record_jni.h +++ b/modules/audio_device/android/audio_record_jni.h @@ -15,12 +15,12 @@ #include +#include "api/sequence_checker.h" #include "modules/audio_device/android/audio_manager.h" #include "modules/audio_device/audio_device_generic.h" #include "modules/audio_device/include/audio_device_defines.h" #include "modules/utility/include/helpers_android.h" #include "modules/utility/include/jvm_android.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/modules/audio_device/android/audio_track_jni.h b/modules/audio_device/android/audio_track_jni.h index b1f503558c..62bcba42b0 100644 --- a/modules/audio_device/android/audio_track_jni.h +++ b/modules/audio_device/android/audio_track_jni.h @@ -15,13 +15,13 @@ #include +#include "api/sequence_checker.h" #include "modules/audio_device/android/audio_common.h" #include "modules/audio_device/android/audio_manager.h" #include "modules/audio_device/audio_device_generic.h" #include "modules/audio_device/include/audio_device_defines.h" #include "modules/utility/include/helpers_android.h" #include "modules/utility/include/jvm_android.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/modules/audio_device/android/opensles_player.h b/modules/audio_device/android/opensles_player.h index da2e9ae148..78af29b6b6 100644 --- a/modules/audio_device/android/opensles_player.h +++ b/modules/audio_device/android/opensles_player.h @@ -15,13 +15,13 @@ #include #include +#include "api/sequence_checker.h" #include "modules/audio_device/android/audio_common.h" #include "modules/audio_device/android/audio_manager.h" #include "modules/audio_device/android/opensles_common.h" #include "modules/audio_device/audio_device_generic.h" #include "modules/audio_device/include/audio_device_defines.h" #include "modules/utility/include/helpers_android.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/modules/audio_device/android/opensles_recorder.h b/modules/audio_device/android/opensles_recorder.h index 468d26c1b5..5f975d7242 100644 --- a/modules/audio_device/android/opensles_recorder.h +++ b/modules/audio_device/android/opensles_recorder.h @@ -17,13 +17,13 @@ #include +#include "api/sequence_checker.h" #include "modules/audio_device/android/audio_common.h" #include "modules/audio_device/android/audio_manager.h" #include "modules/audio_device/android/opensles_common.h" #include "modules/audio_device/audio_device_generic.h" #include "modules/audio_device/include/audio_device_defines.h" #include "modules/utility/include/helpers_android.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/modules/audio_device/audio_device_buffer.h b/modules/audio_device/audio_device_buffer.h index 0f24459aa4..a0b7953194 100644 --- a/modules/audio_device/audio_device_buffer.h +++ b/modules/audio_device/audio_device_buffer.h @@ -16,11 +16,11 @@ #include +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_factory.h" #include "modules/audio_device/include/audio_device_defines.h" #include "rtc_base/buffer.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/audio_device/audio_device_unittest.cc b/modules/audio_device/audio_device_unittest.cc index b3eccb168c..b0af9521c6 100644 --- a/modules/audio_device/audio_device_unittest.cc +++ b/modules/audio_device/audio_device_unittest.cc @@ -19,6 +19,7 @@ #include "absl/types/optional.h" #include "api/array_view.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "api/task_queue/default_task_queue_factory.h" #include "api/task_queue/task_queue_factory.h" #include "modules/audio_device/audio_device_impl.h" @@ -30,7 +31,6 @@ #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/race_checker.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/time_utils.h" #include "test/gmock.h" diff --git a/modules/audio_device/linux/audio_device_pulse_linux.h b/modules/audio_device/linux/audio_device_pulse_linux.h index e4f38ddba7..cfad6b1c15 100644 --- a/modules/audio_device/linux/audio_device_pulse_linux.h +++ b/modules/audio_device/linux/audio_device_pulse_linux.h @@ -13,6 +13,7 @@ #include +#include "api/sequence_checker.h" #include "modules/audio_device/audio_device_buffer.h" #include "modules/audio_device/audio_device_generic.h" #include "modules/audio_device/include/audio_device.h" @@ -22,7 +23,6 @@ #include "rtc_base/event.h" #include "rtc_base/platform_thread.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread_annotations.h" #if defined(WEBRTC_USE_X11) diff --git a/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h b/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h index 88ff446e6b..546440c4a6 100644 --- a/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h +++ b/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/synchronization/sequence_checker.h" +#include "api/sequence_checker.h" #ifndef UINT32_MAX #define UINT32_MAX ((uint32_t)-1) diff --git a/modules/audio_device/win/audio_device_module_win.cc b/modules/audio_device/win/audio_device_module_win.cc index 62278fe867..9c10e71e47 100644 --- a/modules/audio_device/win/audio_device_module_win.cc +++ b/modules/audio_device/win/audio_device_module_win.cc @@ -13,13 +13,13 @@ #include #include +#include "api/sequence_checker.h" #include "modules/audio_device/audio_device_buffer.h" #include "modules/audio_device/include/audio_device.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/ref_counted_object.h" #include "rtc_base/string_utils.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { namespace webrtc_win { diff --git a/modules/audio_device/win/core_audio_base_win.h b/modules/audio_device/win/core_audio_base_win.h index e4a41be0ef..2a57636640 100644 --- a/modules/audio_device/win/core_audio_base_win.h +++ b/modules/audio_device/win/core_audio_base_win.h @@ -17,9 +17,9 @@ #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "modules/audio_device/win/core_audio_utility_win.h" #include "rtc_base/platform_thread.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/modules/congestion_controller/rtp/BUILD.gn b/modules/congestion_controller/rtp/BUILD.gn index a030976a96..1a70447307 100644 --- a/modules/congestion_controller/rtp/BUILD.gn +++ b/modules/congestion_controller/rtp/BUILD.gn @@ -24,13 +24,13 @@ rtc_library("control_handler") { ] deps = [ + "../../../api:sequence_checker", "../../../api/transport:network_control", "../../../api/units:data_rate", "../../../api/units:data_size", "../../../api/units:time_delta", "../../../rtc_base:checks", "../../../rtc_base:safe_minmax", - "../../../rtc_base/synchronization:sequence_checker", "../../../rtc_base/system:no_unique_address", "../../../system_wrappers:field_trial", "../../pacing", @@ -52,6 +52,7 @@ rtc_library("transport_feedback") { deps = [ "../..:module_api_public", + "../../../api:sequence_checker", "../../../api/transport:network_control", "../../../api/units:data_size", "../../../api/units:timestamp", diff --git a/modules/congestion_controller/rtp/control_handler.h b/modules/congestion_controller/rtp/control_handler.h index e3450f3eb1..1da6463219 100644 --- a/modules/congestion_controller/rtp/control_handler.h +++ b/modules/congestion_controller/rtp/control_handler.h @@ -14,12 +14,12 @@ #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "api/transport/network_types.h" #include "api/units/data_size.h" #include "api/units/time_delta.h" #include "modules/pacing/paced_sender.h" #include "rtc_base/constructor_magic.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" namespace webrtc { diff --git a/modules/congestion_controller/rtp/transport_feedback_adapter.h b/modules/congestion_controller/rtp/transport_feedback_adapter.h index 21cd5b7f01..deb7925d77 100644 --- a/modules/congestion_controller/rtp/transport_feedback_adapter.h +++ b/modules/congestion_controller/rtp/transport_feedback_adapter.h @@ -16,12 +16,12 @@ #include #include +#include "api/sequence_checker.h" #include "api/transport/network_types.h" #include "modules/include/module_common_types_public.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "rtc_base/network/sent_packet.h" #include "rtc_base/network_route.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn index e8b4ba8b08..0751441279 100644 --- a/modules/desktop_capture/BUILD.gn +++ b/modules/desktop_capture/BUILD.gn @@ -454,6 +454,7 @@ rtc_library("desktop_capture_generic") { "../../api:function_view", "../../api:refcountedbase", "../../api:scoped_refptr", + "../../api:sequence_checker", "../../rtc_base", # TODO(kjellander): Cleanup in bugs.webrtc.org/3806. "../../rtc_base:checks", "../../rtc_base/synchronization:mutex", diff --git a/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc b/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc index e93ed5a2d5..0b1ab7ed37 100644 --- a/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc +++ b/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc @@ -14,8 +14,8 @@ #include +#include "api/sequence_checker.h" #include "rtc_base/checks.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/desktop_capture/mac/desktop_frame_provider.h b/modules/desktop_capture/mac/desktop_frame_provider.h index 115c63039a..f71959bda1 100644 --- a/modules/desktop_capture/mac/desktop_frame_provider.h +++ b/modules/desktop_capture/mac/desktop_frame_provider.h @@ -17,8 +17,8 @@ #include #include +#include "api/sequence_checker.h" #include "modules/desktop_capture/shared_desktop_frame.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "sdk/objc/helpers/scoped_cftyperef.h" namespace webrtc { diff --git a/modules/desktop_capture/mac/screen_capturer_mac.h b/modules/desktop_capture/mac/screen_capturer_mac.h index d2243272d1..68b8655b1c 100644 --- a/modules/desktop_capture/mac/screen_capturer_mac.h +++ b/modules/desktop_capture/mac/screen_capturer_mac.h @@ -16,6 +16,7 @@ #include #include +#include "api/sequence_checker.h" #include "modules/desktop_capture/desktop_capture_options.h" #include "modules/desktop_capture/desktop_capturer.h" #include "modules/desktop_capture/desktop_frame.h" @@ -27,7 +28,6 @@ #include "modules/desktop_capture/screen_capture_frame_queue.h" #include "modules/desktop_capture/screen_capturer_helper.h" #include "modules/desktop_capture/shared_desktop_frame.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/modules/desktop_capture/win/wgc_capture_session.h b/modules/desktop_capture/win/wgc_capture_session.h index 0a118a1642..9f08b7cf2d 100644 --- a/modules/desktop_capture/win/wgc_capture_session.h +++ b/modules/desktop_capture/win/wgc_capture_session.h @@ -14,11 +14,12 @@ #include #include #include + #include +#include "api/sequence_checker.h" #include "modules/desktop_capture/desktop_capture_options.h" #include "modules/desktop_capture/win/wgc_capture_source.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/modules/pacing/BUILD.gn b/modules/pacing/BUILD.gn index cabcd9300b..0787105f14 100644 --- a/modules/pacing/BUILD.gn +++ b/modules/pacing/BUILD.gn @@ -34,6 +34,7 @@ rtc_library("pacing") { ":interval_budget", "..:module_api", "../../api:function_view", + "../../api:sequence_checker", "../../api/rtc_event_log", "../../api/task_queue:task_queue", "../../api/transport:field_trial_based_config", @@ -50,7 +51,6 @@ rtc_library("pacing") { "../../rtc_base:rtc_task_queue", "../../rtc_base/experiments:field_trial_parser", "../../rtc_base/synchronization:mutex", - "../../rtc_base/synchronization:sequence_checker", "../../rtc_base/task_utils:to_queued_task", "../../system_wrappers", "../../system_wrappers:metrics", diff --git a/modules/pacing/task_queue_paced_sender.h b/modules/pacing/task_queue_paced_sender.h index ba4f4667b7..dc4c124ab7 100644 --- a/modules/pacing/task_queue_paced_sender.h +++ b/modules/pacing/task_queue_paced_sender.h @@ -20,6 +20,7 @@ #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_factory.h" #include "api/units/data_size.h" #include "api/units/time_delta.h" @@ -30,7 +31,6 @@ #include "modules/pacing/rtp_packet_pacer.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn index 26632b61d2..4233ef4081 100644 --- a/modules/rtp_rtcp/BUILD.gn +++ b/modules/rtp_rtcp/BUILD.gn @@ -255,6 +255,7 @@ rtc_library("rtp_rtcp") { "../../api:rtp_packet_info", "../../api:rtp_parameters", "../../api:scoped_refptr", + "../../api:sequence_checker", "../../api:transport_api", "../../api/audio_codecs:audio_codecs_api", "../../api/crypto:frame_encryptor_interface", @@ -292,7 +293,6 @@ rtc_library("rtp_rtcp") { "../../rtc_base:safe_minmax", "../../rtc_base/experiments:field_trial_parser", "../../rtc_base/synchronization:mutex", - "../../rtc_base/synchronization:sequence_checker", "../../rtc_base/system:no_unique_address", "../../rtc_base/task_utils:pending_task_safety_flag", "../../rtc_base/task_utils:repeating_task", diff --git a/modules/rtp_rtcp/include/flexfec_receiver.h b/modules/rtp_rtcp/include/flexfec_receiver.h index f9bac9c7fa..b0caea68ff 100644 --- a/modules/rtp_rtcp/include/flexfec_receiver.h +++ b/modules/rtp_rtcp/include/flexfec_receiver.h @@ -15,11 +15,11 @@ #include +#include "api/sequence_checker.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/include/ulpfec_receiver.h" #include "modules/rtp_rtcp/source/forward_error_correction.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h index 9431e75884..a4a7ff5fe7 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h @@ -21,6 +21,7 @@ #include "absl/types/optional.h" #include "api/rtp_headers.h" +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_base.h" #include "api/video/video_bitrate_allocation.h" #include "modules/include/module_fec_types.h" @@ -36,7 +37,6 @@ #include "modules/rtp_rtcp/source/rtp_sender_egress.h" #include "rtc_base/gtest_prod_util.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/task_utils/pending_task_safety_flag.h" #include "rtc_base/task_utils/repeating_task.h" diff --git a/modules/rtp_rtcp/source/rtp_sender_egress.h b/modules/rtp_rtcp/source/rtp_sender_egress.h index d7d71e2f1f..c767a1fe1b 100644 --- a/modules/rtp_rtcp/source/rtp_sender_egress.h +++ b/modules/rtp_rtcp/source/rtp_sender_egress.h @@ -19,6 +19,7 @@ #include "absl/types/optional.h" #include "api/call/transport.h" #include "api/rtc_event_log/rtc_event_log.h" +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_base.h" #include "api/units/data_rate.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" @@ -29,7 +30,6 @@ #include "modules/rtp_rtcp/source/rtp_sequence_number_map.h" #include "rtc_base/rate_statistics.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/task_utils/pending_task_safety_flag.h" #include "rtc_base/task_utils/repeating_task.h" diff --git a/modules/rtp_rtcp/source/rtp_sender_video.h b/modules/rtp_rtcp/source/rtp_sender_video.h index 6e469900d6..06f3d20014 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video.h +++ b/modules/rtp_rtcp/source/rtp_sender_video.h @@ -20,6 +20,7 @@ #include "api/array_view.h" #include "api/frame_transformer_interface.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_base.h" #include "api/transport/rtp/dependency_descriptor.h" #include "api/video/video_codec_type.h" @@ -37,7 +38,6 @@ #include "rtc_base/race_checker.h" #include "rtc_base/rate_statistics.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_impl.h b/modules/rtp_rtcp/source/ulpfec_receiver_impl.h index fc7fe387e7..f59251f848 100644 --- a/modules/rtp_rtcp/source/ulpfec_receiver_impl.h +++ b/modules/rtp_rtcp/source/ulpfec_receiver_impl.h @@ -17,12 +17,12 @@ #include #include +#include "api/sequence_checker.h" #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/include/ulpfec_receiver.h" #include "modules/rtp_rtcp/source/forward_error_correction.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" namespace webrtc { diff --git a/modules/utility/BUILD.gn b/modules/utility/BUILD.gn index df6945ab2c..aca7b1efdd 100644 --- a/modules/utility/BUILD.gn +++ b/modules/utility/BUILD.gn @@ -31,6 +31,7 @@ rtc_library("utility") { deps = [ "..:module_api", + "../../api:sequence_checker", "../../api/task_queue", "../../common_audio", "../../rtc_base:checks", diff --git a/modules/utility/include/jvm_android.h b/modules/utility/include/jvm_android.h index abffc8c8aa..693ee519ed 100644 --- a/modules/utility/include/jvm_android.h +++ b/modules/utility/include/jvm_android.h @@ -16,8 +16,8 @@ #include #include +#include "api/sequence_checker.h" #include "modules/utility/include/helpers_android.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/modules/utility/source/process_thread_impl.h b/modules/utility/source/process_thread_impl.h index e3c3ae7472..8412b52718 100644 --- a/modules/utility/source/process_thread_impl.h +++ b/modules/utility/source/process_thread_impl.h @@ -17,6 +17,7 @@ #include #include +#include "api/sequence_checker.h" #include "api/task_queue/queued_task.h" #include "modules/include/module.h" #include "modules/utility/include/process_thread.h" @@ -24,7 +25,6 @@ #include "rtc_base/event.h" #include "rtc_base/location.h" #include "rtc_base/platform_thread.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/modules/video_capture/windows/sink_filter_ds.h b/modules/video_capture/windows/sink_filter_ds.h index 03be05c36f..b0fabda3cd 100644 --- a/modules/video_capture/windows/sink_filter_ds.h +++ b/modules/video_capture/windows/sink_filter_ds.h @@ -17,9 +17,9 @@ #include #include +#include "api/sequence_checker.h" #include "modules/video_capture/video_capture_impl.h" #include "modules/video_capture/windows/help_functions_ds.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index 3378a8e083..a70adad8b8 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -81,6 +81,7 @@ rtc_library("nack_module") { deps = [ "..:module_api", + "../../api:sequence_checker", "../../api/units:time_delta", "../../api/units:timestamp", "../../rtc_base:checks", @@ -88,7 +89,6 @@ rtc_library("nack_module") { "../../rtc_base:rtc_numerics", "../../rtc_base:rtc_task_queue", "../../rtc_base/experiments:field_trial_parser", - "../../rtc_base/synchronization:sequence_checker", "../../rtc_base/task_utils:pending_task_safety_flag", "../../rtc_base/task_utils:repeating_task", "../../system_wrappers", @@ -168,6 +168,7 @@ rtc_library("video_coding") { "../../api:rtp_headers", "../../api:rtp_packet_info", "../../api:scoped_refptr", + "../../api:sequence_checker", "../../api/units:data_rate", "../../api/units:time_delta", "../../api/video:builtin_video_bitrate_allocator_factory", @@ -197,7 +198,6 @@ rtc_library("video_coding") { "../../rtc_base/experiments:rate_control_settings", "../../rtc_base/experiments:rtt_mult_experiment", "../../rtc_base/synchronization:mutex", - "../../rtc_base/synchronization:sequence_checker", "../../rtc_base/system:no_unique_address", "../../rtc_base/task_utils:repeating_task", "../../rtc_base/task_utils:to_queued_task", @@ -274,6 +274,7 @@ rtc_library("video_coding_legacy") { "..:module_api_public", "../../api:rtp_headers", "../../api:rtp_packet_info", + "../../api:sequence_checker", "../../api/video:encoded_image", "../../api/video:video_frame", "../../api/video:video_frame_type", @@ -286,7 +287,6 @@ rtc_library("video_coding_legacy") { "../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_event", "../../rtc_base/synchronization:mutex", - "../../rtc_base/synchronization:sequence_checker", "../../system_wrappers", "../rtp_rtcp:rtp_rtcp_format", "../rtp_rtcp:rtp_video_header", @@ -339,6 +339,7 @@ rtc_library("video_coding_utility") { deps = [ ":video_codec_interface", "../../api:scoped_refptr", + "../../api:sequence_checker", "../../api/video:encoded_frame", "../../api/video:encoded_image", "../../api/video:video_adaptation", @@ -357,7 +358,6 @@ rtc_library("video_coding_utility") { "../../rtc_base/experiments:quality_scaling_experiment", "../../rtc_base/experiments:rate_control_settings", "../../rtc_base/experiments:stable_target_rate_experiment", - "../../rtc_base/synchronization:sequence_checker", "../../rtc_base/system:arch", "../../rtc_base/system:file_wrapper", "../../rtc_base/system:no_unique_address", @@ -723,6 +723,7 @@ if (rtc_include_tests) { "../../api:create_frame_generator", "../../api:frame_generator_api", "../../api:scoped_refptr", + "../../api:sequence_checker", "../../api:videocodec_test_fixture_api", "../../api/task_queue", "../../api/video:builtin_video_bitrate_allocator_factory", @@ -738,7 +739,6 @@ if (rtc_include_tests) { "../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_task_queue", "../../rtc_base/synchronization:mutex", - "../../rtc_base/synchronization:sequence_checker", "../../rtc_base/system:no_unique_address", "../../rtc_base/task_utils:to_queued_task", "../../test:test_support", diff --git a/modules/video_coding/codecs/test/videoprocessor.h b/modules/video_coding/codecs/test/videoprocessor.h index 9fedc98e5c..15c9d78718 100644 --- a/modules/video_coding/codecs/test/videoprocessor.h +++ b/modules/video_coding/codecs/test/videoprocessor.h @@ -20,6 +20,7 @@ #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "api/task_queue/queued_task.h" #include "api/task_queue/task_queue_base.h" #include "api/test/videocodec_test_fixture.h" @@ -37,7 +38,6 @@ #include "rtc_base/buffer.h" #include "rtc_base/checks.h" #include "rtc_base/constructor_magic.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/thread_annotations.h" #include "test/testsupport/frame_reader.h" diff --git a/modules/video_coding/frame_buffer2.h b/modules/video_coding/frame_buffer2.h index 080ce7c10c..56e2c3ce0b 100644 --- a/modules/video_coding/frame_buffer2.h +++ b/modules/video_coding/frame_buffer2.h @@ -18,6 +18,7 @@ #include #include "absl/container/inlined_vector.h" +#include "api/sequence_checker.h" #include "api/video/encoded_frame.h" #include "modules/video_coding/include/video_coding_defines.h" #include "modules/video_coding/inter_frame_delay.h" @@ -27,7 +28,6 @@ #include "rtc_base/experiments/rtt_mult_experiment.h" #include "rtc_base/numerics/sequence_number_util.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/task_queue.h" #include "rtc_base/task_utils/repeating_task.h" diff --git a/modules/video_coding/generic_decoder.h b/modules/video_coding/generic_decoder.h index 8f416909aa..ea9f1149d9 100644 --- a/modules/video_coding/generic_decoder.h +++ b/modules/video_coding/generic_decoder.h @@ -14,6 +14,7 @@ #include #include +#include "api/sequence_checker.h" #include "api/units/time_delta.h" #include "modules/video_coding/encoded_frame.h" #include "modules/video_coding/include/video_codec_interface.h" @@ -21,7 +22,6 @@ #include "modules/video_coding/timing.h" #include "rtc_base/experiments/field_trial_parser.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/modules/video_coding/loss_notification_controller.h b/modules/video_coding/loss_notification_controller.h index 06e193b557..4d536ba4f9 100644 --- a/modules/video_coding/loss_notification_controller.h +++ b/modules/video_coding/loss_notification_controller.h @@ -17,8 +17,8 @@ #include "absl/types/optional.h" #include "api/array_view.h" +#include "api/sequence_checker.h" #include "modules/include/module_common_types.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" namespace webrtc { diff --git a/modules/video_coding/nack_module2.h b/modules/video_coding/nack_module2.h index 89dd082192..f58f886934 100644 --- a/modules/video_coding/nack_module2.h +++ b/modules/video_coding/nack_module2.h @@ -17,11 +17,11 @@ #include #include +#include "api/sequence_checker.h" #include "api/units/time_delta.h" #include "modules/include/module_common_types.h" #include "modules/video_coding/histogram.h" #include "rtc_base/numerics/sequence_number_util.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_queue.h" #include "rtc_base/task_utils/pending_task_safety_flag.h" #include "rtc_base/task_utils/repeating_task.h" diff --git a/modules/video_coding/utility/quality_scaler.h b/modules/video_coding/utility/quality_scaler.h index 987d49f1a8..20169a3cee 100644 --- a/modules/video_coding/utility/quality_scaler.h +++ b/modules/video_coding/utility/quality_scaler.h @@ -18,12 +18,12 @@ #include "absl/types/optional.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "api/video_codecs/video_encoder.h" #include "rtc_base/experiments/quality_scaling_experiment.h" #include "rtc_base/numerics/moving_average.h" #include "rtc_base/ref_count.h" #include "rtc_base/ref_counted_object.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/task_queue.h" diff --git a/modules/video_coding/video_coding_impl.cc b/modules/video_coding/video_coding_impl.cc index de29e2c9e7..f19ea51325 100644 --- a/modules/video_coding/video_coding_impl.cc +++ b/modules/video_coding/video_coding_impl.cc @@ -13,10 +13,10 @@ #include #include +#include "api/sequence_checker.h" #include "api/video/encoded_image.h" #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/timing.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/video_coding/video_coding_impl.h b/modules/video_coding/video_coding_impl.h index d8b0225e16..d74799460c 100644 --- a/modules/video_coding/video_coding_impl.h +++ b/modules/video_coding/video_coding_impl.h @@ -16,6 +16,7 @@ #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "modules/video_coding/decoder_database.h" #include "modules/video_coding/frame_buffer.h" #include "modules/video_coding/generic_decoder.h" @@ -25,7 +26,6 @@ #include "modules/video_coding/timing.h" #include "rtc_base/one_time_event.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/clock.h" diff --git a/modules/video_coding/video_receiver.cc b/modules/video_coding/video_receiver.cc index f1f70a16ac..74b04ac350 100644 --- a/modules/video_coding/video_receiver.cc +++ b/modules/video_coding/video_receiver.cc @@ -14,6 +14,7 @@ #include #include "api/rtp_headers.h" +#include "api/sequence_checker.h" #include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_decoder.h" #include "modules/utility/include/process_thread.h" @@ -33,7 +34,6 @@ #include "rtc_base/location.h" #include "rtc_base/logging.h" #include "rtc_base/one_time_event.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/clock.h" diff --git a/modules/video_coding/video_receiver2.h b/modules/video_coding/video_receiver2.h index 781ab22d23..6d354b1013 100644 --- a/modules/video_coding/video_receiver2.h +++ b/modules/video_coding/video_receiver2.h @@ -11,11 +11,11 @@ #ifndef MODULES_VIDEO_CODING_VIDEO_RECEIVER2_H_ #define MODULES_VIDEO_CODING_VIDEO_RECEIVER2_H_ +#include "api/sequence_checker.h" #include "modules/video_coding/decoder_database.h" #include "modules/video_coding/encoded_frame.h" #include "modules/video_coding/generic_decoder.h" #include "modules/video_coding/timing.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn index 35a163f410..070a30ee2c 100644 --- a/p2p/BUILD.gn +++ b/p2p/BUILD.gn @@ -110,7 +110,6 @@ rtc_library("rtc_p2p") { "../rtc_base:socket_server", "../rtc_base:threading", "../rtc_base/experiments:field_trial_parser", - "../rtc_base/synchronization:sequence_checker", "../rtc_base/system:no_unique_address", # Needed by pseudo_tcp, which should move to a separate target. @@ -183,6 +182,7 @@ if (rtc_include_tests) { ":rtc_p2p", "../api:libjingle_peerconnection_api", "../api:packet_socket_factory", + "../api:sequence_checker", "../api/crypto:options", "../api/transport:stun_types", "../rtc_base", @@ -277,6 +277,7 @@ rtc_library("p2p_server_utils") { deps = [ ":rtc_p2p", "../api:packet_socket_factory", + "../api:sequence_checker", "../api/transport:stun_types", "../rtc_base", "../rtc_base:checks", @@ -298,6 +299,7 @@ rtc_library("libstunprober") { deps = [ ":rtc_p2p", "../api:packet_socket_factory", + "../api:sequence_checker", "../api/transport:stun_types", "../rtc_base", "../rtc_base:async_resolver_interface", diff --git a/p2p/base/dtls_transport.h b/p2p/base/dtls_transport.h index 4822362342..bd5061c3c7 100644 --- a/p2p/base/dtls_transport.h +++ b/p2p/base/dtls_transport.h @@ -16,6 +16,7 @@ #include #include "api/crypto/crypto_options.h" +#include "api/sequence_checker.h" #include "p2p/base/dtls_transport_internal.h" #include "p2p/base/ice_transport_internal.h" #include "rtc_base/buffer.h" @@ -24,7 +25,6 @@ #include "rtc_base/ssl_stream_adapter.h" #include "rtc_base/stream.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" namespace rtc { diff --git a/p2p/base/test_turn_server.h b/p2p/base/test_turn_server.h index 8732426ccd..ecd934861b 100644 --- a/p2p/base/test_turn_server.h +++ b/p2p/base/test_turn_server.h @@ -14,13 +14,13 @@ #include #include +#include "api/sequence_checker.h" #include "api/transport/stun.h" #include "p2p/base/basic_packet_socket_factory.h" #include "p2p/base/turn_server.h" #include "rtc_base/async_udp_socket.h" #include "rtc_base/ssl_adapter.h" #include "rtc_base/ssl_identity.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" namespace cricket { diff --git a/p2p/base/turn_server.h b/p2p/base/turn_server.h index 600e778253..05916ea8bc 100644 --- a/p2p/base/turn_server.h +++ b/p2p/base/turn_server.h @@ -19,11 +19,11 @@ #include #include +#include "api/sequence_checker.h" #include "p2p/base/port_interface.h" #include "rtc_base/async_invoker.h" #include "rtc_base/async_packet_socket.h" #include "rtc_base/socket_address.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" diff --git a/p2p/stunprober/stun_prober.h b/p2p/stunprober/stun_prober.h index 60d3b7062c..0661a66349 100644 --- a/p2p/stunprober/stun_prober.h +++ b/p2p/stunprober/stun_prober.h @@ -15,6 +15,7 @@ #include #include +#include "api/sequence_checker.h" #include "rtc_base/async_invoker.h" #include "rtc_base/byte_buffer.h" #include "rtc_base/callback.h" @@ -22,7 +23,6 @@ #include "rtc_base/ip_address.h" #include "rtc_base/network.h" #include "rtc_base/socket_address.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/rtc_export.h" #include "rtc_base/thread.h" diff --git a/pc/BUILD.gn b/pc/BUILD.gn index 5b508db6c5..473bc85e3f 100644 --- a/pc/BUILD.gn +++ b/pc/BUILD.gn @@ -90,6 +90,7 @@ rtc_library("rtc_pc_base") { "../api:rtp_parameters", "../api:rtp_transceiver_direction", "../api:scoped_refptr", + "../api:sequence_checker", "../api/crypto:options", "../api/rtc_event_log", "../api/task_queue", @@ -124,7 +125,6 @@ rtc_library("rtc_pc_base") { "../rtc_base:threading", "../rtc_base/network:sent_packet", "../rtc_base/synchronization:mutex", - "../rtc_base/synchronization:sequence_checker", "../rtc_base/system:file_wrapper", "../rtc_base/system:rtc_export", "../rtc_base/task_utils:pending_task_safety_flag", @@ -255,6 +255,7 @@ rtc_library("peerconnection") { "../api:rtp_parameters", "../api:rtp_transceiver_direction", "../api:scoped_refptr", + "../api:sequence_checker", "../api/adaptation:resource_adaptation_api", "../api/audio_codecs:audio_codecs_api", "../api/crypto:frame_decryptor_interface", @@ -300,7 +301,6 @@ rtc_library("peerconnection") { "../rtc_base/experiments:field_trial_parser", "../rtc_base/network:sent_packet", "../rtc_base/synchronization:mutex", - "../rtc_base/synchronization:sequence_checker", "../rtc_base/system:file_wrapper", "../rtc_base/system:no_unique_address", "../rtc_base/system:rtc_export", @@ -331,6 +331,7 @@ rtc_library("connection_context") { "../api:libjingle_peerconnection_api", "../api:media_stream_interface", "../api:scoped_refptr", + "../api:sequence_checker", "../api/neteq:neteq_api", "../api/transport:field_trial_based_config", "../api/transport:sctp_transport_factory_interface", @@ -355,10 +356,10 @@ rtc_library("peer_connection_message_handler") { "../api:media_stream_interface", "../api:rtc_error", "../api:scoped_refptr", + "../api:sequence_checker", "../rtc_base", "../rtc_base:checks", "../rtc_base:threading", - "../rtc_base/synchronization:sequence_checker", ] } @@ -390,6 +391,7 @@ rtc_library("rtp_transceiver") { "../api:rtp_parameters", "../api:rtp_transceiver_direction", "../api:scoped_refptr", + "../api:sequence_checker", "../api/task_queue", "../media:rtc_media_base", "../rtc_base:checks", @@ -397,7 +399,6 @@ rtc_library("rtp_transceiver") { "../rtc_base:macromagic", "../rtc_base:refcount", "../rtc_base:threading", - "../rtc_base/synchronization:sequence_checker", "../rtc_base/third_party/sigslot", ] absl_deps = [ @@ -428,6 +429,7 @@ rtc_library("rtp_transmission_manager") { "../api:rtp_parameters", "../api:rtp_transceiver_direction", "../api:scoped_refptr", + "../api:sequence_checker", "../media:rtc_media_base", "../rtc_base", "../rtc_base:checks", @@ -504,6 +506,7 @@ rtc_library("audio_rtp_receiver") { "../api:media_stream_interface", "../api:rtp_parameters", "../api:scoped_refptr", + "../api:sequence_checker", "../api/crypto:frame_decryptor_interface", "../api/transport/rtp:rtp_source", "../media:rtc_media_base", @@ -537,6 +540,7 @@ rtc_library("video_rtp_receiver") { "../api:media_stream_interface", "../api:rtp_parameters", "../api:scoped_refptr", + "../api:sequence_checker", "../api/crypto:frame_decryptor_interface", "../api/transport/rtp:rtp_source", "../api/video:recordable_encoded_frame", @@ -561,6 +565,7 @@ rtc_library("video_rtp_track_source") { ] deps = [ ":video_track_source", + "../api:sequence_checker", "../api/video:recordable_encoded_frame", "../api/video:video_frame", "../media:rtc_media_base", @@ -579,9 +584,9 @@ rtc_library("audio_track") { deps = [ "../api:media_stream_interface", "../api:scoped_refptr", + "../api:sequence_checker", "../rtc_base:checks", "../rtc_base:refcount", - "../rtc_base/synchronization:sequence_checker", ] } @@ -593,6 +598,7 @@ rtc_library("video_track") { deps = [ "../api:media_stream_interface", "../api:scoped_refptr", + "../api:sequence_checker", "../api/video:video_frame", "../media:rtc_media_base", "../rtc_base", @@ -640,6 +646,7 @@ rtc_library("jitter_buffer_delay") { ] deps = [ ":jitter_buffer_delay_interface", + "../api:sequence_checker", "../media:rtc_media_base", "../rtc_base", "../rtc_base:checks", @@ -664,6 +671,7 @@ rtc_library("remote_audio_source") { "../api:call_api", "../api:media_stream_interface", "../api:scoped_refptr", + "../api:sequence_checker", "../media:rtc_media_base", "../rtc_base", "../rtc_base:checks", @@ -781,6 +789,7 @@ rtc_library("video_track_source") { ] deps = [ "../api:media_stream_interface", + "../api:sequence_checker", "../api/video:recordable_encoded_frame", "../api/video:video_frame", "../media:rtc_media_base", @@ -994,6 +1003,7 @@ if (rtc_include_tests && !build_with_chromium) { "../api:rtc_error", "../api:rtc_stats_api", "../api:scoped_refptr", + "../api:sequence_checker", "../api/audio:audio_mixer_api", "../api/audio_codecs:audio_codecs_api", "../api/task_queue", @@ -1023,7 +1033,6 @@ if (rtc_include_tests && !build_with_chromium) { "../rtc_base:task_queue_for_test", "../rtc_base:threading", "../rtc_base/synchronization:mutex", - "../rtc_base/synchronization:sequence_checker", "../rtc_base/task_utils:repeating_task", "../rtc_base/third_party/sigslot", "../test:test_support", diff --git a/pc/audio_rtp_receiver.cc b/pc/audio_rtp_receiver.cc index 37a6fc60b3..e8fad28d10 100644 --- a/pc/audio_rtp_receiver.cc +++ b/pc/audio_rtp_receiver.cc @@ -16,13 +16,13 @@ #include #include "api/media_stream_track_proxy.h" +#include "api/sequence_checker.h" #include "pc/audio_track.h" #include "pc/jitter_buffer_delay.h" #include "pc/jitter_buffer_delay_proxy.h" #include "rtc_base/checks.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/pc/audio_track.h b/pc/audio_track.h index 26b4769623..07511a5c94 100644 --- a/pc/audio_track.h +++ b/pc/audio_track.h @@ -16,7 +16,7 @@ #include "api/media_stream_interface.h" #include "api/media_stream_track.h" #include "api/scoped_refptr.h" -#include "rtc_base/synchronization/sequence_checker.h" +#include "api/sequence_checker.h" namespace webrtc { diff --git a/pc/channel.cc b/pc/channel.cc index 7a3c2bbb6d..1408c4c520 100644 --- a/pc/channel.cc +++ b/pc/channel.cc @@ -19,6 +19,7 @@ #include "absl/algorithm/container.h" #include "absl/strings/string_view.h" #include "api/rtp_parameters.h" +#include "api/sequence_checker.h" #include "api/task_queue/queued_task.h" #include "media/base/codec.h" #include "media/base/rid_description.h" @@ -31,7 +32,6 @@ #include "rtc_base/network_route.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_utils/pending_task_safety_flag.h" #include "rtc_base/task_utils/to_queued_task.h" #include "rtc_base/trace_event.h" diff --git a/pc/channel.h b/pc/channel.h index 30fa6393d9..b418188efc 100644 --- a/pc/channel.h +++ b/pc/channel.h @@ -30,6 +30,7 @@ #include "api/rtp_receiver_interface.h" #include "api/rtp_transceiver_direction.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "api/video/video_sink_interface.h" #include "api/video/video_source_interface.h" #include "call/rtp_demuxer.h" @@ -59,7 +60,6 @@ #include "rtc_base/network_route.h" #include "rtc_base/socket.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_utils/pending_task_safety_flag.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" diff --git a/pc/channel_manager.cc b/pc/channel_manager.cc index 256932b713..2671c10411 100644 --- a/pc/channel_manager.cc +++ b/pc/channel_manager.cc @@ -16,11 +16,11 @@ #include "absl/algorithm/container.h" #include "absl/memory/memory.h" #include "absl/strings/match.h" +#include "api/sequence_checker.h" #include "media/base/media_constants.h" #include "rtc_base/checks.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/trace_event.h" namespace cricket { diff --git a/pc/connection_context.h b/pc/connection_context.h index 02d08a191e..af04ae29a4 100644 --- a/pc/connection_context.h +++ b/pc/connection_context.h @@ -18,6 +18,7 @@ #include "api/media_stream_interface.h" #include "api/peer_connection_interface.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "api/transport/sctp_transport_factory_interface.h" #include "api/transport/webrtc_key_value_config.h" #include "media/base/media_engine.h" @@ -29,7 +30,6 @@ #include "rtc_base/network_monitor_factory.h" #include "rtc_base/ref_count.h" #include "rtc_base/rtc_certificate_generator.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" diff --git a/pc/data_channel_controller.h b/pc/data_channel_controller.h index ad24349e43..40f4e4c989 100644 --- a/pc/data_channel_controller.h +++ b/pc/data_channel_controller.h @@ -20,6 +20,7 @@ #include "api/data_channel_interface.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "api/transport/data_channel_transport_interface.h" #include "media/base/media_channel.h" #include "media/base/media_engine.h" @@ -32,7 +33,6 @@ #include "rtc_base/checks.h" #include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/ssl_stream_adapter.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" diff --git a/pc/dtls_transport.cc b/pc/dtls_transport.cc index a0547c8a14..a3ab58ffd5 100644 --- a/pc/dtls_transport.cc +++ b/pc/dtls_transport.cc @@ -13,12 +13,12 @@ #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "pc/ice_transport.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/ref_counted_object.h" #include "rtc_base/ssl_certificate.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/pc/ice_transport.cc b/pc/ice_transport.cc index d45534a5c2..205846755d 100644 --- a/pc/ice_transport.cc +++ b/pc/ice_transport.cc @@ -10,7 +10,7 @@ #include "pc/ice_transport.h" -#include "rtc_base/synchronization/sequence_checker.h" +#include "api/sequence_checker.h" namespace webrtc { diff --git a/pc/ice_transport.h b/pc/ice_transport.h index 6121b8d5b3..11f3de5d27 100644 --- a/pc/ice_transport.h +++ b/pc/ice_transport.h @@ -12,8 +12,8 @@ #define PC_ICE_TRANSPORT_H_ #include "api/ice_transport_interface.h" +#include "api/sequence_checker.h" #include "rtc_base/checks.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" diff --git a/pc/jitter_buffer_delay.cc b/pc/jitter_buffer_delay.cc index 8863584222..3fdf823d24 100644 --- a/pc/jitter_buffer_delay.cc +++ b/pc/jitter_buffer_delay.cc @@ -10,10 +10,10 @@ #include "pc/jitter_buffer_delay.h" +#include "api/sequence_checker.h" #include "rtc_base/checks.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/numerics/safe_minmax.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" namespace { diff --git a/pc/jsep_transport.h b/pc/jsep_transport.h index 5a6ef8a764..5e8cae0ecf 100644 --- a/pc/jsep_transport.h +++ b/pc/jsep_transport.h @@ -23,6 +23,7 @@ #include "api/jsep.h" #include "api/rtc_error.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "api/transport/data_channel_transport_interface.h" #include "media/sctp/sctp_transport_internal.h" #include "p2p/base/dtls_transport.h" @@ -46,7 +47,6 @@ #include "rtc_base/rtc_certificate.h" #include "rtc_base/ssl_fingerprint.h" #include "rtc_base/ssl_stream_adapter.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" diff --git a/pc/jsep_transport_controller.cc b/pc/jsep_transport_controller.cc index 0ded1de84f..a9f95c9032 100644 --- a/pc/jsep_transport_controller.cc +++ b/pc/jsep_transport_controller.cc @@ -18,6 +18,7 @@ #include "absl/algorithm/container.h" #include "api/rtp_parameters.h" +#include "api/sequence_checker.h" #include "api/transport/enums.h" #include "media/sctp/sctp_transport_internal.h" #include "p2p/base/dtls_transport.h" @@ -29,7 +30,6 @@ #include "rtc_base/logging.h" #include "rtc_base/net_helper.h" #include "rtc_base/socket_address.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" using webrtc::SdpType; diff --git a/pc/peer_connection.h b/pc/peer_connection.h index 92e33d2858..80259d4af3 100644 --- a/pc/peer_connection.h +++ b/pc/peer_connection.h @@ -12,6 +12,7 @@ #define PC_PEER_CONNECTION_H_ #include + #include #include #include @@ -43,6 +44,7 @@ #include "api/rtp_transceiver_interface.h" #include "api/scoped_refptr.h" #include "api/sctp_transport_interface.h" +#include "api/sequence_checker.h" #include "api/set_local_description_observer_interface.h" #include "api/set_remote_description_observer_interface.h" #include "api/stats/rtc_stats_collector_callback.h" @@ -91,7 +93,6 @@ #include "rtc_base/rtc_certificate.h" #include "rtc_base/ssl_certificate.h" #include "rtc_base/ssl_stream_adapter.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_utils/pending_task_safety_flag.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" diff --git a/pc/peer_connection_factory.cc b/pc/peer_connection_factory.cc index a8d64fa739..ee5c74f272 100644 --- a/pc/peer_connection_factory.cc +++ b/pc/peer_connection_factory.cc @@ -25,6 +25,7 @@ #include "api/peer_connection_factory_proxy.h" #include "api/peer_connection_proxy.h" #include "api/rtc_event_log/rtc_event_log.h" +#include "api/sequence_checker.h" #include "api/transport/bitrate_settings.h" #include "api/units/data_rate.h" #include "call/audio_state.h" @@ -47,7 +48,6 @@ #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/ref_counted_object.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/file_wrapper.h" namespace webrtc { diff --git a/pc/peer_connection_factory.h b/pc/peer_connection_factory.h index 80d259295e..cbc7397c3f 100644 --- a/pc/peer_connection_factory.h +++ b/pc/peer_connection_factory.h @@ -14,6 +14,7 @@ #include #include + #include #include @@ -30,6 +31,7 @@ #include "api/rtc_event_log/rtc_event_log_factory_interface.h" #include "api/rtp_parameters.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_factory.h" #include "api/transport/network_control.h" #include "api/transport/sctp_transport_factory_interface.h" @@ -41,7 +43,6 @@ #include "pc/connection_context.h" #include "rtc_base/checks.h" #include "rtc_base/rtc_certificate_generator.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" diff --git a/pc/peer_connection_message_handler.cc b/pc/peer_connection_message_handler.cc index ea9df5a87e..4b7913d678 100644 --- a/pc/peer_connection_message_handler.cc +++ b/pc/peer_connection_message_handler.cc @@ -16,11 +16,11 @@ #include "api/media_stream_interface.h" #include "api/peer_connection_interface.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "api/stats_types.h" #include "pc/stats_collector_interface.h" #include "rtc_base/checks.h" #include "rtc_base/location.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/pc/remote_audio_source.cc b/pc/remote_audio_source.cc index 50e9c551ee..3f53bb8148 100644 --- a/pc/remote_audio_source.cc +++ b/pc/remote_audio_source.cc @@ -16,11 +16,11 @@ #include "absl/algorithm/container.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "rtc_base/checks.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" #include "rtc_base/strings/string_format.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" namespace webrtc { diff --git a/pc/rtc_stats_collector.cc b/pc/rtc_stats_collector.cc index 040ee4d6bc..139b33ffe3 100644 --- a/pc/rtc_stats_collector.cc +++ b/pc/rtc_stats_collector.cc @@ -11,6 +11,7 @@ #include "pc/rtc_stats_collector.h" #include + #include #include #include @@ -25,6 +26,7 @@ #include "api/rtp_parameters.h" #include "api/rtp_receiver_interface.h" #include "api/rtp_sender_interface.h" +#include "api/sequence_checker.h" #include "api/stats/rtc_stats.h" #include "api/stats/rtcstats_objects.h" #include "api/task_queue/queued_task.h" @@ -55,7 +57,6 @@ #include "rtc_base/ssl_stream_adapter.h" #include "rtc_base/string_encode.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" diff --git a/pc/rtp_transceiver.cc b/pc/rtp_transceiver.cc index b1f53f18db..f8c5bd5ec8 100644 --- a/pc/rtp_transceiver.cc +++ b/pc/rtp_transceiver.cc @@ -17,6 +17,7 @@ #include "absl/algorithm/container.h" #include "api/rtp_parameters.h" +#include "api/sequence_checker.h" #include "media/base/codec.h" #include "media/base/media_constants.h" #include "pc/channel_manager.h" @@ -24,7 +25,6 @@ #include "pc/session_description.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" namespace webrtc { diff --git a/pc/rtp_transmission_manager.h b/pc/rtp_transmission_manager.h index 21f5a96788..fe0e3abdd3 100644 --- a/pc/rtp_transmission_manager.h +++ b/pc/rtp_transmission_manager.h @@ -12,6 +12,7 @@ #define PC_RTP_TRANSMISSION_MANAGER_H_ #include + #include #include #include @@ -24,6 +25,7 @@ #include "api/rtp_receiver_interface.h" #include "api/rtp_sender_interface.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "media/base/media_channel.h" #include "pc/channel_manager.h" #include "pc/rtp_receiver.h" @@ -32,7 +34,6 @@ #include "pc/stats_collector_interface.h" #include "pc/transceiver_list.h" #include "pc/usage_pattern.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" diff --git a/pc/sctp_transport.cc b/pc/sctp_transport.cc index bb579af9c1..ad8a9f2792 100644 --- a/pc/sctp_transport.cc +++ b/pc/sctp_transport.cc @@ -14,10 +14,10 @@ #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "rtc_base/checks.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/pc/sdp_offer_answer.h b/pc/sdp_offer_answer.h index 43a3dbb5a8..2d2a529175 100644 --- a/pc/sdp_offer_answer.h +++ b/pc/sdp_offer_answer.h @@ -13,6 +13,7 @@ #include #include + #include #include #include @@ -33,6 +34,7 @@ #include "api/rtp_transceiver_direction.h" #include "api/rtp_transceiver_interface.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "api/set_local_description_observer_interface.h" #include "api/set_remote_description_observer_interface.h" #include "api/transport/data_channel_transport_interface.h" @@ -69,7 +71,6 @@ #include "rtc_base/race_checker.h" #include "rtc_base/rtc_certificate.h" #include "rtc_base/ssl_stream_adapter.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" diff --git a/pc/srtp_filter.h b/pc/srtp_filter.h index a7ae97f28b..f1e164936c 100644 --- a/pc/srtp_filter.h +++ b/pc/srtp_filter.h @@ -24,11 +24,11 @@ #include "api/array_view.h" #include "api/crypto_params.h" #include "api/jsep.h" +#include "api/sequence_checker.h" #include "pc/session_description.h" #include "rtc_base/buffer.h" #include "rtc_base/constructor_magic.h" #include "rtc_base/ssl_stream_adapter.h" -#include "rtc_base/synchronization/sequence_checker.h" // Forward declaration to avoid pulling in libsrtp headers here struct srtp_event_data_t; diff --git a/pc/srtp_session.h b/pc/srtp_session.h index f2210cf182..9eede09bc7 100644 --- a/pc/srtp_session.h +++ b/pc/srtp_session.h @@ -14,9 +14,9 @@ #include #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "rtc_base/constructor_magic.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" // Forward declaration to avoid pulling in libsrtp headers here struct srtp_event_data_t; diff --git a/pc/stats_collector.cc b/pc/stats_collector.cc index 99ad1b3578..64ce2e0154 100644 --- a/pc/stats_collector.cc +++ b/pc/stats_collector.cc @@ -26,6 +26,7 @@ #include "api/rtp_receiver_interface.h" #include "api/rtp_sender_interface.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "api/video/video_content_type.h" #include "api/video/video_timing.h" #include "call/call.h" @@ -47,7 +48,6 @@ #include "rtc_base/socket_address.h" #include "rtc_base/ssl_stream_adapter.h" #include "rtc_base/string_encode.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" #include "rtc_base/time_utils.h" #include "system_wrappers/include/field_trial.h" diff --git a/pc/test/fake_audio_capture_module.h b/pc/test/fake_audio_capture_module.h index a125028d1c..d2db3d666d 100644 --- a/pc/test/fake_audio_capture_module.h +++ b/pc/test/fake_audio_capture_module.h @@ -26,11 +26,11 @@ #include #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "modules/audio_device/include/audio_device.h" #include "modules/audio_device/include/audio_device_defines.h" #include "rtc_base/message_handler.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_message.h" diff --git a/pc/test/peer_connection_test_wrapper.cc b/pc/test/peer_connection_test_wrapper.cc index f401ebbc7f..c3ffcb0893 100644 --- a/pc/test/peer_connection_test_wrapper.cc +++ b/pc/test/peer_connection_test_wrapper.cc @@ -20,6 +20,7 @@ #include "absl/types/optional.h" #include "api/audio/audio_mixer.h" #include "api/create_peerconnection_factory.h" +#include "api/sequence_checker.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" @@ -37,7 +38,6 @@ #include "rtc_base/ref_counted_object.h" #include "rtc_base/rtc_certificate_generator.h" #include "rtc_base/string_encode.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/time_utils.h" #include "test/gtest.h" diff --git a/pc/test/peer_connection_test_wrapper.h b/pc/test/peer_connection_test_wrapper.h index f345f54e0e..4abf6c9ea5 100644 --- a/pc/test/peer_connection_test_wrapper.h +++ b/pc/test/peer_connection_test_wrapper.h @@ -25,9 +25,9 @@ #include "api/rtc_error.h" #include "api/rtp_receiver_interface.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "pc/test/fake_audio_capture_module.h" #include "pc/test/fake_video_track_renderer.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" diff --git a/pc/video_rtp_receiver.h b/pc/video_rtp_receiver.h index 6cbd8a169a..8e36af6dfa 100644 --- a/pc/video_rtp_receiver.h +++ b/pc/video_rtp_receiver.h @@ -26,6 +26,7 @@ #include "api/rtp_parameters.h" #include "api/rtp_receiver_interface.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "api/transport/rtp/rtp_source.h" #include "api/video/video_frame.h" #include "api/video/video_sink_interface.h" @@ -36,7 +37,6 @@ #include "pc/video_rtp_track_source.h" #include "pc/video_track.h" #include "rtc_base/ref_counted_object.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" diff --git a/pc/video_rtp_track_source.h b/pc/video_rtp_track_source.h index 53cb046bf7..3d734e06f1 100644 --- a/pc/video_rtp_track_source.h +++ b/pc/video_rtp_track_source.h @@ -13,6 +13,7 @@ #include +#include "api/sequence_checker.h" #include "api/video/recordable_encoded_frame.h" #include "api/video/video_frame.h" #include "api/video/video_sink_interface.h" @@ -22,7 +23,6 @@ #include "rtc_base/callback.h" #include "rtc_base/constructor_magic.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/thread_annotations.h" diff --git a/pc/video_track.cc b/pc/video_track.cc index 279b153a74..d67d4f6cd2 100644 --- a/pc/video_track.cc +++ b/pc/video_track.cc @@ -14,10 +14,10 @@ #include #include "api/notifier.h" +#include "api/sequence_checker.h" #include "rtc_base/checks.h" #include "rtc_base/location.h" #include "rtc_base/ref_counted_object.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/pc/video_track.h b/pc/video_track.h index a2cf46fd0b..bff63fcb96 100644 --- a/pc/video_track.h +++ b/pc/video_track.h @@ -16,11 +16,11 @@ #include "api/media_stream_interface.h" #include "api/media_stream_track.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "api/video/video_frame.h" #include "api/video/video_sink_interface.h" #include "api/video/video_source_interface.h" #include "media/base/video_source_base.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" diff --git a/pc/video_track_source.h b/pc/video_track_source.h index 223c5dd669..4a29381c4c 100644 --- a/pc/video_track_source.h +++ b/pc/video_track_source.h @@ -14,12 +14,12 @@ #include "absl/types/optional.h" #include "api/media_stream_interface.h" #include "api/notifier.h" +#include "api/sequence_checker.h" #include "api/video/recordable_encoded_frame.h" #include "api/video/video_frame.h" #include "api/video/video_sink_interface.h" #include "api/video/video_source_interface.h" #include "media/base/media_channel.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 87894ea2d9..4e3fd9eba4 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -75,6 +75,7 @@ rtc_library("rtc_base_approved") { ":type_traits", "../api:array_view", "../api:scoped_refptr", + "../api:sequence_checker", "synchronization:mutex", "system:arch", "system:no_unique_address", @@ -169,7 +170,7 @@ rtc_library("rtc_base_approved") { ":safe_conversions", ":stringutils", ":timeutils", - "synchronization:sequence_checker", + "../api:sequence_checker", ] } @@ -222,8 +223,8 @@ rtc_library("platform_thread") { ":rtc_task_queue_libevent", ":rtc_task_queue_stdlib", ":rtc_task_queue_win", + "../api:sequence_checker", "synchronization:mutex", - "synchronization:sequence_checker", ] sources = [ "platform_thread.cc", @@ -236,7 +237,7 @@ rtc_library("platform_thread") { ":platform_thread_types", ":rtc_event", ":timeutils", - "synchronization:sequence_checker", + "../api:sequence_checker", ] absl_deps = [ "//third_party/abseil-cpp/absl/strings" ] } @@ -484,7 +485,7 @@ rtc_source_set("rtc_operations_chain") { ":macromagic", ":refcount", "../api:scoped_refptr", - "synchronization:sequence_checker", + "../api:sequence_checker", "system:no_unique_address", ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] @@ -588,7 +589,7 @@ rtc_library("weak_ptr") { deps = [ ":refcount", "../api:scoped_refptr", - "synchronization:sequence_checker", + "../api:sequence_checker", "system:no_unique_address", ] } @@ -798,6 +799,7 @@ rtc_library("threading") { ":timeutils", "../api:function_view", "../api:scoped_refptr", + "../api:sequence_checker", "../api/task_queue", "synchronization:mutex", "synchronization:sequence_checker", @@ -923,12 +925,12 @@ rtc_library("rtc_base") { "../api:array_view", "../api:function_view", "../api:scoped_refptr", + "../api:sequence_checker", "../api/numerics", "../api/task_queue", "../system_wrappers:field_trial", "network:sent_packet", "synchronization:mutex", - "synchronization:sequence_checker", "system:file_wrapper", "system:inline", "system:no_unique_address", diff --git a/rtc_base/async_resolver.h b/rtc_base/async_resolver.h index c05377aed6..c43685a4d8 100644 --- a/rtc_base/async_resolver.h +++ b/rtc_base/async_resolver.h @@ -20,10 +20,10 @@ #include #include +#include "api/sequence_checker.h" #include "rtc_base/async_resolver_interface.h" #include "rtc_base/ip_address.h" #include "rtc_base/socket_address.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/system/rtc_export.h" #include "rtc_base/task_utils/pending_task_safety_flag.h" diff --git a/rtc_base/buffer_queue.h b/rtc_base/buffer_queue.h index 5895530969..09c6c4f734 100644 --- a/rtc_base/buffer_queue.h +++ b/rtc_base/buffer_queue.h @@ -16,9 +16,9 @@ #include #include +#include "api/sequence_checker.h" #include "rtc_base/buffer.h" #include "rtc_base/constructor_magic.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/thread_annotations.h" diff --git a/rtc_base/event_tracer.cc b/rtc_base/event_tracer.cc index 8626589321..9e3ee6071c 100644 --- a/rtc_base/event_tracer.cc +++ b/rtc_base/event_tracer.cc @@ -17,6 +17,7 @@ #include #include +#include "api/sequence_checker.h" #include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" #include "rtc_base/event.h" @@ -24,7 +25,6 @@ #include "rtc_base/platform_thread.h" #include "rtc_base/platform_thread_types.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" diff --git a/rtc_base/network.h b/rtc_base/network.h index 3107b728d7..d2e3bc22a7 100644 --- a/rtc_base/network.h +++ b/rtc_base/network.h @@ -19,12 +19,12 @@ #include #include +#include "api/sequence_checker.h" #include "rtc_base/ip_address.h" #include "rtc_base/mdns_responder_interface.h" #include "rtc_base/message_handler.h" #include "rtc_base/network_monitor.h" #include "rtc_base/network_monitor_factory.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/rtc_export.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread_annotations.h" diff --git a/rtc_base/operations_chain.h b/rtc_base/operations_chain.h index a7252d46f0..3dc5995114 100644 --- a/rtc_base/operations_chain.h +++ b/rtc_base/operations_chain.h @@ -20,11 +20,11 @@ #include "absl/types/optional.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "rtc_base/checks.h" #include "rtc_base/constructor_magic.h" #include "rtc_base/ref_count.h" #include "rtc_base/ref_counted_object.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" namespace rtc { diff --git a/rtc_base/platform_thread.h b/rtc_base/platform_thread.h index 3438f8e617..64a74d8b27 100644 --- a/rtc_base/platform_thread.h +++ b/rtc_base/platform_thread.h @@ -17,9 +17,9 @@ #include #include "absl/strings/string_view.h" +#include "api/sequence_checker.h" #include "rtc_base/constructor_magic.h" #include "rtc_base/platform_thread_types.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace rtc { diff --git a/rtc_base/task_utils/BUILD.gn b/rtc_base/task_utils/BUILD.gn index e47ee7ea50..39e4ba1100 100644 --- a/rtc_base/task_utils/BUILD.gn +++ b/rtc_base/task_utils/BUILD.gn @@ -17,11 +17,11 @@ rtc_library("repeating_task") { ":to_queued_task", "..:logging", "..:timeutils", + "../../api:sequence_checker", "../../api/task_queue", "../../api/units:time_delta", "../../api/units:timestamp", "../../system_wrappers:system_wrappers", - "../synchronization:sequence_checker", ] absl_deps = [ "//third_party/abseil-cpp/absl/memory" ] } @@ -35,7 +35,7 @@ rtc_library("pending_task_safety_flag") { "..:checks", "..:refcount", "../../api:scoped_refptr", - "../synchronization:sequence_checker", + "../../api:sequence_checker", "../system:no_unique_address", ] } diff --git a/rtc_base/task_utils/pending_task_safety_flag.h b/rtc_base/task_utils/pending_task_safety_flag.h index 182db2cbbc..7e8a470a09 100644 --- a/rtc_base/task_utils/pending_task_safety_flag.h +++ b/rtc_base/task_utils/pending_task_safety_flag.h @@ -12,9 +12,9 @@ #define RTC_BASE_TASK_UTILS_PENDING_TASK_SAFETY_FLAG_H_ #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "rtc_base/checks.h" #include "rtc_base/ref_count.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" namespace webrtc { diff --git a/rtc_base/thread.cc b/rtc_base/thread.cc index 5a5c142c01..a047eeda0f 100644 --- a/rtc_base/thread.cc +++ b/rtc_base/thread.cc @@ -29,6 +29,7 @@ #include #include "absl/algorithm/container.h" +#include "api/sequence_checker.h" #include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" #include "rtc_base/deprecated/recursive_critical_section.h" @@ -36,7 +37,6 @@ #include "rtc_base/internal/default_socket_server.h" #include "rtc_base/logging.h" #include "rtc_base/null_socket_server.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_utils/to_queued_task.h" #include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" diff --git a/rtc_base/weak_ptr.h b/rtc_base/weak_ptr.h index 68d57fc557..a9e6b3a990 100644 --- a/rtc_base/weak_ptr.h +++ b/rtc_base/weak_ptr.h @@ -15,9 +15,9 @@ #include #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "rtc_base/ref_count.h" #include "rtc_base/ref_counted_object.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" // The implementation is borrowed from chromium except that it does not diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn index 95b5c90f9f..f7982d3eef 100644 --- a/rtc_tools/network_tester/BUILD.gn +++ b/rtc_tools/network_tester/BUILD.gn @@ -39,6 +39,7 @@ if (rtc_enable_protobuf) { deps = [ ":network_tester_config_proto", ":network_tester_packet_proto", + "../../api:sequence_checker", "../../api/task_queue", "../../api/task_queue:default_task_queue_factory", "../../p2p", @@ -52,7 +53,6 @@ if (rtc_enable_protobuf) { "../../rtc_base:socket_address", "../../rtc_base:threading", "../../rtc_base/synchronization:mutex", - "../../rtc_base/synchronization:sequence_checker", "../../rtc_base/system:no_unique_address", "../../rtc_base/third_party/sigslot", ] diff --git a/rtc_tools/network_tester/packet_sender.h b/rtc_tools/network_tester/packet_sender.h index c0ea2c1680..7ccecdd84c 100644 --- a/rtc_tools/network_tester/packet_sender.h +++ b/rtc_tools/network_tester/packet_sender.h @@ -14,10 +14,10 @@ #include #include +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_factory.h" #include "rtc_base/constructor_magic.h" #include "rtc_base/ignore_wundef.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/task_queue.h" diff --git a/rtc_tools/network_tester/test_controller.h b/rtc_tools/network_tester/test_controller.h index 20f580e8a4..50055fcf4c 100644 --- a/rtc_tools/network_tester/test_controller.h +++ b/rtc_tools/network_tester/test_controller.h @@ -19,13 +19,13 @@ #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "p2p/base/basic_packet_socket_factory.h" #include "rtc_base/async_packet_socket.h" #include "rtc_base/constructor_magic.h" #include "rtc_base/ignore_wundef.h" #include "rtc_base/socket_address.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread_annotations.h" #include "rtc_tools/network_tester/packet_logger.h" diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index e557ce4fef..f2602c27e1 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -1532,9 +1532,9 @@ if (is_ios || is_mac) { deps = [ ":network_monitor_objc", ":network_monitor_observer", + "../api:sequence_checker", "../rtc_base", "../rtc_base:threading", - "../rtc_base/synchronization:sequence_checker", ] } } diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index b7992e118c..4bf2a23d09 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -557,12 +557,12 @@ if (current_os == "linux" || is_android) { ":native_api_jni", "../../api:libjingle_peerconnection_api", "../../api:scoped_refptr", + "../../api:sequence_checker", "../../rtc_base", "../../rtc_base:checks", "../../rtc_base:ip_address", "../../rtc_base:rtc_base_approved", "../../rtc_base:threading", - "../../rtc_base/synchronization:sequence_checker", "../../system_wrappers:field_trial", "../../system_wrappers:metrics", ] diff --git a/sdk/android/native_api/jni/java_types.h b/sdk/android/native_api/jni/java_types.h index c12eff8a75..a1639d6478 100644 --- a/sdk/android/native_api/jni/java_types.h +++ b/sdk/android/native_api/jni/java_types.h @@ -26,8 +26,8 @@ #include "absl/types/optional.h" #include "api/array_view.h" +#include "api/sequence_checker.h" #include "rtc_base/checks.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "sdk/android/native_api/jni/scoped_java_ref.h" // Abort the process if |jni| has a Java exception pending. diff --git a/sdk/android/src/jni/android_network_monitor.cc b/sdk/android/src/jni/android_network_monitor.cc index 9ef79bcb69..1c8449a7a8 100644 --- a/sdk/android/src/jni/android_network_monitor.cc +++ b/sdk/android/src/jni/android_network_monitor.cc @@ -16,11 +16,11 @@ #define RTLD_NOLOAD 4 #endif +#include "api/sequence_checker.h" #include "rtc_base/checks.h" #include "rtc_base/ip_address.h" #include "rtc_base/logging.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "sdk/android/generated_base_jni/NetworkChangeDetector_jni.h" #include "sdk/android/generated_base_jni/NetworkMonitor_jni.h" #include "sdk/android/native_api/jni/java_types.h" diff --git a/sdk/android/src/jni/audio_device/aaudio_player.h b/sdk/android/src/jni/audio_device/aaudio_player.h index 0bfc0a9b32..5f9a9eace9 100644 --- a/sdk/android/src/jni/audio_device/aaudio_player.h +++ b/sdk/android/src/jni/audio_device/aaudio_player.h @@ -12,13 +12,14 @@ #define SDK_ANDROID_SRC_JNI_AUDIO_DEVICE_AAUDIO_PLAYER_H_ #include + #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "modules/audio_device/audio_device_buffer.h" #include "modules/audio_device/include/audio_device_defines.h" #include "rtc_base/message_handler.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" #include "sdk/android/src/jni/audio_device/aaudio_wrapper.h" diff --git a/sdk/android/src/jni/audio_device/aaudio_recorder.h b/sdk/android/src/jni/audio_device/aaudio_recorder.h index 2943c24029..2b6aa03127 100644 --- a/sdk/android/src/jni/audio_device/aaudio_recorder.h +++ b/sdk/android/src/jni/audio_device/aaudio_recorder.h @@ -12,12 +12,13 @@ #define SDK_ANDROID_SRC_JNI_AUDIO_DEVICE_AAUDIO_RECORDER_H_ #include + #include +#include "api/sequence_checker.h" #include "modules/audio_device/audio_device_buffer.h" #include "modules/audio_device/include/audio_device_defines.h" #include "rtc_base/message_handler.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" #include "sdk/android/src/jni/audio_device/aaudio_wrapper.h" #include "sdk/android/src/jni/audio_device/audio_device_module.h" diff --git a/sdk/android/src/jni/audio_device/aaudio_wrapper.h b/sdk/android/src/jni/audio_device/aaudio_wrapper.h index 593545cc8b..cbc78a0a25 100644 --- a/sdk/android/src/jni/audio_device/aaudio_wrapper.h +++ b/sdk/android/src/jni/audio_device/aaudio_wrapper.h @@ -13,8 +13,8 @@ #include +#include "api/sequence_checker.h" #include "modules/audio_device/include/audio_device_defines.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/sdk/android/src/jni/audio_device/audio_device_module.cc b/sdk/android/src/jni/audio_device/audio_device_module.cc index 9515d8d1df..74a0db00f9 100644 --- a/sdk/android/src/jni/audio_device/audio_device_module.cc +++ b/sdk/android/src/jni/audio_device/audio_device_module.cc @@ -13,13 +13,13 @@ #include #include +#include "api/sequence_checker.h" #include "api/task_queue/default_task_queue_factory.h" #include "api/task_queue/task_queue_factory.h" #include "modules/audio_device/audio_device_buffer.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/ref_counted_object.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "sdk/android/generated_audio_device_module_base_jni/WebRtcAudioManager_jni.h" #include "system_wrappers/include/metrics.h" diff --git a/sdk/android/src/jni/audio_device/audio_record_jni.h b/sdk/android/src/jni/audio_device/audio_record_jni.h index b8b258d9c6..800d235432 100644 --- a/sdk/android/src/jni/audio_device/audio_record_jni.h +++ b/sdk/android/src/jni/audio_device/audio_record_jni.h @@ -12,11 +12,12 @@ #define SDK_ANDROID_SRC_JNI_AUDIO_DEVICE_AUDIO_RECORD_JNI_H_ #include + #include +#include "api/sequence_checker.h" #include "modules/audio_device/audio_device_buffer.h" #include "modules/audio_device/include/audio_device_defines.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "sdk/android/src/jni/audio_device/audio_device_module.h" namespace webrtc { diff --git a/sdk/android/src/jni/audio_device/audio_track_jni.h b/sdk/android/src/jni/audio_device/audio_track_jni.h index 8ecee49268..cc4d8f53a0 100644 --- a/sdk/android/src/jni/audio_device/audio_track_jni.h +++ b/sdk/android/src/jni/audio_device/audio_track_jni.h @@ -12,12 +12,13 @@ #define SDK_ANDROID_SRC_JNI_AUDIO_DEVICE_AUDIO_TRACK_JNI_H_ #include + #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "modules/audio_device/audio_device_buffer.h" #include "modules/audio_device/include/audio_device_defines.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "sdk/android/src/jni/audio_device/audio_common.h" #include "sdk/android/src/jni/audio_device/audio_device_module.h" diff --git a/sdk/android/src/jni/audio_device/opensles_common.h b/sdk/android/src/jni/audio_device/opensles_common.h index 3303909338..d812b920ff 100644 --- a/sdk/android/src/jni/audio_device/opensles_common.h +++ b/sdk/android/src/jni/audio_device/opensles_common.h @@ -15,9 +15,9 @@ #include #include "api/ref_counted_base.h" +#include "api/sequence_checker.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/sdk/android/src/jni/audio_device/opensles_player.h b/sdk/android/src/jni/audio_device/opensles_player.h index 9b3c34d66a..7388a9370c 100644 --- a/sdk/android/src/jni/audio_device/opensles_player.h +++ b/sdk/android/src/jni/audio_device/opensles_player.h @@ -16,12 +16,13 @@ #include #include + #include "absl/types/optional.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "modules/audio_device/audio_device_buffer.h" #include "modules/audio_device/fine_audio_buffer.h" #include "modules/audio_device/include/audio_device_defines.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "sdk/android/src/jni/audio_device/audio_common.h" #include "sdk/android/src/jni/audio_device/audio_device_module.h" #include "sdk/android/src/jni/audio_device/opensles_common.h" diff --git a/sdk/android/src/jni/audio_device/opensles_recorder.h b/sdk/android/src/jni/audio_device/opensles_recorder.h index d5e269a189..ff324f3135 100644 --- a/sdk/android/src/jni/audio_device/opensles_recorder.h +++ b/sdk/android/src/jni/audio_device/opensles_recorder.h @@ -18,10 +18,10 @@ #include #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "modules/audio_device/audio_device_buffer.h" #include "modules/audio_device/fine_audio_buffer.h" #include "modules/audio_device/include/audio_device_defines.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "sdk/android/src/jni/audio_device/audio_common.h" #include "sdk/android/src/jni/audio_device/audio_device_module.h" #include "sdk/android/src/jni/audio_device/opensles_common.h" diff --git a/sdk/android/src/jni/video_decoder_wrapper.h b/sdk/android/src/jni/video_decoder_wrapper.h index af9fe2d05b..15f7ab9bf5 100644 --- a/sdk/android/src/jni/video_decoder_wrapper.h +++ b/sdk/android/src/jni/video_decoder_wrapper.h @@ -16,11 +16,11 @@ #include #include +#include "api/sequence_checker.h" #include "api/video_codecs/video_decoder.h" #include "common_video/h264/h264_bitstream_parser.h" #include "rtc_base/race_checker.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { diff --git a/sdk/objc/native/src/audio/audio_device_ios.h b/sdk/objc/native/src/audio/audio_device_ios.h index d50acee24d..e9e42ea1cc 100644 --- a/sdk/objc/native/src/audio/audio_device_ios.h +++ b/sdk/objc/native/src/audio/audio_device_ios.h @@ -13,10 +13,10 @@ #include +#include "api/sequence_checker.h" #include "audio_session_observer.h" #include "modules/audio_device/audio_device_generic.h" #include "rtc_base/buffer.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" #include "sdk/objc/base/RTCMacros.h" diff --git a/sdk/objc/native/src/objc_network_monitor.h b/sdk/objc/native/src/objc_network_monitor.h index 7fcb1c7fd0..221f912af2 100644 --- a/sdk/objc/native/src/objc_network_monitor.h +++ b/sdk/objc/native/src/objc_network_monitor.h @@ -13,15 +13,14 @@ #include -#include "sdk/objc/components/network/RTCNetworkMonitor+Private.h" -#include "sdk/objc/native/src/network_monitor_observer.h" - +#include "api/sequence_checker.h" #include "rtc_base/async_invoker.h" #include "rtc_base/network_monitor.h" #include "rtc_base/network_monitor_factory.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" +#include "sdk/objc/components/network/RTCNetworkMonitor+Private.h" +#include "sdk/objc/native/src/network_monitor_observer.h" namespace webrtc { diff --git a/test/BUILD.gn b/test/BUILD.gn index 9e2c2cf4be..e07ce6f10e 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -52,6 +52,7 @@ rtc_library("frame_generator_impl") { ":frame_utils", "../api:frame_generator_api", "../api:scoped_refptr", + "../api:sequence_checker", "../api/video:encoded_image", "../api/video:video_frame", "../api/video:video_frame_i010", @@ -71,7 +72,6 @@ rtc_library("frame_generator_impl") { "../rtc_base:rtc_base_approved", "../rtc_base:rtc_event", "../rtc_base/synchronization:mutex", - "../rtc_base/synchronization:sequence_checker", "../rtc_base/system:file_wrapper", "../system_wrappers", ] @@ -359,6 +359,7 @@ rtc_library("video_test_support") { ":test_support", ":video_test_common", "../api:scoped_refptr", + "../api:sequence_checker", "../api/video:encoded_image", "../api/video:video_frame", "../api/video_codecs:video_codecs_api", @@ -374,7 +375,6 @@ rtc_library("video_test_support") { "../rtc_base:logging", "../rtc_base:rtc_base_approved", "../rtc_base:rtc_event", - "../rtc_base/synchronization:sequence_checker", "../rtc_base/system:file_wrapper", ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] @@ -725,6 +725,7 @@ rtc_library("direct_transport") { ] deps = [ ":rtp_test_utils", + "../api:sequence_checker", "../api:simulated_network_api", "../api:transport_api", "../api/task_queue", @@ -734,7 +735,6 @@ rtc_library("direct_transport") { "../rtc_base:macromagic", "../rtc_base:timeutils", "../rtc_base/synchronization:mutex", - "../rtc_base/synchronization:sequence_checker", "../rtc_base/task_utils:repeating_task", ] absl_deps = [ "//third_party/abseil-cpp/absl/memory" ] @@ -760,6 +760,7 @@ rtc_library("fake_video_codecs") { deps = [ "../api:fec_controller_api", "../api:scoped_refptr", + "../api:sequence_checker", "../api/task_queue", "../api/video:encoded_image", "../api/video:video_bitrate_allocation", @@ -776,7 +777,6 @@ rtc_library("fake_video_codecs") { "../rtc_base:rtc_task_queue", "../rtc_base:timeutils", "../rtc_base/synchronization:mutex", - "../rtc_base/synchronization:sequence_checker", "../system_wrappers", ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] diff --git a/test/direct_transport.h b/test/direct_transport.h index 2fc3b7f76b..34b68555d5 100644 --- a/test/direct_transport.h +++ b/test/direct_transport.h @@ -13,12 +13,12 @@ #include #include "api/call/transport.h" +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_base.h" #include "api/test/simulated_network.h" #include "call/call.h" #include "call/simulated_packet_receiver.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_utils/repeating_task.h" #include "rtc_base/thread_annotations.h" diff --git a/test/fake_encoder.h b/test/fake_encoder.h index abd3134154..9feed1455f 100644 --- a/test/fake_encoder.h +++ b/test/fake_encoder.h @@ -18,6 +18,7 @@ #include #include "api/fec_controller_override.h" +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_factory.h" #include "api/video/encoded_image.h" #include "api/video/video_bitrate_allocation.h" @@ -26,7 +27,6 @@ #include "api/video_codecs/video_encoder.h" #include "modules/video_coding/include/video_codec_interface.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/clock.h" diff --git a/test/fake_vp8_encoder.h b/test/fake_vp8_encoder.h index 178a46070d..6aaf547379 100644 --- a/test/fake_vp8_encoder.h +++ b/test/fake_vp8_encoder.h @@ -17,13 +17,13 @@ #include #include "api/fec_controller_override.h" +#include "api/sequence_checker.h" #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_frame_buffer_controller.h" #include "api/video_codecs/vp8_temporal_layers.h" #include "modules/video_coding/include/video_codec_interface.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/clock.h" #include "test/fake_encoder.h" diff --git a/test/network/BUILD.gn b/test/network/BUILD.gn index 1073f229bd..bcd25c060f 100644 --- a/test/network/BUILD.gn +++ b/test/network/BUILD.gn @@ -42,6 +42,7 @@ rtc_library("emulated_network") { "../../api:network_emulation_manager_api", "../../api:packet_socket_factory", "../../api:scoped_refptr", + "../../api:sequence_checker", "../../api:simulated_network_api", "../../api:time_controller", "../../api/numerics", @@ -65,7 +66,6 @@ rtc_library("emulated_network") { "../../rtc_base:task_queue_for_test", "../../rtc_base:threading", "../../rtc_base/synchronization:mutex", - "../../rtc_base/synchronization:sequence_checker", "../../rtc_base/task_utils:pending_task_safety_flag", "../../rtc_base/task_utils:repeating_task", "../../rtc_base/task_utils:to_queued_task", diff --git a/test/network/cross_traffic.h b/test/network/cross_traffic.h index 9ed41a90d5..487622d4d4 100644 --- a/test/network/cross_traffic.h +++ b/test/network/cross_traffic.h @@ -15,13 +15,13 @@ #include #include +#include "api/sequence_checker.h" #include "api/test/network_emulation_manager.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/random.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "test/network/network_emulation.h" #include "test/scenario/column_printer.h" diff --git a/test/network/emulated_network_manager.h b/test/network/emulated_network_manager.h index d564e4166e..fd2bb5b665 100644 --- a/test/network/emulated_network_manager.h +++ b/test/network/emulated_network_manager.h @@ -15,12 +15,12 @@ #include #include +#include "api/sequence_checker.h" #include "api/test/network_emulation_manager.h" #include "api/test/time_controller.h" #include "rtc_base/ip_address.h" #include "rtc_base/network.h" #include "rtc_base/socket_server.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread.h" #include "test/network/network_emulation.h" diff --git a/test/network/network_emulation.h b/test/network/network_emulation.h index 78d53c1e9c..6d56d50ad5 100644 --- a/test/network/network_emulation.h +++ b/test/network/network_emulation.h @@ -22,6 +22,7 @@ #include "absl/types/optional.h" #include "api/array_view.h" #include "api/numerics/samples_stats_counter.h" +#include "api/sequence_checker.h" #include "api/test/network_emulation_manager.h" #include "api/test/simulated_network.h" #include "api/units/timestamp.h" @@ -29,7 +30,6 @@ #include "rtc_base/network.h" #include "rtc_base/network_constants.h" #include "rtc_base/socket_address.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_queue_for_test.h" #include "rtc_base/task_utils/repeating_task.h" #include "rtc_base/thread_annotations.h" diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn index 4cb77611f2..fc7f1eb695 100644 --- a/test/pc/e2e/BUILD.gn +++ b/test/pc/e2e/BUILD.gn @@ -516,9 +516,9 @@ if (!build_with_chromium) { "analyzer_helper.h", ] deps = [ + "../../../api:sequence_checker", "../../../api:track_id_stream_info_map", "../../../rtc_base:macromagic", - "../../../rtc_base/synchronization:sequence_checker", ] absl_deps = [ "//third_party/abseil-cpp/absl/strings" ] } diff --git a/test/pc/e2e/analyzer_helper.h b/test/pc/e2e/analyzer_helper.h index 4b0e0c3ac4..9cebd7015e 100644 --- a/test/pc/e2e/analyzer_helper.h +++ b/test/pc/e2e/analyzer_helper.h @@ -15,8 +15,8 @@ #include #include "absl/strings/string_view.h" +#include "api/sequence_checker.h" #include "api/test/track_id_stream_info_map.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/test/scenario/BUILD.gn b/test/scenario/BUILD.gn index 0b54374a1e..a64f8317a0 100644 --- a/test/scenario/BUILD.gn +++ b/test/scenario/BUILD.gn @@ -81,6 +81,7 @@ if (rtc_include_tests && !build_with_chromium) { "../../api:libjingle_peerconnection_api", "../../api:rtc_event_log_output_file", "../../api:rtp_parameters", + "../../api:sequence_checker", "../../api:time_controller", "../../api:time_controller", "../../api:transport_api", @@ -135,7 +136,6 @@ if (rtc_include_tests && !build_with_chromium) { "../../rtc_base:task_queue_for_test", "../../rtc_base:threading", "../../rtc_base/synchronization:mutex", - "../../rtc_base/synchronization:sequence_checker", "../../rtc_base/task_utils:repeating_task", "../../system_wrappers", "../../system_wrappers:field_trial", diff --git a/test/testsupport/ivf_video_frame_generator.h b/test/testsupport/ivf_video_frame_generator.h index 32ba21ed26..8ee9c03417 100644 --- a/test/testsupport/ivf_video_frame_generator.h +++ b/test/testsupport/ivf_video_frame_generator.h @@ -15,6 +15,7 @@ #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "api/test/frame_generator_interface.h" #include "api/video/video_codec_type.h" #include "api/video/video_frame.h" @@ -22,7 +23,6 @@ #include "modules/video_coding/utility/ivf_file_reader.h" #include "rtc_base/event.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { namespace test { diff --git a/test/time_controller/BUILD.gn b/test/time_controller/BUILD.gn index ee49445175..6c13a99648 100644 --- a/test/time_controller/BUILD.gn +++ b/test/time_controller/BUILD.gn @@ -26,6 +26,7 @@ rtc_library("time_controller") { ] deps = [ + "../../api:sequence_checker", "../../api:time_controller", "../../api/task_queue", "../../api/task_queue:default_task_queue_factory", @@ -39,7 +40,6 @@ rtc_library("time_controller") { "../../rtc_base:rtc_base_tests_utils", "../../rtc_base:rtc_event", "../../rtc_base/synchronization:mutex", - "../../rtc_base/synchronization:sequence_checker", "../../rtc_base/synchronization:yield_policy", "../../rtc_base/task_utils:to_queued_task", "../../system_wrappers", diff --git a/test/time_controller/simulated_time_controller.h b/test/time_controller/simulated_time_controller.h index dbe089ca99..0ff3c2f894 100644 --- a/test/time_controller/simulated_time_controller.h +++ b/test/time_controller/simulated_time_controller.h @@ -17,6 +17,7 @@ #include #include "absl/strings/string_view.h" +#include "api/sequence_checker.h" #include "api/test/time_controller.h" #include "api/units/timestamp.h" #include "modules/include/module.h" @@ -24,7 +25,6 @@ #include "rtc_base/fake_clock.h" #include "rtc_base/platform_thread_types.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/synchronization/yield_policy.h" namespace webrtc { diff --git a/video/BUILD.gn b/video/BUILD.gn index b7ad48d2b6..1c92f36ccd 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -61,6 +61,7 @@ rtc_library("video") { "../api:libjingle_peerconnection_api", "../api:rtp_parameters", "../api:scoped_refptr", + "../api:sequence_checker", "../api:transport_api", "../api/crypto:frame_decryptor_interface", "../api/crypto:options", @@ -114,7 +115,6 @@ rtc_library("video") { "../rtc_base/experiments:quality_scaling_experiment", "../rtc_base/experiments:rate_control_settings", "../rtc_base/synchronization:mutex", - "../rtc_base/synchronization:sequence_checker", "../rtc_base/system:no_unique_address", "../rtc_base/system:thread_registry", "../rtc_base/task_utils:pending_task_safety_flag", @@ -161,6 +161,7 @@ rtc_source_set("video_legacy") { ":video", "../api:array_view", "../api:scoped_refptr", + "../api:sequence_checker", "../api/crypto:frame_decryptor_interface", "../api/task_queue", "../api/video:encoded_image", @@ -218,6 +219,7 @@ rtc_library("video_stream_decoder_impl") { ] deps = [ + "../api:sequence_checker", "../api/task_queue", "../api/video:encoded_frame", "../api/video:video_frame", @@ -274,6 +276,7 @@ rtc_library("video_stream_encoder_impl") { deps = [ "../api:rtp_parameters", + "../api:sequence_checker", "../api/adaptation:resource_adaptation_api", "../api/task_queue:task_queue", "../api/units:data_rate", @@ -311,7 +314,6 @@ rtc_library("video_stream_encoder_impl") { "../rtc_base/experiments:quality_scaling_experiment", "../rtc_base/experiments:rate_control_settings", "../rtc_base/synchronization:mutex", - "../rtc_base/synchronization:sequence_checker", "../rtc_base/system:no_unique_address", "../rtc_base/task_utils:pending_task_safety_flag", "../rtc_base/task_utils:repeating_task", @@ -643,6 +645,7 @@ if (rtc_include_tests) { "../api:rtp_headers", "../api:rtp_parameters", "../api:scoped_refptr", + "../api:sequence_checker", "../api:simulated_network_api", "../api:transport_api", "../api/adaptation:resource_adaptation_api", @@ -710,7 +713,6 @@ if (rtc_include_tests) { "../rtc_base:threading", "../rtc_base/experiments:alr_experiment", "../rtc_base/synchronization:mutex", - "../rtc_base/synchronization:sequence_checker", "../rtc_base/task_utils:to_queued_task", "../system_wrappers", "../system_wrappers:field_trial", diff --git a/video/adaptation/BUILD.gn b/video/adaptation/BUILD.gn index b908ac3425..20a2370b57 100644 --- a/video/adaptation/BUILD.gn +++ b/video/adaptation/BUILD.gn @@ -33,6 +33,7 @@ rtc_library("video_adaptation") { deps = [ "../../api:rtp_parameters", "../../api:scoped_refptr", + "../../api:sequence_checker", "../../api/adaptation:resource_adaptation_api", "../../api/task_queue:task_queue", "../../api/units:data_rate", @@ -55,7 +56,6 @@ rtc_library("video_adaptation") { "../../rtc_base/experiments:quality_rampup_experiment", "../../rtc_base/experiments:quality_scaler_settings", "../../rtc_base/synchronization:mutex", - "../../rtc_base/synchronization:sequence_checker", "../../rtc_base/system:no_unique_address", "../../rtc_base/task_utils:repeating_task", "../../rtc_base/task_utils:to_queued_task", diff --git a/video/adaptation/balanced_constraint.cc b/video/adaptation/balanced_constraint.cc index b4926a4a26..3de81e72e0 100644 --- a/video/adaptation/balanced_constraint.cc +++ b/video/adaptation/balanced_constraint.cc @@ -8,12 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include "video/adaptation/balanced_constraint.h" + #include #include -#include "rtc_base/synchronization/sequence_checker.h" +#include "api/sequence_checker.h" #include "rtc_base/task_utils/to_queued_task.h" -#include "video/adaptation/balanced_constraint.h" namespace webrtc { diff --git a/video/adaptation/balanced_constraint.h b/video/adaptation/balanced_constraint.h index 15219360f5..0bbd670408 100644 --- a/video/adaptation/balanced_constraint.h +++ b/video/adaptation/balanced_constraint.h @@ -14,10 +14,10 @@ #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "call/adaptation/adaptation_constraint.h" #include "call/adaptation/degradation_preference_provider.h" #include "rtc_base/experiments/balanced_degradation_settings.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" namespace webrtc { diff --git a/video/adaptation/bitrate_constraint.cc b/video/adaptation/bitrate_constraint.cc index c24bbb9853..bb15bf4df4 100644 --- a/video/adaptation/bitrate_constraint.cc +++ b/video/adaptation/bitrate_constraint.cc @@ -8,13 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include "video/adaptation/bitrate_constraint.h" + #include #include #include +#include "api/sequence_checker.h" #include "call/adaptation/video_stream_adapter.h" -#include "rtc_base/synchronization/sequence_checker.h" -#include "video/adaptation/bitrate_constraint.h" #include "video/adaptation/video_stream_encoder_resource_manager.h" namespace webrtc { diff --git a/video/adaptation/bitrate_constraint.h b/video/adaptation/bitrate_constraint.h index 6fefb04c24..a608e5db5d 100644 --- a/video/adaptation/bitrate_constraint.h +++ b/video/adaptation/bitrate_constraint.h @@ -14,11 +14,11 @@ #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "call/adaptation/adaptation_constraint.h" #include "call/adaptation/encoder_settings.h" #include "call/adaptation/video_source_restrictions.h" #include "call/adaptation/video_stream_input_state.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" namespace webrtc { diff --git a/video/adaptation/overuse_frame_detector.h b/video/adaptation/overuse_frame_detector.h index c9095d63a5..2b4dd61d21 100644 --- a/video/adaptation/overuse_frame_detector.h +++ b/video/adaptation/overuse_frame_detector.h @@ -15,12 +15,12 @@ #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_base.h" #include "api/video/video_stream_encoder_observer.h" #include "rtc_base/constructor_magic.h" #include "rtc_base/experiments/field_trial_parser.h" #include "rtc_base/numerics/exp_filter.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/task_utils/repeating_task.h" #include "rtc_base/thread_annotations.h" diff --git a/video/adaptation/pixel_limit_resource.cc b/video/adaptation/pixel_limit_resource.cc index 96c8cac737..e1df141f70 100644 --- a/video/adaptation/pixel_limit_resource.cc +++ b/video/adaptation/pixel_limit_resource.cc @@ -10,11 +10,11 @@ #include "video/adaptation/pixel_limit_resource.h" +#include "api/sequence_checker.h" #include "api/units/time_delta.h" #include "call/adaptation/video_stream_adapter.h" #include "rtc_base/checks.h" #include "rtc_base/ref_counted_object.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/video/adaptation/video_stream_encoder_resource.h b/video/adaptation/video_stream_encoder_resource.h index 477fdf492d..e10f595757 100644 --- a/video/adaptation/video_stream_encoder_resource.h +++ b/video/adaptation/video_stream_encoder_resource.h @@ -16,10 +16,10 @@ #include "absl/types/optional.h" #include "api/adaptation/resource.h" +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_base.h" #include "call/adaptation/adaptation_constraint.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { diff --git a/video/adaptation/video_stream_encoder_resource_manager.cc b/video/adaptation/video_stream_encoder_resource_manager.cc index 379df7b1d0..6cf3801a6a 100644 --- a/video/adaptation/video_stream_encoder_resource_manager.cc +++ b/video/adaptation/video_stream_encoder_resource_manager.cc @@ -11,6 +11,7 @@ #include "video/adaptation/video_stream_encoder_resource_manager.h" #include + #include #include #include @@ -20,6 +21,7 @@ #include "absl/algorithm/container.h" #include "absl/base/macros.h" #include "api/adaptation/resource.h" +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_base.h" #include "api/video/video_adaptation_reason.h" #include "api/video/video_source_interface.h" @@ -29,7 +31,6 @@ #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/ref_counted_object.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/time_utils.h" #include "system_wrappers/include/field_trial.h" #include "video/adaptation/quality_scaler_resource.h" diff --git a/video/call_stats.h b/video/call_stats.h index f4a87c3015..5dc8fa0cbb 100644 --- a/video/call_stats.h +++ b/video/call_stats.h @@ -14,12 +14,12 @@ #include #include +#include "api/sequence_checker.h" #include "modules/include/module.h" #include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "rtc_base/constructor_magic.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/video/receive_statistics_proxy.h b/video/receive_statistics_proxy.h index 1475b0c451..57738f29cf 100644 --- a/video/receive_statistics_proxy.h +++ b/video/receive_statistics_proxy.h @@ -17,6 +17,7 @@ #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "call/video_receive_stream.h" #include "modules/include/module_common_types.h" #include "modules/video_coding/include/video_coding_defines.h" @@ -26,7 +27,6 @@ #include "rtc_base/rate_statistics.h" #include "rtc_base/rate_tracker.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/thread_annotations.h" #include "video/quality_threshold.h" #include "video/stats_counter.h" diff --git a/video/receive_statistics_proxy2.h b/video/receive_statistics_proxy2.h index 930ee641f2..7797d93217 100644 --- a/video/receive_statistics_proxy2.h +++ b/video/receive_statistics_proxy2.h @@ -17,6 +17,7 @@ #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_base.h" #include "api/units/timestamp.h" #include "call/video_receive_stream.h" @@ -27,7 +28,6 @@ #include "rtc_base/numerics/sample_counter.h" #include "rtc_base/rate_statistics.h" #include "rtc_base/rate_tracker.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/task_utils/pending_task_safety_flag.h" #include "rtc_base/thread_annotations.h" diff --git a/video/rtp_streams_synchronizer.h b/video/rtp_streams_synchronizer.h index b04d6f937b..574ccba70b 100644 --- a/video/rtp_streams_synchronizer.h +++ b/video/rtp_streams_synchronizer.h @@ -16,9 +16,9 @@ #include +#include "api/sequence_checker.h" #include "modules/include/module.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "video/stream_synchronization.h" namespace webrtc { diff --git a/video/rtp_streams_synchronizer2.h b/video/rtp_streams_synchronizer2.h index 3d31738225..192378aba7 100644 --- a/video/rtp_streams_synchronizer2.h +++ b/video/rtp_streams_synchronizer2.h @@ -13,7 +13,7 @@ #include -#include "rtc_base/synchronization/sequence_checker.h" +#include "api/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/task_queue.h" #include "rtc_base/task_utils/repeating_task.h" diff --git a/video/rtp_video_stream_receiver.h b/video/rtp_video_stream_receiver.h index ba863a3652..bdb1e2dab6 100644 --- a/video/rtp_video_stream_receiver.h +++ b/video/rtp_video_stream_receiver.h @@ -21,6 +21,7 @@ #include "absl/types/optional.h" #include "api/array_view.h" #include "api/crypto/frame_decryptor_interface.h" +#include "api/sequence_checker.h" #include "api/video/color_space.h" #include "api/video_codecs/video_codec.h" #include "call/rtp_packet_sink_interface.h" @@ -45,7 +46,6 @@ #include "rtc_base/experiments/field_trial_parser.h" #include "rtc_base/numerics/sequence_number_util.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/thread_annotations.h" #include "video/buffered_frame_decryptor.h" diff --git a/video/rtp_video_stream_receiver2.h b/video/rtp_video_stream_receiver2.h index 40e7ef6f1b..053e96366f 100644 --- a/video/rtp_video_stream_receiver2.h +++ b/video/rtp_video_stream_receiver2.h @@ -18,6 +18,7 @@ #include "absl/types/optional.h" #include "api/crypto/frame_decryptor_interface.h" +#include "api/sequence_checker.h" #include "api/video/color_space.h" #include "api/video_codecs/video_codec.h" #include "call/rtp_packet_sink_interface.h" @@ -42,7 +43,6 @@ #include "rtc_base/constructor_magic.h" #include "rtc_base/experiments/field_trial_parser.h" #include "rtc_base/numerics/sequence_number_util.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/thread_annotations.h" #include "video/buffered_frame_decryptor.h" diff --git a/video/rtp_video_stream_receiver_frame_transformer_delegate.h b/video/rtp_video_stream_receiver_frame_transformer_delegate.h index 2ae8e63bba..f7431dda62 100644 --- a/video/rtp_video_stream_receiver_frame_transformer_delegate.h +++ b/video/rtp_video_stream_receiver_frame_transformer_delegate.h @@ -14,8 +14,8 @@ #include #include "api/frame_transformer_interface.h" +#include "api/sequence_checker.h" #include "modules/video_coding/frame_object.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/thread.h" diff --git a/video/video_receive_stream.h b/video/video_receive_stream.h index 5e52063536..ce409618d7 100644 --- a/video/video_receive_stream.h +++ b/video/video_receive_stream.h @@ -14,6 +14,7 @@ #include #include +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_factory.h" #include "api/video/recordable_encoded_frame.h" #include "call/rtp_packet_sink_interface.h" @@ -24,7 +25,6 @@ #include "modules/video_coding/frame_buffer2.h" #include "modules/video_coding/video_receiver2.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/task_queue.h" #include "system_wrappers/include/clock.h" diff --git a/video/video_receive_stream2.h b/video/video_receive_stream2.h index 658fab510c..b8e3ba51d9 100644 --- a/video/video_receive_stream2.h +++ b/video/video_receive_stream2.h @@ -14,6 +14,7 @@ #include #include +#include "api/sequence_checker.h" #include "api/task_queue/task_queue_factory.h" #include "api/units/timestamp.h" #include "api/video/recordable_encoded_frame.h" @@ -24,7 +25,6 @@ #include "modules/rtp_rtcp/source/source_tracker.h" #include "modules/video_coding/frame_buffer2.h" #include "modules/video_coding/video_receiver2.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/task_queue.h" #include "rtc_base/task_utils/pending_task_safety_flag.h" diff --git a/video/video_send_stream.h b/video/video_send_stream.h index f3bf6cc8cd..e36f279ca6 100644 --- a/video/video_send_stream.h +++ b/video/video_send_stream.h @@ -16,12 +16,12 @@ #include #include "api/fec_controller.h" +#include "api/sequence_checker.h" #include "api/video/video_stream_encoder_interface.h" #include "call/bitrate_allocator.h" #include "call/video_receive_stream.h" #include "call/video_send_stream.h" #include "rtc_base/event.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_queue.h" #include "video/send_delay_stats.h" #include "video/send_statistics_proxy.h" diff --git a/video/video_send_stream_impl.cc b/video/video_send_stream_impl.cc index 0cf7033d19..b4adc135ec 100644 --- a/video/video_send_stream_impl.cc +++ b/video/video_send_stream_impl.cc @@ -20,6 +20,7 @@ #include "api/crypto/crypto_options.h" #include "api/rtp_parameters.h" #include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "api/video_codecs/video_codec.h" #include "call/rtp_transport_controller_send_interface.h" #include "call/video_send_stream.h" @@ -32,7 +33,6 @@ #include "rtc_base/experiments/rate_control_settings.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/field_trial.h" diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc index 52e4ddbc42..1c0a4ba239 100644 --- a/video/video_send_stream_tests.cc +++ b/video/video_send_stream_tests.cc @@ -12,6 +12,7 @@ #include #include "absl/algorithm/container.h" +#include "api/sequence_checker.h" #include "api/task_queue/default_task_queue_factory.h" #include "api/task_queue/task_queue_base.h" #include "api/test/simulated_network.h" @@ -39,7 +40,6 @@ #include "rtc_base/platform_thread.h" #include "rtc_base/rate_limiter.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_queue_for_test.h" #include "rtc_base/task_utils/to_queued_task.h" #include "rtc_base/time_utils.h" diff --git a/video/video_source_sink_controller.h b/video/video_source_sink_controller.h index 134366cfd0..29a9588c4d 100644 --- a/video/video_source_sink_controller.h +++ b/video/video_source_sink_controller.h @@ -14,11 +14,11 @@ #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "api/video/video_frame.h" #include "api/video/video_sink_interface.h" #include "api/video/video_source_interface.h" #include "call/adaptation/video_source_restrictions.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" namespace webrtc { diff --git a/video/video_stream_decoder_impl.h b/video/video_stream_decoder_impl.h index 57ddf63d66..3f4c8d6c79 100644 --- a/video/video_stream_decoder_impl.h +++ b/video/video_stream_decoder_impl.h @@ -16,12 +16,12 @@ #include #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "api/video/video_stream_decoder.h" #include "modules/video_coding/frame_buffer2.h" #include "modules/video_coding/timing.h" #include "rtc_base/platform_thread.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_queue.h" #include "system_wrappers/include/clock.h" diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc index 1a2c20e818..979fda0c8c 100644 --- a/video/video_stream_encoder.cc +++ b/video/video_stream_encoder.cc @@ -19,6 +19,7 @@ #include "absl/algorithm/container.h" #include "absl/types/optional.h" +#include "api/sequence_checker.h" #include "api/task_queue/queued_task.h" #include "api/task_queue/task_queue_base.h" #include "api/video/encoded_image.h" @@ -41,7 +42,6 @@ #include "rtc_base/location.h" #include "rtc_base/logging.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/trace_event.h" diff --git a/video/video_stream_encoder.h b/video/video_stream_encoder.h index 8e32135cfb..26d71d022e 100644 --- a/video/video_stream_encoder.h +++ b/video/video_stream_encoder.h @@ -18,6 +18,7 @@ #include #include "api/adaptation/resource.h" +#include "api/sequence_checker.h" #include "api/units/data_rate.h" #include "api/video/video_bitrate_allocator.h" #include "api/video/video_rotation.h" @@ -37,7 +38,6 @@ #include "rtc_base/numerics/exp_filter.h" #include "rtc_base/race_checker.h" #include "rtc_base/rate_statistics.h" -#include "rtc_base/synchronization/sequence_checker.h" #include "rtc_base/task_queue.h" #include "rtc_base/task_utils/pending_task_safety_flag.h" #include "rtc_base/thread_annotations.h"