Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/voice_engine/voe_audio_processing_impl.cc

Issue 2530373002: Remove 3 defines in voice_engine_configurations.h (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/voice_engine_configurations.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/voe_audio_processing_impl.cc
diff --git a/webrtc/voice_engine/voe_audio_processing_impl.cc b/webrtc/voice_engine/voe_audio_processing_impl.cc
index 35bf801ea5267cada2e78c8d29c8ba00a520fd30..afbf29ab18d8ce682bab7f4ddccf8408f1775334 100644
--- a/webrtc/voice_engine/voe_audio_processing_impl.cc
+++ b/webrtc/voice_engine/voe_audio_processing_impl.cc
@@ -71,7 +71,6 @@ VoEAudioProcessingImpl::~VoEAudioProcessingImpl() {
int VoEAudioProcessingImpl::SetNsStatus(bool enable, NsModes mode) {
WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
"SetNsStatus(enable=%d, mode=%d)", enable, mode);
-#ifdef WEBRTC_VOICE_ENGINE_NR
if (!_shared->statistics().Initialized()) {
_shared->SetLastError(VE_NOT_INITED, kTraceError);
return -1;
@@ -115,16 +114,9 @@ int VoEAudioProcessingImpl::SetNsStatus(bool enable, NsModes mode) {
}
return 0;
-#else
-#error "This is deprecated"
- _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
- "SetNsStatus() Ns is not supported");
- return -1;
-#endif
}
int VoEAudioProcessingImpl::GetNsStatus(bool& enabled, NsModes& mode) {
-#ifdef WEBRTC_VOICE_ENGINE_NR
if (!_shared->statistics().Initialized()) {
_shared->SetLastError(VE_NOT_INITED, kTraceError);
return -1;
@@ -149,18 +141,11 @@ int VoEAudioProcessingImpl::GetNsStatus(bool& enabled, NsModes& mode) {
break;
}
return 0;
-#else
-#error "This is deprecated"
- _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
- "GetNsStatus() Ns is not supported");
- return -1;
-#endif
}
int VoEAudioProcessingImpl::SetAgcStatus(bool enable, AgcModes mode) {
WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
"SetAgcStatus(enable=%d, mode=%d)", enable, mode);
-#ifdef WEBRTC_VOICE_ENGINE_AGC
if (!_shared->statistics().Initialized()) {
_shared->SetLastError(VE_NOT_INITED, kTraceError);
return -1;
@@ -216,16 +201,9 @@ int VoEAudioProcessingImpl::SetAgcStatus(bool enable, AgcModes mode) {
}
return 0;
-#else
-#error "This is deprecated"
- _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
- "SetAgcStatus() Agc is not supported");
- return -1;
-#endif
}
int VoEAudioProcessingImpl::GetAgcStatus(bool& enabled, AgcModes& mode) {
-#ifdef WEBRTC_VOICE_ENGINE_AGC
if (!_shared->statistics().Initialized()) {
_shared->SetLastError(VE_NOT_INITED, kTraceError);
return -1;
@@ -248,18 +226,11 @@ int VoEAudioProcessingImpl::GetAgcStatus(bool& enabled, AgcModes& mode) {
}
return 0;
-#else
-#error "This is deprecated"
- _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
- "GetAgcStatus() Agc is not supported");
- return -1;
-#endif
}
int VoEAudioProcessingImpl::SetAgcConfig(AgcConfig config) {
WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
"SetAgcConfig()");
-#ifdef WEBRTC_VOICE_ENGINE_AGC
if (!_shared->statistics().Initialized()) {
_shared->SetLastError(VE_NOT_INITED, kTraceError);
return -1;
@@ -288,16 +259,9 @@ int VoEAudioProcessingImpl::SetAgcConfig(AgcConfig config) {
}
return 0;
-#else
-#error "This is deprecated"
- _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
- "SetAgcConfig() EC is not supported");
- return -1;
-#endif
}
int VoEAudioProcessingImpl::GetAgcConfig(AgcConfig& config) {
-#ifdef WEBRTC_VOICE_ENGINE_AGC
if (!_shared->statistics().Initialized()) {
_shared->SetLastError(VE_NOT_INITED, kTraceError);
return -1;
@@ -311,12 +275,6 @@ int VoEAudioProcessingImpl::GetAgcConfig(AgcConfig& config) {
_shared->audio_processing()->gain_control()->is_limiter_enabled();
return 0;
-#else
-#error "This is deprecated"
- _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
- "GetAgcConfig() EC is not supported");
- return -1;
-#endif
}
bool VoEAudioProcessing::DriftCompensationSupported() {
@@ -356,7 +314,6 @@ bool VoEAudioProcessingImpl::DriftCompensationEnabled() {
int VoEAudioProcessingImpl::SetEcStatus(bool enable, EcModes mode) {
WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
"SetEcStatus(enable=%d, mode=%d)", enable, mode);
-#ifdef WEBRTC_VOICE_ENGINE_ECHO
if (!_shared->statistics().Initialized()) {
_shared->SetLastError(VE_NOT_INITED, kTraceError);
return -1;
@@ -435,16 +392,9 @@ int VoEAudioProcessingImpl::SetEcStatus(bool enable, EcModes mode) {
}
return 0;
-#else
-#error "This is deprecated"
- _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
- "SetEcStatus() EC is not supported");
- return -1;
-#endif
}
int VoEAudioProcessingImpl::GetEcStatus(bool& enabled, EcModes& mode) {
-#ifdef WEBRTC_VOICE_ENGINE_ECHO
if (!_shared->statistics().Initialized()) {
_shared->SetLastError(VE_NOT_INITED, kTraceError);
return -1;
@@ -459,12 +409,6 @@ int VoEAudioProcessingImpl::GetEcStatus(bool& enabled, EcModes& mode) {
}
return 0;
-#else
-#error "This is deprecated"
- _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
- "GetEcStatus() EC is not supported");
- return -1;
-#endif
}
void VoEAudioProcessingImpl::SetDelayOffsetMs(int offset) {
@@ -480,7 +424,6 @@ int VoEAudioProcessingImpl::DelayOffsetMs() {
int VoEAudioProcessingImpl::SetAecmMode(AecmModes mode, bool enableCNG) {
WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
"SetAECMMode(mode = %d)", mode);
-#ifdef WEBRTC_VOICE_ENGINE_ECHO
if (!_shared->statistics().Initialized()) {
_shared->SetLastError(VE_NOT_INITED, kTraceError);
return -1;
@@ -522,16 +465,9 @@ int VoEAudioProcessingImpl::SetAecmMode(AecmModes mode, bool enableCNG) {
}
return 0;
-#else
-#error "This is deprecated"
- _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
- "SetAECMMode() EC is not supported");
- return -1;
-#endif
}
int VoEAudioProcessingImpl::GetAecmMode(AecmModes& mode, bool& enabledCNG) {
-#ifdef WEBRTC_VOICE_ENGINE_ECHO
if (!_shared->statistics().Initialized()) {
_shared->SetLastError(VE_NOT_INITED, kTraceError);
return -1;
@@ -564,12 +500,6 @@ int VoEAudioProcessingImpl::GetAecmMode(AecmModes& mode, bool& enabledCNG) {
}
return 0;
-#else
-#error "This is deprecated"
- _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
- "GetAECMMode() EC is not supported");
- return -1;
-#endif
}
int VoEAudioProcessingImpl::EnableHighPassFilter(bool enable) {
@@ -613,7 +543,6 @@ int VoEAudioProcessingImpl::VoiceActivityIndicator(int channel) {
int VoEAudioProcessingImpl::SetEcMetricsStatus(bool enable) {
WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
"SetEcMetricsStatus(enable=%d)", enable);
-#ifdef WEBRTC_VOICE_ENGINE_ECHO
if (!_shared->statistics().Initialized()) {
_shared->SetLastError(VE_NOT_INITED, kTraceError);
return -1;
@@ -628,16 +557,9 @@ int VoEAudioProcessingImpl::SetEcMetricsStatus(bool enable) {
return -1;
}
return 0;
-#else
-#error "This is deprecated"
- _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
- "SetEcStatus() EC is not supported");
- return -1;
-#endif
}
int VoEAudioProcessingImpl::GetEcMetricsStatus(bool& enabled) {
-#ifdef WEBRTC_VOICE_ENGINE_ECHO
if (!_shared->statistics().Initialized()) {
_shared->SetLastError(VE_NOT_INITED, kTraceError);
return -1;
@@ -659,19 +581,12 @@ int VoEAudioProcessingImpl::GetEcMetricsStatus(bool& enabled) {
enabled = echo_mode;
return 0;
-#else
-#error "This is deprecated"
- _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
- "SetEcStatus() EC is not supported");
- return -1;
-#endif
}
int VoEAudioProcessingImpl::GetEchoMetrics(int& ERL,
int& ERLE,
int& RERL,
int& A_NLP) {
-#ifdef WEBRTC_VOICE_ENGINE_ECHO
if (!_shared->statistics().Initialized()) {
_shared->SetLastError(VE_NOT_INITED, kTraceError);
return -1;
@@ -699,18 +614,11 @@ int VoEAudioProcessingImpl::GetEchoMetrics(int& ERL,
A_NLP = echoMetrics.a_nlp.instant;
return 0;
-#else
-#error "This is deprecated"
- _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
- "SetEcStatus() EC is not supported");
- return -1;
-#endif
}
int VoEAudioProcessingImpl::GetEcDelayMetrics(int& delay_median,
int& delay_std,
float& fraction_poor_delays) {
-#ifdef WEBRTC_VOICE_ENGINE_ECHO
if (!_shared->statistics().Initialized()) {
_shared->SetLastError(VE_NOT_INITED, kTraceError);
return -1;
@@ -740,12 +648,6 @@ int VoEAudioProcessingImpl::GetEcDelayMetrics(int& delay_median,
fraction_poor_delays = poor_fraction;
return 0;
-#else
-#error "This is deprecated"
- _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
- "SetEcStatus() EC is not supported");
- return -1;
-#endif
}
int VoEAudioProcessingImpl::StartDebugRecording(const char* fileNameUTF8) {
« no previous file with comments | « no previous file | webrtc/voice_engine_configurations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698