From 38344ed2806c8fed60d67d280ca44c32e36707c0 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Wed, 24 Sep 2014 06:05:00 +0000 Subject: [PATCH] Move thread_annotations.h to webrtc/base/. R=andresp@webrtc.org, mflodman@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/27579004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7283 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcvideoengine2.h | 2 +- webrtc/base/BUILD.gn | 1 + webrtc/base/base.gyp | 1 + webrtc/{system_wrappers/interface => base}/thread_annotations.h | 0 webrtc/modules/audio_coding/main/acm2/acm_g722.h | 2 +- webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h | 2 +- webrtc/modules/audio_coding/main/acm2/acm_isac.h | 2 +- webrtc/modules/audio_coding/main/acm2/acm_receiver.h | 2 +- .../modules/audio_coding/main/acm2/audio_coding_module_impl.h | 2 +- .../audio_coding/main/acm2/audio_coding_module_unittest.cc | 2 +- .../main/acm2/audio_coding_module_unittest_oldapi.cc | 2 +- webrtc/modules/audio_coding/neteq/neteq_impl.h | 2 +- webrtc/modules/pacing/include/paced_sender.h | 2 +- webrtc/modules/rtp_rtcp/source/rtcp_sender.h | 2 +- webrtc/modules/rtp_rtcp/source/rtp_packet_history.h | 2 +- webrtc/modules/rtp_rtcp/source/rtp_sender.h | 2 +- webrtc/modules/video_coding/main/source/timing.h | 2 +- webrtc/modules/video_coding/main/source/video_coding_impl.h | 2 +- webrtc/system_wrappers/BUILD.gn | 1 - webrtc/system_wrappers/interface/critical_section_wrapper.h | 2 +- webrtc/system_wrappers/interface/rw_lock_wrapper.h | 2 +- webrtc/system_wrappers/source/system_wrappers.gyp | 1 - webrtc/video/bitrate_estimator_tests.cc | 2 +- webrtc/video/call.cc | 2 +- webrtc/video/call_perf_tests.cc | 2 +- webrtc/video/full_stack.cc | 2 +- webrtc/video/receive_statistics_proxy.h | 2 +- webrtc/video/send_statistics_proxy.h | 2 +- webrtc/video_engine/vie_capturer.h | 2 +- webrtc/video_engine/vie_channel_group.cc | 2 +- webrtc/video_engine/vie_encoder.h | 2 +- webrtc/video_engine/vie_manager_base.h | 2 +- 32 files changed, 29 insertions(+), 29 deletions(-) rename webrtc/{system_wrappers/interface => base}/thread_annotations.h (100%) diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h index a1b953b787..a19abd58d3 100644 --- a/talk/media/webrtc/webrtcvideoengine2.h +++ b/talk/media/webrtc/webrtcvideoengine2.h @@ -38,8 +38,8 @@ #include "talk/media/webrtc/webrtcvideoencoderfactory.h" #include "webrtc/base/cpumonitor.h" #include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/thread_annotations.h" #include "webrtc/common_video/interface/i420_video_frame.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/transport.h" #include "webrtc/video_receive_stream.h" #include "webrtc/video_renderer.h" diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn index 003fc1bc20..fbed1a5248 100644 --- a/webrtc/base/BUILD.gn +++ b/webrtc/base/BUILD.gn @@ -127,6 +127,7 @@ static_library("rtc_base_approved") { "stringencode.h", "stringutils.cc", "stringutils.h", + "thread_annotations.h", "timeutils.cc", "timeutils.h", ] diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp index f5fad01f25..fa92707c21 100644 --- a/webrtc/base/base.gyp +++ b/webrtc/base/base.gyp @@ -50,6 +50,7 @@ 'stringencode.h', 'stringutils.cc', 'stringutils.h', + 'thread_annotations.h', 'timeutils.cc', 'timeutils.h', ], diff --git a/webrtc/system_wrappers/interface/thread_annotations.h b/webrtc/base/thread_annotations.h similarity index 100% rename from webrtc/system_wrappers/interface/thread_annotations.h rename to webrtc/base/thread_annotations.h diff --git a/webrtc/modules/audio_coding/main/acm2/acm_g722.h b/webrtc/modules/audio_coding/main/acm2/acm_g722.h index 6717d2c421..dd3b7669c2 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_g722.h +++ b/webrtc/modules/audio_coding/main/acm2/acm_g722.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_G722_H_ #define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_G722_H_ +#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" typedef struct WebRtcG722EncInst G722EncInst; typedef struct WebRtcG722DecInst G722DecInst; diff --git a/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h b/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h index adca299cde..ad6f412a5f 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h +++ b/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h @@ -11,12 +11,12 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_GENERIC_CODEC_H_ #define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_GENERIC_CODEC_H_ +#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h" #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h" #include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/system_wrappers/interface/trace.h" #define MAX_FRAME_SIZE_10MSEC 6 diff --git a/webrtc/modules/audio_coding/main/acm2/acm_isac.h b/webrtc/modules/audio_coding/main/acm2/acm_isac.h index 2354822909..486313a06a 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_isac.h +++ b/webrtc/modules/audio_coding/main/acm2/acm_isac.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_ISAC_H_ #define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_ISAC_H_ +#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h" #include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver.h b/webrtc/modules/audio_coding/main/acm2/acm_receiver.h index 180b4ba6b3..94ea5b017a 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_receiver.h +++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver.h @@ -13,6 +13,7 @@ #include +#include "webrtc/base/thread_annotations.h" #include "webrtc/common_audio/vad/include/webrtc_vad.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" @@ -23,7 +24,6 @@ #include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h index 6e03e5e61f..b8d128fe54 100644 --- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h +++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h @@ -13,13 +13,13 @@ #include +#include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h" #include "webrtc/modules/audio_coding/main/acm2/acm_receiver.h" #include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc index 2e9262d92b..828b772e1e 100644 --- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc +++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc @@ -14,6 +14,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/base/md5digest.h" +#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_coding/main/acm2/acm_receive_test.h" #include "webrtc/modules/audio_coding/main/acm2/acm_send_test.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" @@ -31,7 +32,6 @@ #include "webrtc/system_wrappers/interface/event_wrapper.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/sleep.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc index 104b5b88a7..0e9d273641 100644 --- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc +++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc @@ -13,6 +13,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/md5digest.h" +#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.h" #include "webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" @@ -30,7 +31,6 @@ #include "webrtc/system_wrappers/interface/event_wrapper.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/sleep.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl.h b/webrtc/modules/audio_coding/neteq/neteq_impl.h index d3dff185a0..cfe6a402fe 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_impl.h +++ b/webrtc/modules/audio_coding/neteq/neteq_impl.h @@ -14,6 +14,7 @@ #include #include "webrtc/base/constructormagic.h" +#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/modules/audio_coding/neteq/defines.h" #include "webrtc/modules/audio_coding/neteq/interface/neteq.h" @@ -22,7 +23,6 @@ #include "webrtc/modules/audio_coding/neteq/rtcp.h" #include "webrtc/modules/audio_coding/neteq/statistics_calculator.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/pacing/include/paced_sender.h b/webrtc/modules/pacing/include/paced_sender.h index ddd8e53b7e..14a3a3d43b 100644 --- a/webrtc/modules/pacing/include/paced_sender.h +++ b/webrtc/modules/pacing/include/paced_sender.h @@ -14,9 +14,9 @@ #include #include +#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/interface/module.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.h b/webrtc/modules/rtp_rtcp/source/rtcp_sender.h index 26c44b0464..c0b8ebdb87 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.h @@ -15,6 +15,7 @@ #include #include +#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/rtp_rtcp/interface/receive_statistics.h" @@ -23,7 +24,6 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_history.h b/webrtc/modules/rtp_rtcp/source/rtp_packet_history.h index 190e5057bc..253f6d0a9e 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_packet_history.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_packet_history.h @@ -15,10 +15,10 @@ #include +#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/typedefs.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.h b/webrtc/modules/rtp_rtcp/source/rtp_sender.h index e4d4fca30a..b2f2e0c429 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.h @@ -16,6 +16,7 @@ #include +#include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" #include "webrtc/modules/pacing/include/paced_sender.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" @@ -25,7 +26,6 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" #include "webrtc/modules/rtp_rtcp/source/ssrc_database.h" #include "webrtc/modules/rtp_rtcp/source/video_codec_information.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #define MAX_INIT_RTP_SEQ_NUMBER 32767 // 2^15 -1. diff --git a/webrtc/modules/video_coding/main/source/timing.h b/webrtc/modules/video_coding/main/source/timing.h index 116639ebec..bb44a93b67 100644 --- a/webrtc/modules/video_coding/main/source/timing.h +++ b/webrtc/modules/video_coding/main/source/timing.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_TIMING_H_ #define WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_TIMING_H_ +#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/video_coding/main/source/codec_timer.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/video_coding_impl.h b/webrtc/modules/video_coding/main/source/video_coding_impl.h index 816552fe23..5b3fe2eb77 100644 --- a/webrtc/modules/video_coding/main/source/video_coding_impl.h +++ b/webrtc/modules/video_coding/main/source/video_coding_impl.h @@ -15,6 +15,7 @@ #include +#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/video_coding/main/source/codec_database.h" #include "webrtc/modules/video_coding/main/source/frame_buffer.h" #include "webrtc/modules/video_coding/main/source/generic_decoder.h" @@ -25,7 +26,6 @@ #include "webrtc/modules/video_coding/main/source/timing.h" #include "webrtc/system_wrappers/interface/clock.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" namespace webrtc { diff --git a/webrtc/system_wrappers/BUILD.gn b/webrtc/system_wrappers/BUILD.gn index 76a0f34073..262189c168 100644 --- a/webrtc/system_wrappers/BUILD.gn +++ b/webrtc/system_wrappers/BUILD.gn @@ -45,7 +45,6 @@ static_library("system_wrappers") { "interface/static_instance.h", "interface/stl_util.h", "interface/stringize_macros.h", - "interface/thread_annotations.h", "interface/thread_wrapper.h", "interface/tick_util.h", "interface/timestamp_extrapolator.h", diff --git a/webrtc/system_wrappers/interface/critical_section_wrapper.h b/webrtc/system_wrappers/interface/critical_section_wrapper.h index 4979b5c7dd..e93a249e25 100644 --- a/webrtc/system_wrappers/interface/critical_section_wrapper.h +++ b/webrtc/system_wrappers/interface/critical_section_wrapper.h @@ -14,8 +14,8 @@ // If the critical section is heavily contended it may be beneficial to use // read/write locks instead. +#include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" namespace webrtc { class LOCKABLE CriticalSectionWrapper { diff --git a/webrtc/system_wrappers/interface/rw_lock_wrapper.h b/webrtc/system_wrappers/interface/rw_lock_wrapper.h index 91126e5d78..dbe6d6c7c0 100644 --- a/webrtc/system_wrappers/interface/rw_lock_wrapper.h +++ b/webrtc/system_wrappers/interface/rw_lock_wrapper.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_RW_LOCK_WRAPPER_H_ #define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_RW_LOCK_WRAPPER_H_ -#include "webrtc/system_wrappers/interface/thread_annotations.h" +#include "webrtc/base/thread_annotations.h" // Note, Windows pre-Vista version of RW locks are not supported natively. For // these OSs regular critical sections have been used to approximate RW lock diff --git a/webrtc/system_wrappers/source/system_wrappers.gyp b/webrtc/system_wrappers/source/system_wrappers.gyp index 82addeb5ee..e6c4216da7 100644 --- a/webrtc/system_wrappers/source/system_wrappers.gyp +++ b/webrtc/system_wrappers/source/system_wrappers.gyp @@ -54,7 +54,6 @@ '../interface/static_instance.h', '../interface/stl_util.h', '../interface/stringize_macros.h', - '../interface/thread_annotations.h', '../interface/thread_wrapper.h', '../interface/tick_util.h', '../interface/timestamp_extrapolator.h', diff --git a/webrtc/video/bitrate_estimator_tests.cc b/webrtc/video/bitrate_estimator_tests.cc index 6f12805943..cb7c391e0c 100644 --- a/webrtc/video/bitrate_estimator_tests.cc +++ b/webrtc/video/bitrate_estimator_tests.cc @@ -13,11 +13,11 @@ #include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/base/thread_annotations.h" #include "webrtc/call.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/event_wrapper.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/system_wrappers/interface/trace.h" #include "webrtc/test/call_test.h" #include "webrtc/test/direct_transport.h" diff --git a/webrtc/video/call.cc b/webrtc/video/call.cc index 442e75bd7a..25853f8b3b 100644 --- a/webrtc/video/call.cc +++ b/webrtc/video/call.cc @@ -14,6 +14,7 @@ #include #include +#include "webrtc/base/thread_annotations.h" #include "webrtc/call.h" #include "webrtc/common.h" #include "webrtc/config.h" @@ -22,7 +23,6 @@ #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/system_wrappers/interface/trace.h" #include "webrtc/video/video_receive_stream.h" #include "webrtc/video/video_send_stream.h" diff --git a/webrtc/video/call_perf_tests.cc b/webrtc/video/call_perf_tests.cc index d055af93e4..cd83698fd5 100644 --- a/webrtc/video/call_perf_tests.cc +++ b/webrtc/video/call_perf_tests.cc @@ -15,6 +15,7 @@ #include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/base/thread_annotations.h" #include "webrtc/call.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" @@ -22,7 +23,6 @@ #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/rtp_to_ntp.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/test/call_test.h" #include "webrtc/test/direct_transport.h" #include "webrtc/test/encoder_settings.h" diff --git a/webrtc/video/full_stack.cc b/webrtc/video/full_stack.cc index 6ae85c4b10..f2d71a97d9 100644 --- a/webrtc/video/full_stack.cc +++ b/webrtc/video/full_stack.cc @@ -14,6 +14,7 @@ #include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/base/thread_annotations.h" #include "webrtc/call.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" @@ -22,7 +23,6 @@ #include "webrtc/system_wrappers/interface/event_wrapper.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/sleep.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/test/call_test.h" #include "webrtc/test/direct_transport.h" #include "webrtc/test/encoder_settings.h" diff --git a/webrtc/video/receive_statistics_proxy.h b/webrtc/video/receive_statistics_proxy.h index 35e5cc3e66..b5fbf860fb 100644 --- a/webrtc/video/receive_statistics_proxy.h +++ b/webrtc/video/receive_statistics_proxy.h @@ -13,10 +13,10 @@ #include +#include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" #include "webrtc/frame_callback.h" #include "webrtc/modules/remote_bitrate_estimator/rate_statistics.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/video_engine/include/vie_codec.h" #include "webrtc/video_engine/include/vie_rtp_rtcp.h" #include "webrtc/video_receive_stream.h" diff --git a/webrtc/video/send_statistics_proxy.h b/webrtc/video/send_statistics_proxy.h index 1b888b0372..ef459dab55 100644 --- a/webrtc/video/send_statistics_proxy.h +++ b/webrtc/video/send_statistics_proxy.h @@ -13,12 +13,12 @@ #include +#include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" #include "webrtc/video_engine/include/vie_codec.h" #include "webrtc/video_engine/include/vie_capture.h" #include "webrtc/video_send_stream.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" namespace webrtc { diff --git a/webrtc/video_engine/vie_capturer.h b/webrtc/video_engine/vie_capturer.h index 2464ca04ed..fdee5d8878 100644 --- a/webrtc/video_engine/vie_capturer.h +++ b/webrtc/video_engine/vie_capturer.h @@ -13,6 +13,7 @@ #include +#include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/video_capture/include/video_capture.h" @@ -20,7 +21,6 @@ #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/typedefs.h" #include "webrtc/video_engine/include/vie_base.h" #include "webrtc/video_engine/include/vie_capture.h" diff --git a/webrtc/video_engine/vie_channel_group.cc b/webrtc/video_engine/vie_channel_group.cc index 6b2d3570df..c6b3f7418f 100644 --- a/webrtc/video_engine/vie_channel_group.cc +++ b/webrtc/video_engine/vie_channel_group.cc @@ -10,6 +10,7 @@ #include "webrtc/video_engine/vie_channel_group.h" +#include "webrtc/base/thread_annotations.h" #include "webrtc/common.h" #include "webrtc/experiments.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" @@ -18,7 +19,6 @@ #include "webrtc/modules/utility/interface/process_thread.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/video_engine/call_stats.h" #include "webrtc/video_engine/encoder_state_feedback.h" #include "webrtc/video_engine/vie_channel.h" diff --git a/webrtc/video_engine/vie_encoder.h b/webrtc/video_engine/vie_encoder.h index e2e691e05f..51c1d01687 100644 --- a/webrtc/video_engine/vie_encoder.h +++ b/webrtc/video_engine/vie_encoder.h @@ -14,13 +14,13 @@ #include #include +#include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/typedefs.h" #include "webrtc/frame_callback.h" #include "webrtc/video_engine/vie_defines.h" diff --git a/webrtc/video_engine/vie_manager_base.h b/webrtc/video_engine/vie_manager_base.h index f9f008f321..c5e92106ab 100644 --- a/webrtc/video_engine/vie_manager_base.h +++ b/webrtc/video_engine/vie_manager_base.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_VIDEO_ENGINE_VIE_MANAGER_BASE_H_ #define WEBRTC_VIDEO_ENGINE_VIE_MANAGER_BASE_H_ -#include "webrtc/system_wrappers/interface/thread_annotations.h" +#include "webrtc/base/thread_annotations.h" namespace webrtc {