diff options
| -rw-r--r-- | engine_configurations.h | 10 | ||||
| -rw-r--r-- | video_engine/vie_network_impl.cc | 4 | ||||
| -rw-r--r-- | voice_engine/test/auto_test/voe_standard_test.h | 4 | ||||
| -rw-r--r-- | voice_engine/test/auto_test/voe_test_defines.h | 3 | ||||
| -rw-r--r-- | voice_engine/voe_network_impl.cc | 8 | ||||
| -rw-r--r-- | voice_engine/voice_engine_impl.h | 6 |
6 files changed, 0 insertions, 35 deletions
diff --git a/engine_configurations.h b/engine_configurations.h index bfc20cf7..01fa3644 100644 --- a/engine_configurations.h +++ b/engine_configurations.h @@ -15,14 +15,6 @@ // Voice and Video // ============================================================================ -// Don't link in socket support in Chrome -#ifdef WEBRTC_CHROMIUM_BUILD -#define WEBRTC_EXTERNAL_TRANSPORT -#endif - -// Optional to enable stand-alone -// #define WEBRTC_EXTERNAL_TRANSPORT - // ---------------------------------------------------------------------------- // [Voice] Codec settings // ---------------------------------------------------------------------------- @@ -84,7 +76,6 @@ #define WEBRTC_VOICE_ENGINE_FILE_API #define WEBRTC_VOICE_ENGINE_HARDWARE_API #define WEBRTC_VOICE_ENGINE_NETEQ_STATS_API -#define WEBRTC_VOICE_ENGINE_NETWORK_API #define WEBRTC_VOICE_ENGINE_RTP_RTCP_API #define WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API #define WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API @@ -109,7 +100,6 @@ #define WEBRTC_VIDEO_ENGINE_CODEC_API #define WEBRTC_VIDEO_ENGINE_ENCRYPTION_API #define WEBRTC_VIDEO_ENGINE_IMAGE_PROCESS_API -#define WEBRTC_VIDEO_ENGINE_NETWORK_API #define WEBRTC_VIDEO_ENGINE_RENDER_API #define WEBRTC_VIDEO_ENGINE_RTP_RTCP_API #define WEBRTC_VIDEO_ENGINE_EXTERNAL_CODEC_API diff --git a/video_engine/vie_network_impl.cc b/video_engine/vie_network_impl.cc index e22f7ce1..47397c85 100644 --- a/video_engine/vie_network_impl.cc +++ b/video_engine/vie_network_impl.cc @@ -28,7 +28,6 @@ namespace webrtc { ViENetwork* ViENetwork::GetInterface(VideoEngine* video_engine) { -#ifdef WEBRTC_VIDEO_ENGINE_NETWORK_API if (!video_engine) { return NULL; } @@ -37,9 +36,6 @@ ViENetwork* ViENetwork::GetInterface(VideoEngine* video_engine) { // Increase ref count. (*vie_networkImpl)++; return vie_networkImpl; -#else - return NULL; -#endif } int ViENetworkImpl::Release() { diff --git a/voice_engine/test/auto_test/voe_standard_test.h b/voice_engine/test/auto_test/voe_standard_test.h index 6a58d7b2..b64a7920 100644 --- a/voice_engine/test/auto_test/voe_standard_test.h +++ b/voice_engine/test/auto_test/voe_standard_test.h @@ -39,9 +39,7 @@ #ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API #include "voe_hardware.h" #endif -#ifdef WEBRTC_VOICE_ENGINE_NETWORK_API #include "voe_network.h" -#endif #ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API #include "voe_video_sync.h" #endif @@ -107,9 +105,7 @@ class SubAPIManager { #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API _netEqStats = true; #endif -#ifdef WEBRTC_VOICE_ENGINE_NETWORK_API _network = true; -#endif #ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API _rtp_rtcp = true; #endif diff --git a/voice_engine/test/auto_test/voe_test_defines.h b/voice_engine/test/auto_test/voe_test_defines.h index 2954fe6f..e71f3cfe 100644 --- a/voice_engine/test/auto_test/voe_test_defines.h +++ b/voice_engine/test/auto_test/voe_test_defines.h @@ -90,9 +90,6 @@ #ifndef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API #undef _TEST_XMEDIA_ #endif -#ifndef WEBRTC_VOICE_ENGINE_NETWORK_API -#undef _TEST_NETWORK_ -#endif #ifndef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API #undef _TEST_NETEQ_STATS_ #endif diff --git a/voice_engine/voe_network_impl.cc b/voice_engine/voe_network_impl.cc index 6c4cfc2b..f3722f0e 100644 --- a/voice_engine/voe_network_impl.cc +++ b/voice_engine/voe_network_impl.cc @@ -21,9 +21,6 @@ namespace webrtc VoENetwork* VoENetwork::GetInterface(VoiceEngine* voiceEngine) { -#ifndef WEBRTC_VOICE_ENGINE_NETWORK_API - return NULL; -#else if (NULL == voiceEngine) { return NULL; @@ -31,11 +28,8 @@ VoENetwork* VoENetwork::GetInterface(VoiceEngine* voiceEngine) VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine); s->AddRef(); return s; -#endif } -#ifdef WEBRTC_VOICE_ENGINE_NETWORK_API - VoENetworkImpl::VoENetworkImpl(voe::SharedData* shared) : _shared(shared) { WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1), @@ -323,6 +317,4 @@ int VoENetworkImpl::GetPeriodicDeadOrAliveStatus(int channel, sampleTimeSeconds); } -#endif // WEBRTC_VOICE_ENGINE_NETWORK_API - } // namespace webrtc diff --git a/voice_engine/voice_engine_impl.h b/voice_engine/voice_engine_impl.h index 2b3963cd..4666883b 100644 --- a/voice_engine/voice_engine_impl.h +++ b/voice_engine/voice_engine_impl.h @@ -42,9 +42,7 @@ #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API #include "voe_neteq_stats_impl.h" #endif -#ifdef WEBRTC_VOICE_ENGINE_NETWORK_API #include "voe_network_impl.h" -#endif #ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API #include "voe_rtp_rtcp_impl.h" #endif @@ -87,9 +85,7 @@ class VoiceEngineImpl : public voe::SharedData, // Must be the first base class #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API public VoENetEqStatsImpl, #endif -#ifdef WEBRTC_VOICE_ENGINE_NETWORK_API public VoENetworkImpl, -#endif #ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API public VoERTP_RTCPImpl, #endif @@ -130,9 +126,7 @@ public: #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API VoENetEqStatsImpl(this), #endif -#ifdef WEBRTC_VOICE_ENGINE_NETWORK_API VoENetworkImpl(this), -#endif #ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API VoERTP_RTCPImpl(this), #endif |