diff options
-rw-r--r-- | engine_configurations.h | 5 | ||||
-rw-r--r-- | voice_engine/voe_audio_processing_impl.cc | 54 | ||||
-rw-r--r-- | voice_engine/voice_engine_defines.h | 2 |
3 files changed, 13 insertions, 48 deletions
diff --git a/engine_configurations.h b/engine_configurations.h index 01fa3644..22b87e85 100644 --- a/engine_configurations.h +++ b/engine_configurations.h @@ -11,6 +11,8 @@ #ifndef WEBRTC_ENGINE_CONFIGURATIONS_H_ #define WEBRTC_ENGINE_CONFIGURATIONS_H_ +#include "webrtc/typedefs.h" + // ============================================================================ // Voice and Video // ============================================================================ @@ -61,7 +63,8 @@ #define WEBRTC_VOICE_ENGINE_NR // Near-end NS #define WEBRTC_VOE_EXTERNAL_REC_AND_PLAYOUT -#ifndef WEBRTC_CHROMIUM_BUILD +#if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS) && \ + !defined(WEBRTC_CHROMIUM_BUILD) #define WEBRTC_VOICE_ENGINE_TYPING_DETECTION // Typing detection #endif diff --git a/voice_engine/voe_audio_processing_impl.cc b/voice_engine/voe_audio_processing_impl.cc index 5908ef13..a1743ea5 100644 --- a/voice_engine/voe_audio_processing_impl.cc +++ b/voice_engine/voe_audio_processing_impl.cc @@ -767,8 +767,6 @@ int VoEAudioProcessingImpl::RegisterRxVadObserver( VoERxVadCallback& observer) { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), "RegisterRxVadObserver()"); - ANDROID_NOT_SUPPORTED(_shared->statistics()); - if (!_shared->statistics().Initialized()) { _shared->SetLastError(VE_NOT_INITED, kTraceError); return -1; @@ -786,8 +784,6 @@ int VoEAudioProcessingImpl::RegisterRxVadObserver( int VoEAudioProcessingImpl::DeRegisterRxVadObserver(int channel) { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), "DeRegisterRxVadObserver()"); - ANDROID_NOT_SUPPORTED(_shared->statistics()); - if (!_shared->statistics().Initialized()) { _shared->SetLastError(VE_NOT_INITED, kTraceError); return -1; @@ -827,8 +823,6 @@ int VoEAudioProcessingImpl::VoiceActivityIndicator(int channel) { int VoEAudioProcessingImpl::SetEcMetricsStatus(bool enable) { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), "SetEcMetricsStatus(enable=%d)", enable); - ANDROID_NOT_SUPPORTED(_shared->statistics()); - #ifdef WEBRTC_VOICE_ENGINE_ECHO if (!_shared->statistics().Initialized()) { _shared->SetLastError(VE_NOT_INITED, kTraceError); @@ -854,8 +848,6 @@ int VoEAudioProcessingImpl::SetEcMetricsStatus(bool enable) { int VoEAudioProcessingImpl::GetEcMetricsStatus(bool& enabled) { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), "GetEcMetricsStatus(enabled=?)"); - ANDROID_NOT_SUPPORTED(_shared->statistics()); - #ifdef WEBRTC_VOICE_ENGINE_ECHO if (!_shared->statistics().Initialized()) { _shared->SetLastError(VE_NOT_INITED, kTraceError); @@ -891,8 +883,6 @@ int VoEAudioProcessingImpl::GetEchoMetrics(int& ERL, int& A_NLP) { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), "GetEchoMetrics(ERL=?, ERLE=?, RERL=?, A_NLP=?)"); - ANDROID_NOT_SUPPORTED(_shared->statistics()); - #ifdef WEBRTC_VOICE_ENGINE_ECHO if (!_shared->statistics().Initialized()) { _shared->SetLastError(VE_NOT_INITED, kTraceError); @@ -934,8 +924,6 @@ int VoEAudioProcessingImpl::GetEcDelayMetrics(int& delay_median, int& delay_std) { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), "GetEcDelayMetrics(median=?, std=?)"); - ANDROID_NOT_SUPPORTED(_shared->statistics()); - #ifdef WEBRTC_VOICE_ENGINE_ECHO if (!_shared->statistics().Initialized()) { _shared->SetLastError(VE_NOT_INITED, kTraceError); @@ -998,9 +986,9 @@ int VoEAudioProcessingImpl::StopDebugRecording() { int VoEAudioProcessingImpl::SetTypingDetectionStatus(bool enable) { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), "SetTypingDetectionStatus()"); - ANDROID_NOT_SUPPORTED(_shared->statistics()); - IPHONE_NOT_SUPPORTED(_shared->statistics()); -#ifdef WEBRTC_VOICE_ENGINE_TYPING_DETECTION +#if !defined(WEBRTC_VOICE_ENGINE_TYPING_DETECTION) + NOT_SUPPORTED(_shared->statistics()); +#else if (!_shared->statistics().Initialized()) { _shared->SetLastError(VE_NOT_INITED, kTraceError); return -1; @@ -1022,20 +1010,12 @@ int VoEAudioProcessingImpl::SetTypingDetectionStatus(bool enable) { } return 0; -#else - _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError, - "SetTypingDetectionStatus is not supported"); - return -1; #endif } int VoEAudioProcessingImpl::GetTypingDetectionStatus(bool& enabled) { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), "GetTypingDetectionStatus()"); - ANDROID_NOT_SUPPORTED(_shared->statistics()); - IPHONE_NOT_SUPPORTED(_shared->statistics()); - -#ifdef WEBRTC_VOICE_ENGINE_TYPING_DETECTION if (!_shared->statistics().Initialized()) { _shared->SetLastError(VE_NOT_INITED, kTraceError); return -1; @@ -1046,21 +1026,15 @@ int VoEAudioProcessingImpl::GetTypingDetectionStatus(bool& enabled) { enabled = _shared->audio_processing()->voice_detection()->is_enabled(); return 0; -#else - _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError, - "SetTypingDetectionStatus is not supported"); - return -1; -#endif } int VoEAudioProcessingImpl::TimeSinceLastTyping(int &seconds) { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), "TimeSinceLastTyping()"); - ANDROID_NOT_SUPPORTED(_shared->statistics()); - IPHONE_NOT_SUPPORTED(_shared->statistics()); - -#ifdef WEBRTC_VOICE_ENGINE_TYPING_DETECTION +#if !defined(WEBRTC_VOICE_ENGINE_TYPING_DETECTION) + NOT_SUPPORTED(_shared->statistics()); +#else if (!_shared->statistics().Initialized()) { _shared->SetLastError(VE_NOT_INITED, kTraceError); return -1; @@ -1078,10 +1052,6 @@ int VoEAudioProcessingImpl::TimeSinceLastTyping(int &seconds) { "SetTypingDetectionStatus is not enabled"); return -1; } -#else - _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError, - "SetTypingDetectionStatus is not supported"); - return -1; #endif } @@ -1092,21 +1062,15 @@ int VoEAudioProcessingImpl::SetTypingDetectionParameters(int timeWindow, int typeEventDelay) { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), "SetTypingDetectionParameters()"); - ANDROID_NOT_SUPPORTED(_shared->statistics()); - IPHONE_NOT_SUPPORTED(_shared->statistics()); - -#ifdef WEBRTC_VOICE_ENGINE_TYPING_DETECTION +#if !defined(WEBRTC_VOICE_ENGINE_TYPING_DETECTION) + NOT_SUPPORTED(_shared->statistics()); +#else if (!_shared->statistics().Initialized()) { _shared->statistics().SetLastError(VE_NOT_INITED, kTraceError); return -1; } return (_shared->transmit_mixer()->SetTypingDetectionParameters(timeWindow, costPerTyping, reportingThreshold, penaltyDecay, typeEventDelay)); - -#else - _shared->statistics().SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError, - "SetTypingDetectionParameters is not supported"); - return -1; #endif } diff --git a/voice_engine/voice_engine_defines.h b/voice_engine/voice_engine_defines.h index ffb9c24e..e1e9cdfa 100644 --- a/voice_engine/voice_engine_defines.h +++ b/voice_engine/voice_engine_defines.h @@ -315,8 +315,6 @@ inline int VoEChannelId(int moduleId) // Always excluded for Android builds #undef WEBRTC_CODEC_ISAC #undef WEBRTC_VOE_EXTERNAL_REC_AND_PLAYOUT - #undef WEBRTC_CONFERENCING - #undef WEBRTC_TYPING_DETECTION #define ANDROID_NOT_SUPPORTED(stat) NOT_SUPPORTED(stat) |