From 06c1d6484ea4c445f5db7d90889d5839e03d59e6 Mon Sep 17 00:00:00 2001 From: "henrik.lundin" Date: Wed, 30 Nov 2016 08:21:46 -0800 Subject: [PATCH] Prep to remove API-related #defines from voice_engine_configurations.h The follwing #defines are marked as deprecated: - WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API - WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API - WEBRTC_VOICE_ENGINE_RTP_RTCP_API - WEBRTC_VOICE_ENGINE_NETEQ_STATS_API - WEBRTC_VOICE_ENGINE_HARDWARE_API - WEBRTC_VOICE_ENGINE_FILE_API - WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API - WEBRTC_VOICE_ENGINE_CODEC_API - WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API BUG=webrtc:6506 Review-Url: https://codereview.webrtc.org/2538093003 Cr-Commit-Position: refs/heads/master@{#15341} --- .../test/auto_test/voe_standard_test.cc | 4 +++ .../test/auto_test/voe_standard_test.h | 28 +++++++++++++++++++ .../test/auto_test/voe_test_defines.h | 28 +++++++++++++++++++ .../voice_engine/voe_audio_processing_impl.cc | 4 +++ webrtc/voice_engine/voe_codec_impl.cc | 4 +++ .../voice_engine/voe_external_media_impl.cc | 4 +++ webrtc/voice_engine/voe_file_impl.cc | 4 +++ webrtc/voice_engine/voe_hardware_impl.cc | 4 +++ webrtc/voice_engine/voe_neteq_stats_impl.cc | 4 +++ webrtc/voice_engine/voe_rtp_rtcp_impl.cc | 4 +++ webrtc/voice_engine/voe_video_sync_impl.cc | 4 +++ .../voice_engine/voe_volume_control_impl.cc | 4 +++ webrtc/voice_engine/voice_engine_impl.h | 28 +++++++++++++++++++ 13 files changed, 124 insertions(+) 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 a819bf4812..7fc2560eb3 100644 --- a/webrtc/voice_engine/test/auto_test/voe_standard_test.cc +++ b/webrtc/voice_engine/test/auto_test/voe_standard_test.cc @@ -23,6 +23,10 @@ #include "webrtc/voice_engine/voice_engine_defines.h" #include "webrtc/voice_engine_configurations.h" +#ifndef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API +#error "Deprecated" +#endif + DEFINE_bool(include_timing_dependent_tests, true, "If true, we will include tests / parts of tests that are known " "to break in slow execution environments (such as valgrind)."); 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 529178e212..e4a4576882 100644 --- a/webrtc/voice_engine/test/auto_test/voe_standard_test.h +++ b/webrtc/voice_engine/test/auto_test/voe_standard_test.h @@ -40,6 +40,34 @@ #include "webrtc/voice_engine/include/voe_volume_control.h" #endif +#ifndef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_CODEC_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_FILE_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_HARDWARE_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_RTP_RTCP_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API +#error "Deprecated" +#endif + #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API namespace webrtc { class VoENetEqStats; 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 fe0db2c829..7f823ecbd1 100644 --- a/webrtc/voice_engine/test/auto_test/voe_test_defines.h +++ b/webrtc/voice_engine/test/auto_test/voe_test_defines.h @@ -16,6 +16,34 @@ // Read WEBRTC_VOICE_ENGINE_XXX_API compiler flags #include "webrtc/voice_engine_configurations.h" +#ifndef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_CODEC_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_FILE_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_HARDWARE_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_RTP_RTCP_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API +#error "Deprecated" +#endif + // 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 // settings in voice_engine_configurations.h. diff --git a/webrtc/voice_engine/voe_audio_processing_impl.cc b/webrtc/voice_engine/voe_audio_processing_impl.cc index afbf29ab18..d38717c460 100644 --- a/webrtc/voice_engine/voe_audio_processing_impl.cc +++ b/webrtc/voice_engine/voe_audio_processing_impl.cc @@ -18,6 +18,10 @@ #include "webrtc/voice_engine/transmit_mixer.h" #include "webrtc/voice_engine/voice_engine_impl.h" +#ifndef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API +#error "Deprecated" +#endif + // TODO(andrew): move to a common place. #define WEBRTC_VOICE_INIT_CHECK() \ do { \ diff --git a/webrtc/voice_engine/voe_codec_impl.cc b/webrtc/voice_engine/voe_codec_impl.cc index b2fd08d599..365a0195fa 100644 --- a/webrtc/voice_engine/voe_codec_impl.cc +++ b/webrtc/voice_engine/voe_codec_impl.cc @@ -17,6 +17,10 @@ #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/voice_engine_impl.h" +#ifndef WEBRTC_VOICE_ENGINE_CODEC_API +#error "Deprecated" +#endif + namespace webrtc { VoECodec* VoECodec::GetInterface(VoiceEngine* voiceEngine) { diff --git a/webrtc/voice_engine/voe_external_media_impl.cc b/webrtc/voice_engine/voe_external_media_impl.cc index cae0715ced..72dd3b1fd6 100644 --- a/webrtc/voice_engine/voe_external_media_impl.cc +++ b/webrtc/voice_engine/voe_external_media_impl.cc @@ -17,6 +17,10 @@ #include "webrtc/voice_engine/transmit_mixer.h" #include "webrtc/voice_engine/voice_engine_impl.h" +#ifndef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API +#error "Deprecated" +#endif + namespace webrtc { VoEExternalMedia* VoEExternalMedia::GetInterface(VoiceEngine* voiceEngine) { diff --git a/webrtc/voice_engine/voe_file_impl.cc b/webrtc/voice_engine/voe_file_impl.cc index 339fba1466..5415eeea4c 100644 --- a/webrtc/voice_engine/voe_file_impl.cc +++ b/webrtc/voice_engine/voe_file_impl.cc @@ -19,6 +19,10 @@ #include "webrtc/voice_engine/transmit_mixer.h" #include "webrtc/voice_engine/voice_engine_impl.h" +#ifndef WEBRTC_VOICE_ENGINE_FILE_API +#error "Deprecated" +#endif + namespace webrtc { VoEFile* VoEFile::GetInterface(VoiceEngine* voiceEngine) { diff --git a/webrtc/voice_engine/voe_hardware_impl.cc b/webrtc/voice_engine/voe_hardware_impl.cc index d01caa9423..6bf493fe13 100644 --- a/webrtc/voice_engine/voe_hardware_impl.cc +++ b/webrtc/voice_engine/voe_hardware_impl.cc @@ -16,6 +16,10 @@ #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/voice_engine_impl.h" +#ifndef WEBRTC_VOICE_ENGINE_HARDWARE_API +#error "Deprecated" +#endif + namespace webrtc { VoEHardware* VoEHardware::GetInterface(VoiceEngine* voiceEngine) { diff --git a/webrtc/voice_engine/voe_neteq_stats_impl.cc b/webrtc/voice_engine/voe_neteq_stats_impl.cc index 6b2b37c57c..bd84f8f742 100644 --- a/webrtc/voice_engine/voe_neteq_stats_impl.cc +++ b/webrtc/voice_engine/voe_neteq_stats_impl.cc @@ -16,6 +16,10 @@ #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/voice_engine_impl.h" +#ifndef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API +#error "Deprecated" +#endif + namespace webrtc { VoENetEqStats* VoENetEqStats::GetInterface(VoiceEngine* voiceEngine) { diff --git a/webrtc/voice_engine/voe_rtp_rtcp_impl.cc b/webrtc/voice_engine/voe_rtp_rtcp_impl.cc index 44e571b232..20f2caf1ac 100644 --- a/webrtc/voice_engine/voe_rtp_rtcp_impl.cc +++ b/webrtc/voice_engine/voe_rtp_rtcp_impl.cc @@ -17,6 +17,10 @@ #include "webrtc/voice_engine/channel.h" #include "webrtc/voice_engine/transmit_mixer.h" +#ifndef WEBRTC_VOICE_ENGINE_RTP_RTCP_API +#error "Deprecated" +#endif + namespace webrtc { VoERTP_RTCP* VoERTP_RTCP::GetInterface(VoiceEngine* voiceEngine) { diff --git a/webrtc/voice_engine/voe_video_sync_impl.cc b/webrtc/voice_engine/voe_video_sync_impl.cc index 03d69b4b8c..5ff82abe1b 100644 --- a/webrtc/voice_engine/voe_video_sync_impl.cc +++ b/webrtc/voice_engine/voe_video_sync_impl.cc @@ -15,6 +15,10 @@ #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/voice_engine_impl.h" +#ifndef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API +#error "Deprecated" +#endif + namespace webrtc { VoEVideoSync* VoEVideoSync::GetInterface(VoiceEngine* voiceEngine) { diff --git a/webrtc/voice_engine/voe_volume_control_impl.cc b/webrtc/voice_engine/voe_volume_control_impl.cc index eb17db3219..5e8f0d7fbb 100644 --- a/webrtc/voice_engine/voe_volume_control_impl.cc +++ b/webrtc/voice_engine/voe_volume_control_impl.cc @@ -17,6 +17,10 @@ #include "webrtc/voice_engine/transmit_mixer.h" #include "webrtc/voice_engine/voice_engine_impl.h" +#ifndef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API +#error "Deprecated" +#endif + namespace webrtc { VoEVolumeControl* VoEVolumeControl::GetInterface(VoiceEngine* voiceEngine) { diff --git a/webrtc/voice_engine/voice_engine_impl.h b/webrtc/voice_engine/voice_engine_impl.h index d8aebdc83f..0ce5ca8e1b 100644 --- a/webrtc/voice_engine/voice_engine_impl.h +++ b/webrtc/voice_engine/voice_engine_impl.h @@ -17,6 +17,34 @@ #include "webrtc/voice_engine/voe_base_impl.h" #include "webrtc/voice_engine_configurations.h" +#ifndef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_CODEC_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_FILE_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_HARDWARE_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_RTP_RTCP_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API +#error "Deprecated" +#endif +#ifndef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API +#error "Deprecated" +#endif + #ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API #include "webrtc/voice_engine/voe_audio_processing_impl.h" #endif