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}
This commit is contained in:
parent
9332b7d0ad
commit
06c1d6484e
@ -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).");
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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 { \
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user