diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h index 4826ee6b89..391415620d 100644 --- a/webrtc/voice_engine/channel.h +++ b/webrtc/voice_engine/channel.h @@ -28,7 +28,8 @@ #include "webrtc/voice_engine/voice_engine_defines.h" #ifdef WEBRTC_DTMF_DETECTION -#include "voe_dtmf.h" // TelephoneEventDetectionMethods, TelephoneEventObserver +// TelephoneEventDetectionMethods, TelephoneEventObserver +#include "webrtc/voice_engine/include/voe_dtmf.h" #endif namespace webrtc diff --git a/webrtc/voice_engine/channel_manager.cc b/webrtc/voice_engine/channel_manager.cc index 770bde353a..5adfcbef1b 100644 --- a/webrtc/voice_engine/channel_manager.cc +++ b/webrtc/voice_engine/channel_manager.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "channel.h" -#include "channel_manager.h" +#include "webrtc/voice_engine/channel.h" +#include "webrtc/voice_engine/channel_manager.h" namespace webrtc { diff --git a/webrtc/voice_engine/channel_manager.h b/webrtc/voice_engine/channel_manager.h index 91247d6a2b..49e7bf769d 100644 --- a/webrtc/voice_engine/channel_manager.h +++ b/webrtc/voice_engine/channel_manager.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H #define WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H -#include "channel_manager_base.h" -#include "typedefs.h" +#include "webrtc/typedefs.h" +#include "webrtc/voice_engine/channel_manager_base.h" namespace webrtc { diff --git a/webrtc/voice_engine/channel_manager_base.cc b/webrtc/voice_engine/channel_manager_base.cc index 500101ce17..25d4058692 100644 --- a/webrtc/voice_engine/channel_manager_base.cc +++ b/webrtc/voice_engine/channel_manager_base.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "channel_manager_base.h" +#include "webrtc/voice_engine/channel_manager_base.h" -#include "critical_section_wrapper.h" -#include "rw_lock_wrapper.h" #include +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" namespace webrtc { diff --git a/webrtc/voice_engine/channel_manager_base.h b/webrtc/voice_engine/channel_manager_base.h index 5bf0b7509b..a61bf5a76e 100644 --- a/webrtc/voice_engine/channel_manager_base.h +++ b/webrtc/voice_engine/channel_manager_base.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_BASE_H #define WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_BASE_H -#include "typedefs.h" -#include "map_wrapper.h" -#include "voice_engine_defines.h" +#include "webrtc/system_wrappers/interface/map_wrapper.h" +#include "webrtc/typedefs.h" +#include "webrtc/voice_engine/voice_engine_defines.h" namespace webrtc { diff --git a/webrtc/voice_engine/channel_unittest.cc b/webrtc/voice_engine/channel_unittest.cc index fc78679243..a6b1ea617f 100644 --- a/webrtc/voice_engine/channel_unittest.cc +++ b/webrtc/voice_engine/channel_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "channel.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/voice_engine/channel.h" // Empty test just to get coverage metrics. TEST(ChannelTest, EmptyTestToGetCodeCoverage) {} diff --git a/webrtc/voice_engine/dtmf_inband.cc b/webrtc/voice_engine/dtmf_inband.cc index 7a66aa0640..ee9eb9f2e8 100644 --- a/webrtc/voice_engine/dtmf_inband.cc +++ b/webrtc/voice_engine/dtmf_inband.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "dtmf_inband.h" +#include "webrtc/voice_engine/dtmf_inband.h" -#include "critical_section_wrapper.h" -#include "trace.h" #include +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" namespace webrtc { diff --git a/webrtc/voice_engine/dtmf_inband.h b/webrtc/voice_engine/dtmf_inband.h index f1e523ff27..84f83a3efc 100644 --- a/webrtc/voice_engine/dtmf_inband.h +++ b/webrtc/voice_engine/dtmf_inband.h @@ -15,8 +15,8 @@ #pragma once #endif -#include "typedefs.h" -#include "voice_engine_defines.h" +#include "webrtc/typedefs.h" +#include "webrtc/voice_engine/voice_engine_defines.h" namespace webrtc { class CriticalSectionWrapper; diff --git a/webrtc/voice_engine/dtmf_inband_queue.cc b/webrtc/voice_engine/dtmf_inband_queue.cc index 4e11a24707..e2331db149 100644 --- a/webrtc/voice_engine/dtmf_inband_queue.cc +++ b/webrtc/voice_engine/dtmf_inband_queue.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "dtmf_inband_queue.h" -#include "trace.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/voice_engine/dtmf_inband_queue.h" namespace webrtc { diff --git a/webrtc/voice_engine/dtmf_inband_queue.h b/webrtc/voice_engine/dtmf_inband_queue.h index 98e4bee7d7..fa4967abaf 100644 --- a/webrtc/voice_engine/dtmf_inband_queue.h +++ b/webrtc/voice_engine/dtmf_inband_queue.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_VOICE_ENGINE_DTMF_INBAND_QUEUE_H #define WEBRTC_VOICE_ENGINE_DTMF_INBAND_QUEUE_H -#include "critical_section_wrapper.h" -#include "typedefs.h" -#include "voice_engine_defines.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/typedefs.h" +#include "webrtc/voice_engine/voice_engine_defines.h" namespace webrtc { diff --git a/webrtc/voice_engine/include/mock/mock_voe_connection_observer.h b/webrtc/voice_engine/include/mock/mock_voe_connection_observer.h index 2d3c5e845a..232c54f765 100644 --- a/webrtc/voice_engine/include/mock/mock_voe_connection_observer.h +++ b/webrtc/voice_engine/include/mock/mock_voe_connection_observer.h @@ -11,7 +11,7 @@ #ifndef MOCK_VOE_CONNECTION_OBSERVER_H_ #define MOCK_VOE_CONNECTION_OBSERVER_H_ -#include "voice_engine/include/voe_network.h" +#include "webrtc/voice_engine/include/voe_network.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/webrtc/voice_engine/include/mock/mock_voe_observer.h b/webrtc/voice_engine/include/mock/mock_voe_observer.h index 839a9b568c..1e8cbaa6bb 100644 --- a/webrtc/voice_engine/include/mock/mock_voe_observer.h +++ b/webrtc/voice_engine/include/mock/mock_voe_observer.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_VOICE_ENGINE_MOCK_VOE_OBSERVER_H_ #define WEBRTC_VOICE_ENGINE_MOCK_VOE_OBSERVER_H_ -#include "gmock/gmock.h" -#include "voice_engine/include/voe_base.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/voice_engine/include/voe_base.h" namespace webrtc { diff --git a/webrtc/voice_engine/include/voe_audio_processing.h b/webrtc/voice_engine/include/voe_audio_processing.h index cc62eb9042..51ca952008 100644 --- a/webrtc/voice_engine/include/voe_audio_processing.h +++ b/webrtc/voice_engine/include/voe_audio_processing.h @@ -35,7 +35,7 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_AUDIO_PROCESSING_H #define WEBRTC_VOICE_ENGINE_VOE_AUDIO_PROCESSING_H -#include "common_types.h" +#include "webrtc/common_types.h" namespace webrtc { diff --git a/webrtc/voice_engine/include/voe_base.h b/webrtc/voice_engine/include/voe_base.h index 529ea6b6dc..2958108c43 100644 --- a/webrtc/voice_engine/include/voe_base.h +++ b/webrtc/voice_engine/include/voe_base.h @@ -34,7 +34,7 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_BASE_H #define WEBRTC_VOICE_ENGINE_VOE_BASE_H -#include "common_types.h" +#include "webrtc/common_types.h" namespace webrtc { diff --git a/webrtc/voice_engine/include/voe_call_report.h b/webrtc/voice_engine/include/voe_call_report.h index c4d3abdf24..de2c778185 100644 --- a/webrtc/voice_engine/include/voe_call_report.h +++ b/webrtc/voice_engine/include/voe_call_report.h @@ -34,7 +34,7 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_CALL_REPORT_H #define WEBRTC_VOICE_ENGINE_VOE_CALL_REPORT_H -#include "common_types.h" +#include "webrtc/common_types.h" namespace webrtc { diff --git a/webrtc/voice_engine/include/voe_codec.h b/webrtc/voice_engine/include/voe_codec.h index 0f43e92107..4126965d53 100644 --- a/webrtc/voice_engine/include/voe_codec.h +++ b/webrtc/voice_engine/include/voe_codec.h @@ -31,7 +31,7 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_CODEC_H #define WEBRTC_VOICE_ENGINE_VOE_CODEC_H -#include "common_types.h" +#include "webrtc/common_types.h" namespace webrtc { diff --git a/webrtc/voice_engine/include/voe_encryption.h b/webrtc/voice_engine/include/voe_encryption.h index bd28ae1fb9..e4b0dd0ba0 100644 --- a/webrtc/voice_engine/include/voe_encryption.h +++ b/webrtc/voice_engine/include/voe_encryption.h @@ -24,7 +24,7 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_ENCRYPTION_H #define WEBRTC_VOICE_ENGINE_VOE_ENCRYPTION_H -#include "common_types.h" +#include "webrtc/common_types.h" namespace webrtc { diff --git a/webrtc/voice_engine/include/voe_external_media.h b/webrtc/voice_engine/include/voe_external_media.h index a3d1311dd4..1051d66e1d 100644 --- a/webrtc/voice_engine/include/voe_external_media.h +++ b/webrtc/voice_engine/include/voe_external_media.h @@ -32,7 +32,7 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_EXTERNAL_MEDIA_H #define WEBRTC_VOICE_ENGINE_VOE_EXTERNAL_MEDIA_H -#include "common_types.h" +#include "webrtc/common_types.h" namespace webrtc { diff --git a/webrtc/voice_engine/include/voe_file.h b/webrtc/voice_engine/include/voe_file.h index d968dcf780..128fdf0da2 100644 --- a/webrtc/voice_engine/include/voe_file.h +++ b/webrtc/voice_engine/include/voe_file.h @@ -38,7 +38,7 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_FILE_H #define WEBRTC_VOICE_ENGINE_VOE_FILE_H -#include "common_types.h" +#include "webrtc/common_types.h" namespace webrtc { diff --git a/webrtc/voice_engine/include/voe_hardware.h b/webrtc/voice_engine/include/voe_hardware.h index 1537aab697..8236f65f2a 100644 --- a/webrtc/voice_engine/include/voe_hardware.h +++ b/webrtc/voice_engine/include/voe_hardware.h @@ -32,7 +32,7 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_HARDWARE_H #define WEBRTC_VOICE_ENGINE_VOE_HARDWARE_H -#include "common_types.h" +#include "webrtc/common_types.h" namespace webrtc { diff --git a/webrtc/voice_engine/include/voe_neteq_stats.h b/webrtc/voice_engine/include/voe_neteq_stats.h index 4940bed592..7b7c47fe85 100644 --- a/webrtc/voice_engine/include/voe_neteq_stats.h +++ b/webrtc/voice_engine/include/voe_neteq_stats.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_NETEQ_STATS_H #define WEBRTC_VOICE_ENGINE_VOE_NETEQ_STATS_H -#include "common_types.h" +#include "webrtc/common_types.h" namespace webrtc { diff --git a/webrtc/voice_engine/include/voe_network.h b/webrtc/voice_engine/include/voe_network.h index 6ab92264b6..15a770bd49 100644 --- a/webrtc/voice_engine/include/voe_network.h +++ b/webrtc/voice_engine/include/voe_network.h @@ -34,7 +34,7 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_NETWORK_H #define WEBRTC_VOICE_ENGINE_VOE_NETWORK_H -#include "common_types.h" +#include "webrtc/common_types.h" namespace webrtc { diff --git a/webrtc/voice_engine/include/voe_rtp_rtcp.h b/webrtc/voice_engine/include/voe_rtp_rtcp.h index 59ca61af7e..df1fef7e46 100644 --- a/webrtc/voice_engine/include/voe_rtp_rtcp.h +++ b/webrtc/voice_engine/include/voe_rtp_rtcp.h @@ -41,7 +41,7 @@ #define WEBRTC_VOICE_ENGINE_VOE_RTP_RTCP_H #include -#include "common_types.h" +#include "webrtc/common_types.h" namespace webrtc { diff --git a/webrtc/voice_engine/include/voe_volume_control.h b/webrtc/voice_engine/include/voe_volume_control.h index 6d64e96086..c67d984b56 100644 --- a/webrtc/voice_engine/include/voe_volume_control.h +++ b/webrtc/voice_engine/include/voe_volume_control.h @@ -36,7 +36,7 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_VOLUME_CONTROL_H #define WEBRTC_VOICE_ENGINE_VOE_VOLUME_CONTROL_H -#include "common_types.h" +#include "webrtc/common_types.h" namespace webrtc { diff --git a/webrtc/voice_engine/level_indicator.cc b/webrtc/voice_engine/level_indicator.cc index cc73cb065a..12ca906e49 100644 --- a/webrtc/voice_engine/level_indicator.cc +++ b/webrtc/voice_engine/level_indicator.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "critical_section_wrapper.h" -#include "level_indicator.h" -#include "module_common_types.h" -#include "signal_processing_library.h" +#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/voice_engine/level_indicator.h" namespace webrtc { diff --git a/webrtc/voice_engine/level_indicator.h b/webrtc/voice_engine/level_indicator.h index 76fd8d54b2..c9b0b142e6 100644 --- a/webrtc/voice_engine/level_indicator.h +++ b/webrtc/voice_engine/level_indicator.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_VOICE_ENGINE_LEVEL_INDICATOR_H #define WEBRTC_VOICE_ENGINE_LEVEL_INDICATOR_H -#include "typedefs.h" -#include "voice_engine_defines.h" +#include "webrtc/typedefs.h" +#include "webrtc/voice_engine/voice_engine_defines.h" namespace webrtc { diff --git a/webrtc/voice_engine/monitor_module.h b/webrtc/voice_engine/monitor_module.h index c82b4ee7dd..d55baec624 100644 --- a/webrtc/voice_engine/monitor_module.h +++ b/webrtc/voice_engine/monitor_module.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_VOICE_ENGINE_MONITOR_MODULE_H #define WEBRTC_VOICE_ENGINE_MONITOR_MODULE_H -#include "module.h" -#include "typedefs.h" -#include "voice_engine_defines.h" +#include "webrtc/modules/interface/module.h" +#include "webrtc/typedefs.h" +#include "webrtc/voice_engine/voice_engine_defines.h" class MonitorObserver { diff --git a/webrtc/voice_engine/shared_data.cc b/webrtc/voice_engine/shared_data.cc index 2f0b04a45b..88f66fd320 100644 --- a/webrtc/voice_engine/shared_data.cc +++ b/webrtc/voice_engine/shared_data.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "shared_data.h" +#include "webrtc/voice_engine/shared_data.h" -#include "audio_processing.h" -#include "critical_section_wrapper.h" -#include "channel.h" -#include "output_mixer.h" -#include "trace.h" -#include "transmit_mixer.h" +#include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/voice_engine/channel.h" +#include "webrtc/voice_engine/output_mixer.h" +#include "webrtc/voice_engine/transmit_mixer.h" namespace webrtc { diff --git a/webrtc/voice_engine/statistics.cc b/webrtc/voice_engine/statistics.cc index 49861e0d32..0c2b46821a 100644 --- a/webrtc/voice_engine/statistics.cc +++ b/webrtc/voice_engine/statistics.cc @@ -11,10 +11,10 @@ #include #include -#include "statistics.h" +#include "webrtc/voice_engine/statistics.h" -#include "trace.h" -#include "critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" namespace webrtc { diff --git a/webrtc/voice_engine/statistics.h b/webrtc/voice_engine/statistics.h index 369a79a886..7d9582eee6 100644 --- a/webrtc/voice_engine/statistics.h +++ b/webrtc/voice_engine/statistics.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_VOICE_ENGINE_STATISTICS_H #define WEBRTC_VOICE_ENGINE_STATISTICS_H -#include "common_types.h" -#include "typedefs.h" -#include "voice_engine_defines.h" -#include "voe_errors.h" +#include "webrtc/common_types.h" +#include "webrtc/typedefs.h" +#include "webrtc/voice_engine/include/voe_errors.h" +#include "webrtc/voice_engine/voice_engine_defines.h" namespace webrtc { class CriticalSectionWrapper; diff --git a/webrtc/voice_engine/test/android/android_test/jni/android_test.cc b/webrtc/voice_engine/test/android/android_test/jni/android_test.cc index 146216a9aa..be682ad4b1 100644 --- a/webrtc/voice_engine/test/android/android_test/jni/android_test.cc +++ b/webrtc/voice_engine/test/android/android_test/jni/android_test.cc @@ -8,26 +8,26 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include #include #include #include -#include -#include "org_webrtc_voiceengine_test_AndroidTest.h" +#include "webrtc/voice_engine/test/android/android_test/jni/org_webrtc_voiceengine_test_AndroidTest.h" -#include "thread_wrapper.h" +#include "webrtc/system_wrappers/interface/thread_wrapper.h" -#include "voe_base.h" -#include "voe_codec.h" -#include "voe_file.h" -#include "voe_network.h" -#include "voe_audio_processing.h" -#include "voe_volume_control.h" -#include "voe_hardware.h" -#include "voe_rtp_rtcp.h" -#include "voe_encryption.h" +#include "webrtc/voice_engine/include/voe_audio_processing.h" +#include "webrtc/voice_engine/include/voe_base.h" +#include "webrtc/voice_engine/include/voe_codec.h" +#include "webrtc/voice_engine/include/voe_encryption.h" +#include "webrtc/voice_engine/include/voe_file.h" +#include "webrtc/voice_engine/include/voe_hardware.h" +#include "webrtc/voice_engine/include/voe_network.h" +#include "webrtc/voice_engine/include/voe_rtp_rtcp.h" +#include "webrtc/voice_engine/include/voe_volume_control.h" -#include "voe_test_interface.h" +#include "webrtc/voice_engine/test/auto_test/voe_test_interface.h" //#define INIT_FROM_THREAD //#define START_CALL_FROM_THREAD diff --git a/webrtc/voice_engine/test/auto_test/automated_mode.cc b/webrtc/voice_engine/test/auto_test/automated_mode.cc index 83d0c14d70..aa59e91441 100644 --- a/webrtc/voice_engine/test/auto_test/automated_mode.cc +++ b/webrtc/voice_engine/test/auto_test/automated_mode.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "gtest/gtest.h" -#include "test/testsupport/fileutils.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/testsupport/fileutils.h" void InitializeGoogleTest(int* argc, char** argv) { // Initialize WebRTC testing framework so paths to resources can be resolved. diff --git a/webrtc/voice_engine/test/auto_test/extended/agc_config_test.cc b/webrtc/voice_engine/test/auto_test/extended/agc_config_test.cc index ee7e0624b5..384fa1e9c3 100644 --- a/webrtc/voice_engine/test/auto_test/extended/agc_config_test.cc +++ b/webrtc/voice_engine/test/auto_test/extended/agc_config_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" class AgcConfigTest : public AfterStreamingFixture { protected: diff --git a/webrtc/voice_engine/test/auto_test/extended/ec_metrics_test.cc b/webrtc/voice_engine/test/auto_test/extended/ec_metrics_test.cc index 2d60d0d142..feb36ddc08 100644 --- a/webrtc/voice_engine/test/auto_test/extended/ec_metrics_test.cc +++ b/webrtc/voice_engine/test/auto_test/extended/ec_metrics_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" class EcMetricsTest : public AfterStreamingFixture { }; diff --git a/webrtc/voice_engine/test/auto_test/fakes/fake_external_transport.cc b/webrtc/voice_engine/test/auto_test/fakes/fake_external_transport.cc index a57f4df47c..ce416dd1ef 100644 --- a/webrtc/voice_engine/test/auto_test/fakes/fake_external_transport.cc +++ b/webrtc/voice_engine/test/auto_test/fakes/fake_external_transport.cc @@ -13,8 +13,8 @@ #include "webrtc/system_wrappers/interface/sleep.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h" #include "webrtc/voice_engine/include/voe_network.h" -#include "webrtc/voice_engine/voice_engine_defines.h" #include "webrtc/voice_engine/test/auto_test/fakes/fake_external_transport.h" +#include "webrtc/voice_engine/voice_engine_defines.h" FakeExternalTransport::FakeExternalTransport(webrtc::VoENetwork* ptr) : my_network_(ptr), diff --git a/webrtc/voice_engine/test/auto_test/fakes/fake_external_transport.h b/webrtc/voice_engine/test/auto_test/fakes/fake_external_transport.h index 25d34c7250..6d2c8285b2 100644 --- a/webrtc/voice_engine/test/auto_test/fakes/fake_external_transport.h +++ b/webrtc/voice_engine/test/auto_test/fakes/fake_external_transport.h @@ -10,7 +10,7 @@ #ifndef VOICE_ENGINE_MAIN_TEST_AUTO_TEST_FAKES_FAKE_EXTERNAL_TRANSPORT_H_ #define VOICE_ENGINE_MAIN_TEST_AUTO_TEST_FAKES_FAKE_EXTERNAL_TRANSPORT_H_ -#include "common_types.h" +#include "webrtc/common_types.h" namespace webrtc { class CriticalSectionWrapper; diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc index 52c180b23e..ede8b0d35a 100644 --- a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc +++ b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "after_initialization_fixture.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" class TestErrorObserver : public webrtc::VoiceEngineObserver { public: diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h index c5f05007c7..0a9f1dde5a 100644 --- a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h +++ b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h @@ -11,9 +11,9 @@ #ifndef SRC_VOICE_ENGINE_MAIN_TEST_AUTO_TEST_STANDARD_TEST_BASE_AFTER_INIT_H_ #define SRC_VOICE_ENGINE_MAIN_TEST_AUTO_TEST_STANDARD_TEST_BASE_AFTER_INIT_H_ -#include "before_initialization_fixture.h" -#include "scoped_ptr.h" #include "webrtc/common_types.h" +#include "webrtc/system_wrappers/interface/scoped_ptr.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h" class TestErrorObserver; diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc b/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc index 353888a6df..677dea6139 100644 --- a/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc +++ b/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "after_streaming_fixture.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" #include diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h b/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h index 26e37a7b2b..f9980e1135 100644 --- a/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h +++ b/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h @@ -11,8 +11,8 @@ #ifndef SRC_VOICE_ENGINE_MAIN_TEST_AUTO_TEST_STANDARD_AFTER_STREAMING_H_ #define SRC_VOICE_ENGINE_MAIN_TEST_AUTO_TEST_STANDARD_AFTER_STREAMING_H_ -#include "after_initialization_fixture.h" -#include "resource_manager.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" +#include "webrtc/voice_engine/test/auto_test/resource_manager.h" // This fixture will, in addition to the work done by its superclasses, // create a channel and start playing a file through the fake microphone diff --git a/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h b/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h index 22fb541f00..c1b0f38c61 100644 --- a/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h +++ b/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h @@ -13,24 +13,24 @@ #include -#include "common_types.h" -#include "engine_configurations.h" -#include "test/testsupport/gtest_disable.h" -#include "voice_engine/include/voe_audio_processing.h" -#include "voice_engine/include/voe_base.h" -#include "voice_engine/include/voe_call_report.h" -#include "voice_engine/include/voe_codec.h" -#include "voice_engine/include/voe_dtmf.h" -#include "voice_engine/include/voe_encryption.h" -#include "voice_engine/include/voe_errors.h" -#include "voice_engine/include/voe_external_media.h" -#include "voice_engine/include/voe_file.h" -#include "voice_engine/include/voe_hardware.h" -#include "voice_engine/include/voe_neteq_stats.h" -#include "voice_engine/include/voe_network.h" -#include "voice_engine/include/voe_rtp_rtcp.h" -#include "voice_engine/include/voe_video_sync.h" -#include "voice_engine/include/voe_volume_control.h" +#include "webrtc/common_types.h" +#include "webrtc/engine_configurations.h" +#include "webrtc/test/testsupport/gtest_disable.h" +#include "webrtc/voice_engine/include/voe_audio_processing.h" +#include "webrtc/voice_engine/include/voe_base.h" +#include "webrtc/voice_engine/include/voe_call_report.h" +#include "webrtc/voice_engine/include/voe_codec.h" +#include "webrtc/voice_engine/include/voe_dtmf.h" +#include "webrtc/voice_engine/include/voe_encryption.h" +#include "webrtc/voice_engine/include/voe_errors.h" +#include "webrtc/voice_engine/include/voe_external_media.h" +#include "webrtc/voice_engine/include/voe_file.h" +#include "webrtc/voice_engine/include/voe_hardware.h" +#include "webrtc/voice_engine/include/voe_neteq_stats.h" +#include "webrtc/voice_engine/include/voe_network.h" +#include "webrtc/voice_engine/include/voe_rtp_rtcp.h" +#include "webrtc/voice_engine/include/voe_video_sync.h" +#include "webrtc/voice_engine/include/voe_volume_control.h" #include "webrtc/voice_engine/test/auto_test/voe_test_common.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/webrtc/voice_engine/test/auto_test/fuzz/rtp_fuzz_test.cc b/webrtc/voice_engine/test/auto_test/fuzz/rtp_fuzz_test.cc index f18d5e1a38..dab693f702 100644 --- a/webrtc/voice_engine/test/auto_test/fuzz/rtp_fuzz_test.cc +++ b/webrtc/voice_engine/test/auto_test/fuzz/rtp_fuzz_test.cc @@ -10,8 +10,8 @@ #include -#include "test/libtest/include/bit_flip_encryption.h" -#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" +#include "webrtc/test/libtest/include/bit_flip_encryption.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" class RtpFuzzTest : public AfterStreamingFixture { protected: diff --git a/webrtc/voice_engine/test/auto_test/resource_manager.cc b/webrtc/voice_engine/test/auto_test/resource_manager.cc index 18213f9199..a80d71a2c8 100644 --- a/webrtc/voice_engine/test/auto_test/resource_manager.cc +++ b/webrtc/voice_engine/test/auto_test/resource_manager.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "resource_manager.h" +#include "webrtc/voice_engine/test/auto_test/resource_manager.h" -#include "testsupport/fileutils.h" +#include "webrtc/test/testsupport/fileutils.h" ResourceManager::ResourceManager() { std::string filename = "audio_long16.pcm"; @@ -26,4 +26,3 @@ ResourceManager::ResourceManager() { } #endif } - diff --git a/webrtc/voice_engine/test/auto_test/standard/audio_processing_test.cc b/webrtc/voice_engine/test/auto_test/standard/audio_processing_test.cc index fc759b0b08..132caa3e91 100644 --- a/webrtc/voice_engine/test/auto_test/standard/audio_processing_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/audio_processing_test.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testsupport/fileutils.h" -#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" -#include "voice_engine/test/auto_test/voe_standard_test.h" +#include "webrtc/test/testsupport/fileutils.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" +#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h" class RxCallback : public webrtc::VoERxVadCallback { public: diff --git a/webrtc/voice_engine/test/auto_test/standard/call_report_test.cc b/webrtc/voice_engine/test/auto_test/standard/call_report_test.cc index d6b2e64570..26df80bc0f 100644 --- a/webrtc/voice_engine/test/auto_test/standard/call_report_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/call_report_test.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "after_streaming_fixture.h" -#include "testsupport/fileutils.h" +#include "webrtc/test/testsupport/fileutils.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" class CallReportTest : public AfterStreamingFixture { }; diff --git a/webrtc/voice_engine/test/auto_test/standard/codec_before_streaming_test.cc b/webrtc/voice_engine/test/auto_test/standard/codec_before_streaming_test.cc index 6d902efec6..66c00d459a 100644 --- a/webrtc/voice_engine/test/auto_test/standard/codec_before_streaming_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/codec_before_streaming_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "after_initialization_fixture.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" class CodecBeforeStreamingTest : public AfterInitializationFixture { protected: diff --git a/webrtc/voice_engine/test/auto_test/standard/codec_test.cc b/webrtc/voice_engine/test/auto_test/standard/codec_test.cc index 50c1f2fb63..211bb6f9b4 100644 --- a/webrtc/voice_engine/test/auto_test/standard/codec_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/codec_test.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "after_streaming_fixture.h" -#include "voice_engine_defines.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" +#include "webrtc/voice_engine/voice_engine_defines.h" class CodecTest : public AfterStreamingFixture { protected: diff --git a/webrtc/voice_engine/test/auto_test/standard/dtmf_test.cc b/webrtc/voice_engine/test/auto_test/standard/dtmf_test.cc index b1b1666528..1eaa6e240a 100644 --- a/webrtc/voice_engine/test/auto_test/standard/dtmf_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/dtmf_test.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "after_streaming_fixture.h" -#include "voice_engine_defines.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" +#include "webrtc/voice_engine/voice_engine_defines.h" class DtmfTest : public AfterStreamingFixture { protected: diff --git a/webrtc/voice_engine/test/auto_test/standard/encryption_test.cc b/webrtc/voice_engine/test/auto_test/standard/encryption_test.cc index 93161fb4f0..bf54deb251 100644 --- a/webrtc/voice_engine/test/auto_test/standard/encryption_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/encryption_test.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voice_engine/include/voe_encryption.h" -#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" +#include "webrtc/voice_engine/include/voe_encryption.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" class BasicBitInverseEncryption : public webrtc::Encryption { void encrypt(int channel_no, unsigned char* in_data, diff --git a/webrtc/voice_engine/test/auto_test/standard/external_media_test.cc b/webrtc/voice_engine/test/auto_test/standard/external_media_test.cc index dcbd05ee4c..7d246d12d2 100644 --- a/webrtc/voice_engine/test/auto_test/standard/external_media_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/external_media_test.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/interface/module_common_types.h" -#include "voice_engine/include/voe_external_media.h" -#include "voice_engine/test/auto_test/fakes/fake_media_process.h" -#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/voice_engine/include/voe_external_media.h" +#include "webrtc/voice_engine/test/auto_test/fakes/fake_media_process.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" class ExternalMediaTest : public AfterStreamingFixture { protected: diff --git a/webrtc/voice_engine/test/auto_test/standard/file_before_streaming_test.cc b/webrtc/voice_engine/test/auto_test/standard/file_before_streaming_test.cc index 5a10d720b1..96ac03c530 100644 --- a/webrtc/voice_engine/test/auto_test/standard/file_before_streaming_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/file_before_streaming_test.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "after_initialization_fixture.h" -#include "test/testsupport/fileutils.h" +#include "webrtc/test/testsupport/fileutils.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" namespace { diff --git a/webrtc/voice_engine/test/auto_test/standard/file_test.cc b/webrtc/voice_engine/test/auto_test/standard/file_test.cc index 99380e6da2..5ccc5d2de3 100644 --- a/webrtc/voice_engine/test/auto_test/standard/file_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/file_test.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" -#include "voice_engine/test/auto_test/voe_standard_test.h" -#include "test/testsupport/fileutils.h" +#include "webrtc/test/testsupport/fileutils.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" +#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h" class FileTest : public AfterStreamingFixture { diff --git a/webrtc/voice_engine/test/auto_test/standard/hardware_before_initializing_test.cc b/webrtc/voice_engine/test/auto_test/standard/hardware_before_initializing_test.cc index 540614e831..976b805a4e 100644 --- a/webrtc/voice_engine/test/auto_test/standard/hardware_before_initializing_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/hardware_before_initializing_test.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "common_types.h" -#include "before_initialization_fixture.h" +#include "webrtc/common_types.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h" using namespace webrtc; diff --git a/webrtc/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc b/webrtc/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc index 6136543b76..95d4c33ec1 100644 --- a/webrtc/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc @@ -10,7 +10,7 @@ #include -#include "after_initialization_fixture.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" using namespace webrtc; diff --git a/webrtc/voice_engine/test/auto_test/standard/hardware_test.cc b/webrtc/voice_engine/test/auto_test/standard/hardware_test.cc index 1d9dfa2704..1a7aa27b04 100644 --- a/webrtc/voice_engine/test/auto_test/standard/hardware_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/hardware_test.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "after_streaming_fixture.h" -#include "modules/audio_device/include/audio_device.h" +#include "webrtc/modules/audio_device/include/audio_device.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" class HardwareTest : public AfterStreamingFixture { }; diff --git a/webrtc/voice_engine/test/auto_test/standard/manual_hold_test.cc b/webrtc/voice_engine/test/auto_test/standard/manual_hold_test.cc index 68f28b4cf5..00d6bce21d 100644 --- a/webrtc/voice_engine/test/auto_test/standard/manual_hold_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/manual_hold_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "after_streaming_fixture.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" // Note: This class includes sleeps and requires manual verification. class ManualHoldTest : public AfterStreamingFixture { diff --git a/webrtc/voice_engine/test/auto_test/standard/mixing_test.cc b/webrtc/voice_engine/test/auto_test/standard/mixing_test.cc index 6f0fe3375e..8300b70350 100644 --- a/webrtc/voice_engine/test/auto_test/standard/mixing_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/mixing_test.cc @@ -12,8 +12,8 @@ #include -#include "after_initialization_fixture.h" -#include "test/testsupport/fileutils.h" +#include "webrtc/test/testsupport/fileutils.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" namespace webrtc { namespace { diff --git a/webrtc/voice_engine/test/auto_test/standard/neteq_stats_test.cc b/webrtc/voice_engine/test/auto_test/standard/neteq_stats_test.cc index 2809090bf2..c9a913510b 100644 --- a/webrtc/voice_engine/test/auto_test/standard/neteq_stats_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/neteq_stats_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" class NetEQStatsTest : public AfterStreamingFixture { }; diff --git a/webrtc/voice_engine/test/auto_test/standard/neteq_test.cc b/webrtc/voice_engine/test/auto_test/standard/neteq_test.cc index a50cc94b7c..9a40b79a86 100644 --- a/webrtc/voice_engine/test/auto_test/standard/neteq_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/neteq_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "after_streaming_fixture.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" class NetEQTest : public AfterStreamingFixture { protected: diff --git a/webrtc/voice_engine/test/auto_test/standard/network_test.cc b/webrtc/voice_engine/test/auto_test/standard/network_test.cc index f4713dc100..1c83799cc2 100644 --- a/webrtc/voice_engine/test/auto_test/standard/network_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/network_test.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voice_engine/test/auto_test/fakes/fake_external_transport.h" -#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" -#include "voice_engine/test/auto_test/voe_test_interface.h" -#include "voice_engine/test/auto_test/voe_standard_test.h" -#include "voice_engine/include/mock/mock_voe_connection_observer.h" -#include "voice_engine/include/mock/mock_voe_observer.h" +#include "webrtc/voice_engine/include/mock/mock_voe_connection_observer.h" +#include "webrtc/voice_engine/include/mock/mock_voe_observer.h" +#include "webrtc/voice_engine/test/auto_test/fakes/fake_external_transport.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" +#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h" +#include "webrtc/voice_engine/test/auto_test/voe_test_interface.h" static const int kDefaultRtpPort = 8000; static const int kDefaultRtcpPort = 8001; diff --git a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_before_streaming_test.cc b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_before_streaming_test.cc index 5532bbff2b..24ffc90c8d 100644 --- a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_before_streaming_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_before_streaming_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "after_initialization_fixture.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" using namespace webrtc; using namespace testing; diff --git a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc index 540c24b78b..810cb140f7 100644 --- a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "test/testsupport/fileutils.h" -#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" -#include "voice_engine/test/auto_test/voe_standard_test.h" +#include "webrtc/test/testsupport/fileutils.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" +#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h" class TestRtpObserver : public webrtc::VoERTPObserver { public: diff --git a/webrtc/voice_engine/test/auto_test/standard/video_sync_test.cc b/webrtc/voice_engine/test/auto_test/standard/video_sync_test.cc index 31e37191e1..2bf9095106 100644 --- a/webrtc/voice_engine/test/auto_test/standard/video_sync_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/video_sync_test.cc @@ -12,7 +12,7 @@ #include #include -#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" #ifdef WEBRTC_IOS const int kMinimumReasonableDelayEstimateMs = 30; diff --git a/webrtc/voice_engine/test/auto_test/standard/voe_base_misc_test.cc b/webrtc/voice_engine/test/auto_test/standard/voe_base_misc_test.cc index 7c4492b57f..5d11af3c96 100644 --- a/webrtc/voice_engine/test/auto_test/standard/voe_base_misc_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/voe_base_misc_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voice_engine/test/auto_test/fixtures/before_initialization_fixture.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h" #include diff --git a/webrtc/voice_engine/test/auto_test/standard/volume_test.cc b/webrtc/voice_engine/test/auto_test/standard/volume_test.cc index d7b192fc64..4b9993cdca 100644 --- a/webrtc/voice_engine/test/auto_test/standard/volume_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/volume_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "after_streaming_fixture.h" +#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" namespace { diff --git a/webrtc/voice_engine/test/auto_test/voe_cpu_test.cc b/webrtc/voice_engine/test/auto_test/voe_cpu_test.cc index 0836e8e3c7..1367ddcda3 100644 --- a/webrtc/voice_engine/test/auto_test/voe_cpu_test.cc +++ b/webrtc/voice_engine/test/auto_test/voe_cpu_test.cc @@ -8,12 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voe_cpu_test.h" +#include "webrtc/voice_engine/test/auto_test/voe_cpu_test.h" #include #include #include -#include #if defined(_WIN32) #include #endif diff --git a/webrtc/voice_engine/test/auto_test/voe_cpu_test.h b/webrtc/voice_engine/test/auto_test/voe_cpu_test.h index f8830756ed..92d30c8577 100644 --- a/webrtc/voice_engine/test/auto_test/voe_cpu_test.h +++ b/webrtc/voice_engine/test/auto_test/voe_cpu_test.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_CPU_TEST_H #define WEBRTC_VOICE_ENGINE_VOE_CPU_TEST_H -#include "voe_standard_test.h" +#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h" namespace voetest { diff --git a/webrtc/voice_engine/test/auto_test/voe_extended_test.cc b/webrtc/voice_engine/test/auto_test/voe_extended_test.cc index 04628dacf8..bb2838ec52 100644 --- a/webrtc/voice_engine/test/auto_test/voe_extended_test.cc +++ b/webrtc/voice_engine/test/auto_test/voe_extended_test.cc @@ -15,8 +15,8 @@ #include #include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/voice_engine/voice_engine_defines.h" #include "webrtc/voice_engine/test/auto_test/voe_test_defines.h" +#include "webrtc/voice_engine/voice_engine_defines.h" #if defined(_WIN32) #include diff --git a/webrtc/voice_engine/test/auto_test/voe_extended_test.h b/webrtc/voice_engine/test/auto_test/voe_extended_test.h index 403788905f..f0a62b5ad2 100644 --- a/webrtc/voice_engine/test/auto_test/voe_extended_test.h +++ b/webrtc/voice_engine/test/auto_test/voe_extended_test.h @@ -11,15 +11,15 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_EXTENDED_TEST_H #define WEBRTC_VOICE_ENGINE_VOE_EXTENDED_TEST_H -#include "voe_standard_test.h" #include "webrtc/modules/audio_device/include/audio_device.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/event_wrapper.h" #include "webrtc/system_wrappers/interface/ref_count.h" +#include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/sleep.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h" -#include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/test/channel_transport/include/channel_transport.h" +#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h" namespace voetest { diff --git a/webrtc/voice_engine/test/auto_test/voe_standard_test.cc b/webrtc/voice_engine/test/auto_test/voe_standard_test.cc index 06e75f26b2..751cd8e179 100644 --- a/webrtc/voice_engine/test/auto_test/voe_standard_test.cc +++ b/webrtc/voice_engine/test/auto_test/voe_standard_test.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voice_engine/test/auto_test/voe_standard_test.h" +#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h" #include #include -#include "engine_configurations.h" -#include "system_wrappers/interface/event_wrapper.h" -#include "voice_engine/include/voe_neteq_stats.h" -#include "voice_engine/test/auto_test/automated_mode.h" -#include "voice_engine/test/auto_test/voe_cpu_test.h" -#include "voice_engine/test/auto_test/voe_extended_test.h" -#include "voice_engine/test/auto_test/voe_stress_test.h" -#include "voice_engine/test/auto_test/voe_test_defines.h" -#include "voice_engine/test/auto_test/voe_unit_test.h" -#include "voice_engine/voice_engine_defines.h" +#include "webrtc/engine_configurations.h" +#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/voice_engine/include/voe_neteq_stats.h" +#include "webrtc/voice_engine/test/auto_test/automated_mode.h" +#include "webrtc/voice_engine/test/auto_test/voe_cpu_test.h" +#include "webrtc/voice_engine/test/auto_test/voe_extended_test.h" +#include "webrtc/voice_engine/test/auto_test/voe_stress_test.h" +#include "webrtc/voice_engine/test/auto_test/voe_test_defines.h" +#include "webrtc/voice_engine/test/auto_test/voe_unit_test.h" +#include "webrtc/voice_engine/voice_engine_defines.h" DEFINE_bool(include_timing_dependent_tests, true, "If true, we will include tests / parts of tests that are known " diff --git a/webrtc/voice_engine/test/auto_test/voe_standard_test.h b/webrtc/voice_engine/test/auto_test/voe_standard_test.h index df03e63b3e..417004735c 100644 --- a/webrtc/voice_engine/test/auto_test/voe_standard_test.h +++ b/webrtc/voice_engine/test/auto_test/voe_standard_test.h @@ -15,36 +15,36 @@ #include #include "gflags/gflags.h" -#include "resource_manager.h" -#include "voe_audio_processing.h" -#include "voe_base.h" -#include "voe_dtmf.h" -#include "voe_errors.h" -#include "voe_file.h" -#include "voe_rtp_rtcp.h" -#include "voe_test_common.h" -#include "voe_test_interface.h" +#include "webrtc/voice_engine/include/voe_audio_processing.h" +#include "webrtc/voice_engine/include/voe_base.h" +#include "webrtc/voice_engine/include/voe_dtmf.h" +#include "webrtc/voice_engine/include/voe_errors.h" +#include "webrtc/voice_engine/include/voe_file.h" +#include "webrtc/voice_engine/include/voe_rtp_rtcp.h" +#include "webrtc/voice_engine/test/auto_test/resource_manager.h" +#include "webrtc/voice_engine/test/auto_test/voe_test_common.h" +#include "webrtc/voice_engine/test/auto_test/voe_test_interface.h" #ifdef WEBRTC_VOICE_ENGINE_CALL_REPORT_API -#include "voe_call_report.h" +#include "webrtc/voice_engine/include/voe_call_report.h" #endif #ifdef WEBRTC_VOICE_ENGINE_CODEC_API -#include "voe_codec.h" +#include "webrtc/voice_engine/include/voe_codec.h" #endif #ifdef WEBRTC_VOICE_ENGINE_ENCRYPTION_API -#include "voe_encryption.h" +#include "webrtc/voice_engine/include/voe_encryption.h" #endif #ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API -#include "voe_external_media.h" +#include "webrtc/voice_engine/include/voe_external_media.h" #endif #ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API -#include "voe_hardware.h" +#include "webrtc/voice_engine/include/voe_hardware.h" #endif -#include "voe_network.h" +#include "webrtc/voice_engine/include/voe_network.h" #ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API -#include "voe_video_sync.h" +#include "webrtc/voice_engine/include/voe_video_sync.h" #endif #ifdef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API -#include "voe_volume_control.h" +#include "webrtc/voice_engine/include/voe_volume_control.h" #endif #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API diff --git a/webrtc/voice_engine/test/auto_test/voe_stress_test.cc b/webrtc/voice_engine/test/auto_test/voe_stress_test.cc index 3c0bc8a830..b79c193511 100644 --- a/webrtc/voice_engine/test/auto_test/voe_stress_test.cc +++ b/webrtc/voice_engine/test/auto_test/voe_stress_test.cc @@ -13,11 +13,11 @@ // How much trace should we have enabled? // API error counter, to print info and return -1 if any error. -#include +#include #include +#include #include #include -#include #if defined(_WIN32) #include #endif @@ -52,13 +52,6 @@ namespace voetest { #define PAUSE_OR_SLEEP(x) SleepMs(x); #endif -const char* VoEStressTest::_key = "====YUtFWRAAAAADBtIHgAAAAAEAAAAcAAAAAQBHU0ds" - "b2JhbCBJUCBTb3VuZAAC\nAAAAIwAAAExpY2Vuc2VkIHRvIE5vcnRlbCBOZXR3cm9rcwAAAAA" - "xAAAAZxZ7/u0M\niFYyTwSwko5Uutf7mh8S0O4rYZYTFidbzQeuGonuL17F/2oD/2pfDp3jL4" - "Rf3z/A\nnlJsEJgEtASkDNFuwLILjGY0pzjjAYQp3pCl6z6k2MtE06AirdjGLYCjENpq/opX" - "\nOrs3sIuwdYK5va/aFcsjBDmlsGCUM48RDYG9s23bIHYafXUC4ofOaubbZPWiPTmL\nEVJ8WH" - "4F9pgNjALc14oJXfON7r/3\n=EsLx"; - int VoEStressTest::DoTest() { int test(-1); while (test != 0) { diff --git a/webrtc/voice_engine/test/auto_test/voe_stress_test.h b/webrtc/voice_engine/test/auto_test/voe_stress_test.h index b3a418c7b4..ae3da2fbcf 100644 --- a/webrtc/voice_engine/test/auto_test/voe_stress_test.h +++ b/webrtc/voice_engine/test/auto_test/voe_stress_test.h @@ -40,7 +40,6 @@ class VoEStressTest { bool ProcessExtraApi(); VoETestManager& _mgr; - static const char* _key; ThreadWrapper* _ptrExtraApiThread; }; diff --git a/webrtc/voice_engine/test/auto_test/voe_test_defines.h b/webrtc/voice_engine/test/auto_test/voe_test_defines.h index 98297c9b41..f53f3a9818 100644 --- a/webrtc/voice_engine/test/auto_test/voe_test_defines.h +++ b/webrtc/voice_engine/test/auto_test/voe_test_defines.h @@ -14,7 +14,7 @@ #include "webrtc/voice_engine/test/auto_test/voe_test_common.h" // Read WEBRTC_VOICE_ENGINE_XXX_API compiler flags -#include "engine_configurations.h" +#include "webrtc/engine_configurations.h" // Select the tests to execute, list order below is same as they will be // executed. Note that, all settings below will be overriden by sub-API diff --git a/webrtc/voice_engine/test/auto_test/voe_test_interface.h b/webrtc/voice_engine/test/auto_test/voe_test_interface.h index 9926f1ebfe..dd109dcb0a 100644 --- a/webrtc/voice_engine/test/auto_test/voe_test_interface.h +++ b/webrtc/voice_engine/test/auto_test/voe_test_interface.h @@ -15,7 +15,7 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_TEST_INTERFACE_H #define WEBRTC_VOICE_ENGINE_VOE_TEST_INTERFACE_H -#include "common_types.h" +#include "webrtc/common_types.h" namespace voetest { // TODO(andrew): Using directives not permitted. diff --git a/webrtc/voice_engine/test/auto_test/voe_unit_test.cc b/webrtc/voice_engine/test/auto_test/voe_unit_test.cc index bc03446558..b092ae32be 100644 --- a/webrtc/voice_engine/test/auto_test/voe_unit_test.cc +++ b/webrtc/voice_engine/test/auto_test/voe_unit_test.cc @@ -10,20 +10,20 @@ #include "webrtc/voice_engine/test/auto_test/voe_unit_test.h" +#include #include #include #include -#include #if defined(_WIN32) #include #endif -#include "webrtc/system_wrappers/interface/thread_wrapper.h" #include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/interface/thread_wrapper.h" #include "webrtc/test/testsupport/fileutils.h" -#include "webrtc/voice_engine/voice_engine_defines.h" -#include "webrtc/voice_engine/test/auto_test/voe_test_defines.h" #include "webrtc/voice_engine/test/auto_test/fakes/fake_media_process.h" +#include "webrtc/voice_engine/test/auto_test/voe_test_defines.h" +#include "webrtc/voice_engine/voice_engine_defines.h" using namespace webrtc; using namespace test; diff --git a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc index aed430e742..7a6e512b5e 100644 --- a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc +++ b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc @@ -17,25 +17,25 @@ #include -#include "gtest/gtest.h" -#include "voe_errors.h" -#include "voe_base.h" -#include "voe_codec.h" -#include "voe_volume_control.h" -#include "voe_dtmf.h" -#include "voe_rtp_rtcp.h" -#include "voe_audio_processing.h" -#include "voe_file.h" -#include "voe_video_sync.h" -#include "voe_encryption.h" -#include "voe_hardware.h" -#include "voe_external_media.h" -#include "voe_network.h" -#include "voe_neteq_stats.h" -#include "engine_configurations.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/engine_configurations.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/test/channel_transport/include/channel_transport.h" #include "webrtc/test/testsupport/fileutils.h" +#include "webrtc/voice_engine/include/voe_audio_processing.h" +#include "webrtc/voice_engine/include/voe_base.h" +#include "webrtc/voice_engine/include/voe_codec.h" +#include "webrtc/voice_engine/include/voe_dtmf.h" +#include "webrtc/voice_engine/include/voe_encryption.h" +#include "webrtc/voice_engine/include/voe_errors.h" +#include "webrtc/voice_engine/include/voe_external_media.h" +#include "webrtc/voice_engine/include/voe_file.h" +#include "webrtc/voice_engine/include/voe_hardware.h" +#include "webrtc/voice_engine/include/voe_neteq_stats.h" +#include "webrtc/voice_engine/include/voe_network.h" +#include "webrtc/voice_engine/include/voe_rtp_rtcp.h" +#include "webrtc/voice_engine/include/voe_video_sync.h" +#include "webrtc/voice_engine/include/voe_volume_control.h" using namespace webrtc; using namespace test; diff --git a/webrtc/voice_engine/test/win_test/WinTest.cc b/webrtc/voice_engine/test/win_test/WinTest.cc index e0e0248303..6b28ba47a4 100644 --- a/webrtc/voice_engine/test/win_test/WinTest.cc +++ b/webrtc/voice_engine/test/win_test/WinTest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "stdafx.h" -#include "WinTest.h" -#include "WinTestDlg.h" +#include "webrtc/voice_engine/test/win_test/WinTest.h" +#include "webrtc/voice_engine/test/win_test/WinTestDlg.h" +#include "webrtc/voice_engine/test/win_test/stdafx.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/webrtc/voice_engine/test/win_test/WinTestDlg.cc b/webrtc/voice_engine/test/win_test/WinTestDlg.cc index 67da771d4d..506abfa261 100644 --- a/webrtc/voice_engine/test/win_test/WinTestDlg.cc +++ b/webrtc/voice_engine/test/win_test/WinTestDlg.cc @@ -9,10 +9,10 @@ */ #include -#include "stdafx.h" -#include "WinTest.h" -#include "WinTestDlg.h" -#include "testsupport/fileutils.h" +#include "webrtc/test/testsupport/fileutils.h" +#include "webrtc/voice_engine/test/win_test/WinTest.h" +#include "webrtc/voice_engine/test/win_test/WinTestDlg.h" +#include "webrtc/voice_engine/test/win_test/stdafx.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -3585,4 +3585,3 @@ void CWinTestDlg::OnBnClickedButtonTest1() { // add tests here... } - diff --git a/webrtc/voice_engine/test/win_test/WinTestDlg.h b/webrtc/voice_engine/test/win_test/WinTestDlg.h index 89eb8c2c20..5c7f5b6cb7 100644 --- a/webrtc/voice_engine/test/win_test/WinTestDlg.h +++ b/webrtc/voice_engine/test/win_test/WinTestDlg.h @@ -80,21 +80,21 @@ #include -#include "voe_base.h" -#include "voe_rtp_rtcp.h" -#include "voe_codec.h" -#include "voe_dtmf.h" -#include "voe_encryption.h" -#include "voe_external_media.h" -#include "voe_file.h" -#include "voe_hardware.h" -#include "voe_network.h" -#include "voe_video_sync.h" -#include "voe_volume_control.h" +#include "webrtc/voice_engine/include/voe_base.h" +#include "webrtc/voice_engine/include/voe_codec.h" +#include "webrtc/voice_engine/include/voe_dtmf.h" +#include "webrtc/voice_engine/include/voe_encryption.h" +#include "webrtc/voice_engine/include/voe_external_media.h" +#include "webrtc/voice_engine/include/voe_file.h" +#include "webrtc/voice_engine/include/voe_hardware.h" +#include "webrtc/voice_engine/include/voe_network.h" +#include "webrtc/voice_engine/include/voe_rtp_rtcp.h" +#include "webrtc/voice_engine/include/voe_video_sync.h" +#include "webrtc/voice_engine/include/voe_volume_control.h" -#include "voe_audio_processing.h" -#include "voe_rtp_rtcp.h" -#include "voe_errors.h" +#include "webrtc/voice_engine/include/voe_audio_processing.h" +#include "webrtc/voice_engine/include/voe_errors.h" +#include "webrtc/voice_engine/include/voe_rtp_rtcp.h" class MediaProcessImpl; class ConnectionObserver; diff --git a/webrtc/voice_engine/test/win_test/stdafx.cc b/webrtc/voice_engine/test/win_test/stdafx.cc index 6cdb906eab..e321601295 100644 --- a/webrtc/voice_engine/test/win_test/stdafx.cc +++ b/webrtc/voice_engine/test/win_test/stdafx.cc @@ -12,6 +12,4 @@ // WinTest.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" - - +#include "webrtc/voice_engine/test/win_test/stdafx.h" diff --git a/webrtc/voice_engine/transmit_mixer_unittest.cc b/webrtc/voice_engine/transmit_mixer_unittest.cc index 8b28ec4940..5fb982b1fc 100644 --- a/webrtc/voice_engine/transmit_mixer_unittest.cc +++ b/webrtc/voice_engine/transmit_mixer_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voice_engine/transmit_mixer.h" +#include "webrtc/voice_engine/transmit_mixer.h" -#include "gtest/gtest.h" -#include "voice_engine/include/voe_external_media.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/voice_engine/include/voe_external_media.h" namespace webrtc { namespace voe { diff --git a/webrtc/voice_engine/utility.cc b/webrtc/voice_engine/utility.cc index 6615caf926..5bd87f83ae 100644 --- a/webrtc/voice_engine/utility.cc +++ b/webrtc/voice_engine/utility.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "utility.h" +#include "webrtc/voice_engine/utility.h" -#include "module.h" -#include "trace.h" -#include "signal_processing_library.h" +#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "webrtc/modules/interface/module.h" +#include "webrtc/system_wrappers/interface/trace.h" namespace webrtc { diff --git a/webrtc/voice_engine/utility.h b/webrtc/voice_engine/utility.h index 50172378f2..b51dc035b7 100644 --- a/webrtc/voice_engine/utility.h +++ b/webrtc/voice_engine/utility.h @@ -15,8 +15,8 @@ #ifndef WEBRTC_VOICE_ENGINE_UTILITY_H #define WEBRTC_VOICE_ENGINE_UTILITY_H -#include "typedefs.h" -#include "voice_engine_defines.h" +#include "webrtc/typedefs.h" +#include "webrtc/voice_engine/voice_engine_defines.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_audio_processing_impl.cc b/webrtc/voice_engine/voe_audio_processing_impl.cc index 71a1904f52..5908ef134f 100644 --- a/webrtc/voice_engine/voe_audio_processing_impl.cc +++ b/webrtc/voice_engine/voe_audio_processing_impl.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voe_audio_processing_impl.h" +#include "webrtc/voice_engine/voe_audio_processing_impl.h" -#include "audio_processing.h" -#include "channel.h" -#include "critical_section_wrapper.h" -#include "logging.h" -#include "trace.h" -#include "transmit_mixer.h" -#include "voe_errors.h" -#include "voice_engine_impl.h" +#include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/voice_engine/channel.h" +#include "webrtc/voice_engine/include/voe_errors.h" +#include "webrtc/voice_engine/transmit_mixer.h" +#include "webrtc/voice_engine/voice_engine_impl.h" // TODO(andrew): move to a common place. #define WEBRTC_VOICE_INIT_CHECK() \ diff --git a/webrtc/voice_engine/voe_audio_processing_impl.h b/webrtc/voice_engine/voe_audio_processing_impl.h index 8686b3cf50..562e8ba735 100644 --- a/webrtc/voice_engine/voe_audio_processing_impl.h +++ b/webrtc/voice_engine/voe_audio_processing_impl.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_AUDIO_PROCESSING_IMPL_H #define WEBRTC_VOICE_ENGINE_VOE_AUDIO_PROCESSING_IMPL_H -#include "voe_audio_processing.h" +#include "webrtc/voice_engine/include/voe_audio_processing.h" -#include "shared_data.h" +#include "webrtc/voice_engine/shared_data.h" namespace webrtc { @@ -110,4 +110,3 @@ class VoEAudioProcessingImpl : public VoEAudioProcessing { } // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_AUDIO_PROCESSING_IMPL_H - diff --git a/webrtc/voice_engine/voe_audio_processing_unittest.cc b/webrtc/voice_engine/voe_audio_processing_unittest.cc index 8c66d88781..8916ef1cd5 100644 --- a/webrtc/voice_engine/voe_audio_processing_unittest.cc +++ b/webrtc/voice_engine/voe_audio_processing_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voice_engine/include/voe_audio_processing.h" +#include "webrtc/voice_engine/include/voe_audio_processing.h" -#include "gtest/gtest.h" -#include "voice_engine/include/voe_base.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/voice_engine/include/voe_base.h" namespace webrtc { namespace voe { diff --git a/webrtc/voice_engine/voe_base_impl.cc b/webrtc/voice_engine/voe_base_impl.cc index 1b14be72f4..09f22d44b2 100644 --- a/webrtc/voice_engine/voe_base_impl.cc +++ b/webrtc/voice_engine/voe_base_impl.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voe_base_impl.h" +#include "webrtc/voice_engine/voe_base_impl.h" -#include "audio_coding_module.h" -#include "audio_processing.h" -#include "channel.h" -#include "critical_section_wrapper.h" -#include "file_wrapper.h" -#include "modules/audio_device/audio_device_impl.h" -#include "output_mixer.h" -#include "signal_processing_library.h" -#include "trace.h" -#include "transmit_mixer.h" -#include "utility.h" -#include "voe_errors.h" -#include "voice_engine_impl.h" +#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" +#include "webrtc/modules/audio_device/audio_device_impl.h" +#include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/file_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/voice_engine/channel.h" +#include "webrtc/voice_engine/include/voe_errors.h" +#include "webrtc/voice_engine/output_mixer.h" +#include "webrtc/voice_engine/transmit_mixer.h" +#include "webrtc/voice_engine/utility.h" +#include "webrtc/voice_engine/voice_engine_impl.h" #if (defined(_WIN32) && defined(_DLL) && (_MSC_VER == 1400)) // Fix for VS 2005 MD/MDd link problem diff --git a/webrtc/voice_engine/voe_base_impl.h b/webrtc/voice_engine/voe_base_impl.h index 230e750e11..fbd9092c35 100644 --- a/webrtc/voice_engine/voe_base_impl.h +++ b/webrtc/voice_engine/voe_base_impl.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H #define WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H -#include "voe_base.h" +#include "webrtc/voice_engine/include/voe_base.h" -#include "module_common_types.h" -#include "shared_data.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/voice_engine/shared_data.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_base_unittest.cc b/webrtc/voice_engine/voe_base_unittest.cc index 144c8417c9..6057534d04 100644 --- a/webrtc/voice_engine/voe_base_unittest.cc +++ b/webrtc/voice_engine/voe_base_unittest.cc @@ -11,8 +11,8 @@ #include "webrtc/voice_engine/include/voe_base.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_device/include/fake_audio_device.h" +#include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_call_report_impl.cc b/webrtc/voice_engine/voe_call_report_impl.cc index 8eaf725a95..9f3177d868 100644 --- a/webrtc/voice_engine/voe_call_report_impl.cc +++ b/webrtc/voice_engine/voe_call_report_impl.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voe_call_report_impl.h" +#include "webrtc/voice_engine/voe_call_report_impl.h" -#include "audio_processing.h" -#include "channel.h" -#include "critical_section_wrapper.h" -#include "file_wrapper.h" -#include "trace.h" -#include "voe_errors.h" -#include "voice_engine_impl.h" +#include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/file_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/voice_engine/channel.h" +#include "webrtc/voice_engine/include/voe_errors.h" +#include "webrtc/voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_call_report_impl.h b/webrtc/voice_engine/voe_call_report_impl.h index fcc708a838..e8b81f2242 100644 --- a/webrtc/voice_engine/voe_call_report_impl.h +++ b/webrtc/voice_engine/voe_call_report_impl.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_CALL_REPORT_IMPL_H #define WEBRTC_VOICE_ENGINE_VOE_CALL_REPORT_IMPL_H -#include "voe_call_report.h" +#include "webrtc/voice_engine/include/voe_call_report.h" -#include "shared_data.h" +#include "webrtc/voice_engine/shared_data.h" namespace webrtc diff --git a/webrtc/voice_engine/voe_codec_impl.cc b/webrtc/voice_engine/voe_codec_impl.cc index 4df97c3ee2..0cc4e025e0 100644 --- a/webrtc/voice_engine/voe_codec_impl.cc +++ b/webrtc/voice_engine/voe_codec_impl.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voe_codec_impl.h" +#include "webrtc/voice_engine/voe_codec_impl.h" -#include "audio_coding_module.h" -#include "channel.h" -#include "critical_section_wrapper.h" -#include "trace.h" -#include "voe_errors.h" -#include "voice_engine_impl.h" +#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/voice_engine/channel.h" +#include "webrtc/voice_engine/include/voe_errors.h" +#include "webrtc/voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_codec_impl.h b/webrtc/voice_engine/voe_codec_impl.h index 8c0c9a8913..ab120f820c 100644 --- a/webrtc/voice_engine/voe_codec_impl.h +++ b/webrtc/voice_engine/voe_codec_impl.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_CODEC_IMPL_H #define WEBRTC_VOICE_ENGINE_VOE_CODEC_IMPL_H -#include "voe_codec.h" +#include "webrtc/voice_engine/include/voe_codec.h" -#include "shared_data.h" +#include "webrtc/voice_engine/shared_data.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_codec_unittest.cc b/webrtc/voice_engine/voe_codec_unittest.cc index 2e8fe6192a..a0531f1e56 100644 --- a/webrtc/voice_engine/voe_codec_unittest.cc +++ b/webrtc/voice_engine/voe_codec_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/voice_engine/include/voe_codec.h" -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_device/include/fake_audio_device.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/voice_engine/include/voe_base.h" diff --git a/webrtc/voice_engine/voe_encryption_impl.cc b/webrtc/voice_engine/voe_encryption_impl.cc index cad762aaa4..cf91b96114 100644 --- a/webrtc/voice_engine/voe_encryption_impl.cc +++ b/webrtc/voice_engine/voe_encryption_impl.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voe_encryption_impl.h" +#include "webrtc/voice_engine/voe_encryption_impl.h" -#include "channel.h" -#include "critical_section_wrapper.h" -#include "trace.h" -#include "voe_errors.h" -#include "voice_engine_impl.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/voice_engine/channel.h" +#include "webrtc/voice_engine/include/voe_errors.h" +#include "webrtc/voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_encryption_impl.h b/webrtc/voice_engine/voe_encryption_impl.h index 1a2bf9134c..47e38e0096 100644 --- a/webrtc/voice_engine/voe_encryption_impl.h +++ b/webrtc/voice_engine/voe_encryption_impl.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_ENCRYPTION_IMPL_H #define WEBRTC_VOICE_ENGINE_VOE_ENCRYPTION_IMPL_H -#include "voe_encryption.h" +#include "webrtc/voice_engine/include/voe_encryption.h" -#include "shared_data.h" +#include "webrtc/voice_engine/shared_data.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_external_media_impl.cc b/webrtc/voice_engine/voe_external_media_impl.cc index 13e1aa1f6b..531d3bc7b3 100644 --- a/webrtc/voice_engine/voe_external_media_impl.cc +++ b/webrtc/voice_engine/voe_external_media_impl.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voe_external_media_impl.h" +#include "webrtc/voice_engine/voe_external_media_impl.h" -#include "channel.h" -#include "critical_section_wrapper.h" -#include "output_mixer.h" -#include "trace.h" -#include "transmit_mixer.h" -#include "voice_engine_impl.h" -#include "voe_errors.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/voice_engine/channel.h" +#include "webrtc/voice_engine/include/voe_errors.h" +#include "webrtc/voice_engine/output_mixer.h" +#include "webrtc/voice_engine/transmit_mixer.h" +#include "webrtc/voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_external_media_impl.h b/webrtc/voice_engine/voe_external_media_impl.h index d2ce779864..ef460264f8 100644 --- a/webrtc/voice_engine/voe_external_media_impl.h +++ b/webrtc/voice_engine/voe_external_media_impl.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_EXTERNAL_MEDIA_IMPL_H #define WEBRTC_VOICE_ENGINE_VOE_EXTERNAL_MEDIA_IMPL_H -#include "voe_external_media.h" +#include "webrtc/voice_engine/include/voe_external_media.h" -#include "shared_data.h" +#include "webrtc/voice_engine/shared_data.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_file_impl.cc b/webrtc/voice_engine/voe_file_impl.cc index a0690737c8..0da21622c9 100644 --- a/webrtc/voice_engine/voe_file_impl.cc +++ b/webrtc/voice_engine/voe_file_impl.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voe_file_impl.h" +#include "webrtc/voice_engine/voe_file_impl.h" -#include "channel.h" -#include "critical_section_wrapper.h" -#include "file_wrapper.h" -#include "media_file.h" -#include "output_mixer.h" -#include "trace.h" -#include "transmit_mixer.h" -#include "voe_errors.h" -#include "voice_engine_impl.h" +#include "webrtc/modules/media_file/interface/media_file.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/file_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/voice_engine/channel.h" +#include "webrtc/voice_engine/include/voe_errors.h" +#include "webrtc/voice_engine/output_mixer.h" +#include "webrtc/voice_engine/transmit_mixer.h" +#include "webrtc/voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_file_impl.h b/webrtc/voice_engine/voe_file_impl.h index dcb5642699..f43d4f1426 100644 --- a/webrtc/voice_engine/voe_file_impl.h +++ b/webrtc/voice_engine/voe_file_impl.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_FILE_IMPL_H #define WEBRTC_VOICE_ENGINE_VOE_FILE_IMPL_H -#include "voe_file.h" -#include "shared_data.h" +#include "webrtc/voice_engine/include/voe_file.h" +#include "webrtc/voice_engine/shared_data.h" namespace webrtc { @@ -138,4 +138,3 @@ private: } // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_FILE_IMPL_H - diff --git a/webrtc/voice_engine/voe_hardware_impl.cc b/webrtc/voice_engine/voe_hardware_impl.cc index 51b833e2c5..b2690da70f 100644 --- a/webrtc/voice_engine/voe_hardware_impl.cc +++ b/webrtc/voice_engine/voe_hardware_impl.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voe_hardware_impl.h" +#include "webrtc/voice_engine/voe_hardware_impl.h" #include -#include "critical_section_wrapper.h" -#include "trace.h" -#include "voe_errors.h" -#include "voice_engine_impl.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/voice_engine/include/voe_errors.h" +#include "webrtc/voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_hardware_impl.h b/webrtc/voice_engine/voe_hardware_impl.h index 1b2f34347a..eddaf377e3 100644 --- a/webrtc/voice_engine/voe_hardware_impl.h +++ b/webrtc/voice_engine/voe_hardware_impl.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_HARDWARE_IMPL_H #define WEBRTC_VOICE_ENGINE_VOE_HARDWARE_IMPL_H -#include "voe_hardware.h" +#include "webrtc/voice_engine/include/voe_hardware.h" -#include "shared_data.h" +#include "webrtc/voice_engine/shared_data.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_neteq_stats_impl.cc b/webrtc/voice_engine/voe_neteq_stats_impl.cc index ef4984668f..aa53ceb5e6 100644 --- a/webrtc/voice_engine/voe_neteq_stats_impl.cc +++ b/webrtc/voice_engine/voe_neteq_stats_impl.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voe_neteq_stats_impl.h" +#include "webrtc/voice_engine/voe_neteq_stats_impl.h" -#include "audio_coding_module.h" -#include "channel.h" -#include "critical_section_wrapper.h" -#include "trace.h" -#include "voe_errors.h" -#include "voice_engine_impl.h" +#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/voice_engine/channel.h" +#include "webrtc/voice_engine/include/voe_errors.h" +#include "webrtc/voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_neteq_stats_impl.h b/webrtc/voice_engine/voe_neteq_stats_impl.h index 1b077b383c..e99ebc0a0d 100644 --- a/webrtc/voice_engine/voe_neteq_stats_impl.h +++ b/webrtc/voice_engine/voe_neteq_stats_impl.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_NETEQ_STATS_IMPL_H #define WEBRTC_VOICE_ENGINE_VOE_NETEQ_STATS_IMPL_H -#include "voe_neteq_stats.h" +#include "webrtc/voice_engine/include/voe_neteq_stats.h" -#include "shared_data.h" +#include "webrtc/voice_engine/shared_data.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_network_impl.h b/webrtc/voice_engine/voe_network_impl.h index 4dbe4f3231..cfa3ffc352 100644 --- a/webrtc/voice_engine/voe_network_impl.h +++ b/webrtc/voice_engine/voe_network_impl.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_NETWORK_IMPL_H #define WEBRTC_VOICE_ENGINE_VOE_NETWORK_IMPL_H -#include "voe_network.h" +#include "webrtc/voice_engine/include/voe_network.h" -#include "shared_data.h" +#include "webrtc/voice_engine/shared_data.h" namespace webrtc diff --git a/webrtc/voice_engine/voe_rtp_rtcp_impl.cc b/webrtc/voice_engine/voe_rtp_rtcp_impl.cc index 6999d51cca..b33aa4e14b 100644 --- a/webrtc/voice_engine/voe_rtp_rtcp_impl.cc +++ b/webrtc/voice_engine/voe_rtp_rtcp_impl.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voe_rtp_rtcp_impl.h" -#include "trace.h" -#include "file_wrapper.h" -#include "critical_section_wrapper.h" -#include "voice_engine_impl.h" -#include "voe_errors.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/file_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/voice_engine/include/voe_errors.h" +#include "webrtc/voice_engine/voe_rtp_rtcp_impl.h" +#include "webrtc/voice_engine/voice_engine_impl.h" -#include "channel.h" -#include "transmit_mixer.h" +#include "webrtc/voice_engine/channel.h" +#include "webrtc/voice_engine/transmit_mixer.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_rtp_rtcp_impl.h b/webrtc/voice_engine/voe_rtp_rtcp_impl.h index 9c0392b6d0..a9e66fd32d 100644 --- a/webrtc/voice_engine/voe_rtp_rtcp_impl.h +++ b/webrtc/voice_engine/voe_rtp_rtcp_impl.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_RTP_RTCP_IMPL_H #define WEBRTC_VOICE_ENGINE_VOE_RTP_RTCP_IMPL_H -#include "voe_rtp_rtcp.h" +#include "webrtc/voice_engine/include/voe_rtp_rtcp.h" -#include "shared_data.h" +#include "webrtc/voice_engine/shared_data.h" namespace webrtc { @@ -124,4 +124,3 @@ private: } // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_RTP_RTCP_IMPL_H - diff --git a/webrtc/voice_engine/voe_video_sync_impl.cc b/webrtc/voice_engine/voe_video_sync_impl.cc index 3796c5e08a..8db2e688f2 100644 --- a/webrtc/voice_engine/voe_video_sync_impl.cc +++ b/webrtc/voice_engine/voe_video_sync_impl.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voe_video_sync_impl.h" +#include "webrtc/voice_engine/voe_video_sync_impl.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/trace.h" diff --git a/webrtc/voice_engine/voe_volume_control_impl.cc b/webrtc/voice_engine/voe_volume_control_impl.cc index 8104242f36..c7555fcfcd 100644 --- a/webrtc/voice_engine/voe_volume_control_impl.cc +++ b/webrtc/voice_engine/voe_volume_control_impl.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "voe_volume_control_impl.h" +#include "webrtc/voice_engine/voe_volume_control_impl.h" -#include "channel.h" -#include "critical_section_wrapper.h" -#include "output_mixer.h" -#include "trace.h" -#include "transmit_mixer.h" -#include "voe_errors.h" -#include "voice_engine_impl.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/voice_engine/channel.h" +#include "webrtc/voice_engine/include/voe_errors.h" +#include "webrtc/voice_engine/output_mixer.h" +#include "webrtc/voice_engine/transmit_mixer.h" +#include "webrtc/voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_volume_control_impl.h b/webrtc/voice_engine/voe_volume_control_impl.h index 9e1cc5abc9..f19d9a3433 100644 --- a/webrtc/voice_engine/voe_volume_control_impl.h +++ b/webrtc/voice_engine/voe_volume_control_impl.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_VOLUME_CONTROL_IMPL_H #define WEBRTC_VOICE_ENGINE_VOE_VOLUME_CONTROL_IMPL_H -#include "voe_volume_control.h" +#include "webrtc/voice_engine/include/voe_volume_control.h" -#include "shared_data.h" +#include "webrtc/voice_engine/shared_data.h" namespace webrtc { @@ -69,4 +69,3 @@ private: } // namespace webrtc #endif // WEBRTC_VOICE_ENGINE_VOE_VOLUME_CONTROL_IMPL_H - diff --git a/webrtc/voice_engine/voice_engine_defines.h b/webrtc/voice_engine/voice_engine_defines.h index cb63940dfd..ffb9c24e4e 100644 --- a/webrtc/voice_engine/voice_engine_defines.h +++ b/webrtc/voice_engine/voice_engine_defines.h @@ -255,28 +255,28 @@ inline int VoEChannelId(int moduleId) #ifdef WEBRTC_LINUX -#include -#include -#include -#include #include +#include +#include +#include +#include #ifndef QNX #include #ifndef ANDROID #include #endif // ANDROID #endif // QNX -#include -#include -#include #include -#include -#include -#include #include #include -#include +#include +#include +#include +#include +#include #include +#include +#include #define DWORD unsigned long int #define WINAPI @@ -339,22 +339,22 @@ inline int VoEChannelId(int moduleId) #ifdef WEBRTC_MAC -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #if !defined(WEBRTC_IOS) #include #include diff --git a/webrtc/voice_engine/voice_engine_impl.cc b/webrtc/voice_engine/voice_engine_impl.cc index 30609b26f9..eca098ef9e 100644 --- a/webrtc/voice_engine/voice_engine_impl.cc +++ b/webrtc/voice_engine/voice_engine_impl.cc @@ -9,11 +9,11 @@ */ #if defined(WEBRTC_ANDROID) && !defined(WEBRTC_ANDROID_OPENSLES) -#include "modules/audio_device/android/audio_device_jni_android.h" +#include "webrtc/modules/audio_device/android/audio_device_jni_android.h" #endif -#include "voice_engine_impl.h" -#include "trace.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/webrtc/voice_engine/voice_engine_impl.h b/webrtc/voice_engine/voice_engine_impl.h index 4666883b0a..011907440d 100644 --- a/webrtc/voice_engine/voice_engine_impl.h +++ b/webrtc/voice_engine/voice_engine_impl.h @@ -11,46 +11,46 @@ #ifndef WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H #define WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H -#include "atomic32.h" -#include "engine_configurations.h" -#include "voe_base_impl.h" +#include "webrtc/engine_configurations.h" +#include "webrtc/system_wrappers/interface/atomic32.h" +#include "webrtc/voice_engine/voe_base_impl.h" #ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API -#include "voe_audio_processing_impl.h" +#include "webrtc/voice_engine/voe_audio_processing_impl.h" #endif #ifdef WEBRTC_VOICE_ENGINE_CALL_REPORT_API -#include "voe_call_report_impl.h" +#include "webrtc/voice_engine/voe_call_report_impl.h" #endif #ifdef WEBRTC_VOICE_ENGINE_CODEC_API -#include "voe_codec_impl.h" +#include "webrtc/voice_engine/voe_codec_impl.h" #endif #ifdef WEBRTC_VOICE_ENGINE_DTMF_API -#include "voe_dtmf_impl.h" +#include "webrtc/voice_engine/voe_dtmf_impl.h" #endif #ifdef WEBRTC_VOICE_ENGINE_ENCRYPTION_API -#include "voe_encryption_impl.h" +#include "webrtc/voice_engine/voe_encryption_impl.h" #endif #ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API -#include "voe_external_media_impl.h" +#include "webrtc/voice_engine/voe_external_media_impl.h" #endif #ifdef WEBRTC_VOICE_ENGINE_FILE_API -#include "voe_file_impl.h" +#include "webrtc/voice_engine/voe_file_impl.h" #endif #ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API -#include "voe_hardware_impl.h" +#include "webrtc/voice_engine/voe_hardware_impl.h" #endif #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API -#include "voe_neteq_stats_impl.h" +#include "webrtc/voice_engine/voe_neteq_stats_impl.h" #endif -#include "voe_network_impl.h" +#include "webrtc/voice_engine/voe_network_impl.h" #ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API -#include "voe_rtp_rtcp_impl.h" +#include "webrtc/voice_engine/voe_rtp_rtcp_impl.h" #endif #ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API -#include "voe_video_sync_impl.h" +#include "webrtc/voice_engine/voe_video_sync_impl.h" #endif #ifdef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API -#include "voe_volume_control_impl.h" +#include "webrtc/voice_engine/voe_volume_control_impl.h" #endif namespace webrtc