From ebad1770ab49de2a8e9acbb714aba5659f024672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Tue, 4 Dec 2018 13:15:37 +0100 Subject: [PATCH] Include event_wrapper.h only where used. It's currently used only by the VCMJitterBuffer and VCMReceiver classes. Injection is needed by the VCMReceiverTimingTest test, which defines a subclass(!) of EventWrapper. Bug: webrtc:3380 Change-Id: I765be0ceac58e941928319cc426ba49f1cbdc5fa Reviewed-on: https://webrtc-review.googlesource.com/c/113002 Reviewed-by: Karl Wiberg Reviewed-by: Philip Eliasson Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#25893} --- modules/audio_device/linux/audio_device_alsa_linux.cc | 1 - modules/audio_processing/audio_processing_unittest.cc | 1 - modules/desktop_capture/mac/desktop_configuration_monitor.cc | 1 - modules/video_coding/include/video_coding.h | 1 - modules/video_coding/jitter_buffer.cc | 1 - modules/video_coding/jitter_buffer.h | 2 +- modules/video_coding/receiver.h | 1 + sdk/objc/unittests/RTCAudioDeviceModule_xctest.mm | 2 -- 8 files changed, 2 insertions(+), 8 deletions(-) diff --git a/modules/audio_device/linux/audio_device_alsa_linux.cc b/modules/audio_device/linux/audio_device_alsa_linux.cc index bef4ef3564..292193d957 100644 --- a/modules/audio_device/linux/audio_device_alsa_linux.cc +++ b/modules/audio_device/linux/audio_device_alsa_linux.cc @@ -14,7 +14,6 @@ #include "modules/audio_device/linux/audio_device_alsa_linux.h" #include "rtc_base/logging.h" #include "rtc_base/system/arch.h" -#include "system_wrappers/include/event_wrapper.h" #include "system_wrappers/include/sleep.h" WebRTCAlsaSymbolTable* GetAlsaSymbolTable() { diff --git a/modules/audio_processing/audio_processing_unittest.cc b/modules/audio_processing/audio_processing_unittest.cc index 6809ab9dcd..90882d7874 100644 --- a/modules/audio_processing/audio_processing_unittest.cc +++ b/modules/audio_processing/audio_processing_unittest.cc @@ -40,7 +40,6 @@ #include "rtc_base/system/arch.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread.h" -#include "system_wrappers/include/event_wrapper.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" diff --git a/modules/desktop_capture/mac/desktop_configuration_monitor.cc b/modules/desktop_capture/mac/desktop_configuration_monitor.cc index 9a32f638d8..cee8e702ba 100644 --- a/modules/desktop_capture/mac/desktop_configuration_monitor.cc +++ b/modules/desktop_capture/mac/desktop_configuration_monitor.cc @@ -13,7 +13,6 @@ #include "modules/desktop_capture/mac/desktop_configuration.h" #include "rtc_base/logging.h" #include "rtc_base/trace_event.h" -#include "system_wrappers/include/event_wrapper.h" namespace webrtc { diff --git a/modules/video_coding/include/video_coding.h b/modules/video_coding/include/video_coding.h index 653c120ba0..33757b03be 100644 --- a/modules/video_coding/include/video_coding.h +++ b/modules/video_coding/include/video_coding.h @@ -18,7 +18,6 @@ #include "modules/include/module_common_types.h" #include "modules/video_coding/include/video_coding_defines.h" #include "rtc_base/deprecation.h" -#include "system_wrappers/include/event_wrapper.h" namespace webrtc { diff --git a/modules/video_coding/jitter_buffer.cc b/modules/video_coding/jitter_buffer.cc index 2805fbb45f..4327ac9f0c 100644 --- a/modules/video_coding/jitter_buffer.cc +++ b/modules/video_coding/jitter_buffer.cc @@ -28,7 +28,6 @@ #include "rtc_base/system/fallthrough.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/clock.h" -#include "system_wrappers/include/event_wrapper.h" #include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/video_coding/jitter_buffer.h b/modules/video_coding/jitter_buffer.h index 4826276045..c8d778117e 100644 --- a/modules/video_coding/jitter_buffer.h +++ b/modules/video_coding/jitter_buffer.h @@ -28,6 +28,7 @@ #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" #include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/event_wrapper.h" namespace webrtc { @@ -35,7 +36,6 @@ enum VCMNackMode { kNack, kNoNack }; // forward declarations class Clock; -class EventWrapper; class VCMFrameBuffer; class VCMPacket; class VCMEncodedFrame; diff --git a/modules/video_coding/receiver.h b/modules/video_coding/receiver.h index 503cae7c8d..97692e0797 100644 --- a/modules/video_coding/receiver.h +++ b/modules/video_coding/receiver.h @@ -20,6 +20,7 @@ #include "modules/video_coding/packet.h" #include "modules/video_coding/timing.h" #include "rtc_base/criticalsection.h" +#include "system_wrappers/include/event_wrapper.h" namespace webrtc { diff --git a/sdk/objc/unittests/RTCAudioDeviceModule_xctest.mm b/sdk/objc/unittests/RTCAudioDeviceModule_xctest.mm index 55d48c28ba..c2b5c6a627 100644 --- a/sdk/objc/unittests/RTCAudioDeviceModule_xctest.mm +++ b/sdk/objc/unittests/RTCAudioDeviceModule_xctest.mm @@ -14,8 +14,6 @@ #import "sdk/objc/native/api/audio_device_module.h" #endif -#include "system_wrappers/include/event_wrapper.h" - #include "rtc_base/scoped_ref_ptr.h" typedef int32_t(^NeedMorePlayDataBlock)(const size_t nSamples,