Remove 3 defines in voice_engine_configurations.h

webrtc/voice_engine/voe_audio_processing_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 53 matching lines @@
 }
 
 VoEAudioProcessingImpl::~VoEAudioProcessingImpl() {
   WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1),
                "VoEAudioProcessingImpl::~VoEAudioProcessingImpl() - dtor");
 }
 
 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;
   }
 
   NoiseSuppression::Level nsLevel = kDefaultNsMode;
   switch (mode) {
     case kNsDefault:
       nsLevel = kDefaultNsMode;
       break;
@@ skipping 23 matching lines @@
                           "SetNsStatus() failed to set Ns mode");
     return -1;
   }
   if (_shared->audio_processing()->noise_suppression()->Enable(enable) != 0) {
     _shared->SetLastError(VE_APM_ERROR, kTraceError,
                           "SetNsStatus() failed to set Ns state");
     return -1;
   }
 
   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;
   }
 
   enabled = _shared->audio_processing()->noise_suppression()->is_enabled();
   NoiseSuppression::Level nsLevel =
       _shared->audio_processing()->noise_suppression()->level();
 
   switch (nsLevel) {
     case NoiseSuppression::kLow:
       mode = kNsLowSuppression;
       break;
     case NoiseSuppression::kModerate:
       mode = kNsModerateSuppression;
       break;
     case NoiseSuppression::kHigh:
       mode = kNsHighSuppression;
       break;
     case NoiseSuppression::kVeryHigh:
       mode = kNsVeryHighSuppression;
       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;
   }
 
 #if defined(WEBRTC_IOS) || defined(ATA) || defined(WEBRTC_ANDROID)
   if (mode == kAgcAdaptiveAnalog) {
     _shared->SetLastError(VE_INVALID_ARGUMENT, kTraceError,
                           "SetAgcStatus() invalid Agc mode for mobile device");
     return -1;
@@ skipping 35 matching lines @@
     // Note that we also enable the ADM Agc when Adaptive Digital mode is
     // used since we want to be able to provide the APM with updated mic
     // levels when the user modifies the mic level manually.
     if (_shared->audio_device()->SetAGC(enable) != 0) {
       _shared->SetLastError(VE_AUDIO_DEVICE_MODULE_ERROR, kTraceWarning,
                             "SetAgcStatus() failed to set Agc 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;
   }
 
   enabled = _shared->audio_processing()->gain_control()->is_enabled();
   GainControl::Mode agcMode =
       _shared->audio_processing()->gain_control()->mode();
 
   switch (agcMode) {
     case GainControl::kFixedDigital:
       mode = kAgcFixedDigital;
       break;
     case GainControl::kAdaptiveAnalog:
       mode = kAgcAdaptiveAnalog;
       break;
     case GainControl::kAdaptiveDigital:
       mode = kAgcAdaptiveDigital;
       break;
   }
 
   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;
   }
 
   if (_shared->audio_processing()->gain_control()->set_target_level_dbfs(
           config.targetLeveldBOv) != 0) {
     _shared->SetLastError(VE_APM_ERROR, kTraceError,
                           "SetAgcConfig() failed to set target peak |level|"
                           " (or envelope) of the Agc");
     return -1;
   }
   if (_shared->audio_processing()->gain_control()->set_compression_gain_db(
           config.digitalCompressionGaindB) != 0) {
     _shared->SetLastError(VE_APM_ERROR, kTraceError,
                           "SetAgcConfig() failed to set the range in |gain| "
                           "the digital compression stage may apply");
     return -1;
   }
   if (_shared->audio_processing()->gain_control()->enable_limiter(
           config.limiterEnable) != 0) {
     _shared->SetLastError(
         VE_APM_ERROR, kTraceError,
         "SetAgcConfig() failed to set hard limiter to the signal");
     return -1;
   }
 
   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;
   }
 
   config.targetLeveldBOv =
       _shared->audio_processing()->gain_control()->target_level_dbfs();
   config.digitalCompressionGaindB =
       _shared->audio_processing()->gain_control()->compression_gain_db();
   config.limiterEnable =
       _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() {
 #if defined(WEBRTC_DRIFT_COMPENSATION_SUPPORTED)
   return true;
 #else
   return false;
 #endif
 }
 
@@ skipping 19 matching lines @@
 bool VoEAudioProcessingImpl::DriftCompensationEnabled() {
   WEBRTC_VOICE_INIT_CHECK_BOOL();
 
   EchoCancellation* aec = _shared->audio_processing()->echo_cancellation();
   return aec->is_drift_compensation_enabled();
 }
 
 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;
   }
 
   // AEC mode
   if ((mode == kEcDefault) || (mode == kEcConference) || (mode == kEcAec) ||
       ((mode == kEcUnchanged) && (_isAecMode == true))) {
     if (enable) {
       // Disable the AECM before enable the AEC
@@ skipping 58 matching lines @@
       return -1;
     }
     _isAecMode = false;
   } else {
     _shared->SetLastError(VE_INVALID_ARGUMENT, kTraceError,
                           "SetEcStatus() invalid EC mode");
     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::GetEcStatus(bool& enabled, EcModes& mode) {
-#ifdef WEBRTC_VOICE_ENGINE_ECHO
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
   }
 
   if (_isAecMode == true) {
     mode = kEcAec;
     enabled = _shared->audio_processing()->echo_cancellation()->is_enabled();
   } else {
     mode = kEcAecm;
     enabled = _shared->audio_processing()->echo_control_mobile()->is_enabled();
   }
 
   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) {
   WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
                "SetDelayOffsetMs(offset = %d)", offset);
   _shared->audio_processing()->set_delay_offset_ms(offset);
 }
 
 int VoEAudioProcessingImpl::DelayOffsetMs() {
   return _shared->audio_processing()->delay_offset_ms();
 }
 
 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;
   }
 
   EchoControlMobile::RoutingMode aecmMode(
       EchoControlMobile::kQuietEarpieceOrHeadset);
 
   switch (mode) {
     case kAecmQuietEarpieceOrHeadset:
@@ skipping 21 matching lines @@
   }
   if (_shared->audio_processing()->echo_control_mobile()->enable_comfort_noise(
           enableCNG) != 0) {
     _shared->SetLastError(
         VE_APM_ERROR, kTraceError,
         "SetAECMMode() failed to set comfort noise state for AECM");
     return -1;
   }
 
   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;
   }
 
   enabledCNG = false;
 
   EchoControlMobile::RoutingMode aecmMode =
       _shared->audio_processing()->echo_control_mobile()->routing_mode();
   enabledCNG = _shared->audio_processing()
@@ skipping 12 matching lines @@
       break;
     case EchoControlMobile::kSpeakerphone:
       mode = kAecmSpeakerphone;
       break;
     case EchoControlMobile::kLoudSpeakerphone:
       mode = kAecmLoudSpeakerphone;
       break;
   }
 
   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) {
   WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
                "EnableHighPassFilter(%d)", enable);
   if (_shared->audio_processing()->high_pass_filter()->Enable(enable) !=
       AudioProcessing::kNoError) {
     _shared->SetLastError(VE_APM_ERROR, kTraceError,
                           "HighPassFilter::Enable() failed.");
     return -1;
@@ skipping 23 matching lines @@
   }
   int activity(-1);
   channelPtr->VoiceActivityIndicator(activity);
 
   return activity;
 }
 
 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;
   }
 
   if ((_shared->audio_processing()->echo_cancellation()->enable_metrics(
            enable) != 0) ||
       (_shared->audio_processing()->echo_cancellation()->enable_delay_logging(
            enable) != 0)) {
     _shared->SetLastError(VE_APM_ERROR, kTraceError,
                           "SetEcMetricsStatus() unable to set EC metrics mode");
     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;
   }
 
   bool echo_mode =
       _shared->audio_processing()->echo_cancellation()->are_metrics_enabled();
   bool delay_mode = _shared->audio_processing()
                         ->echo_cancellation()
                         ->is_delay_logging_enabled();
 
   if (echo_mode != delay_mode) {
     _shared->SetLastError(
         VE_APM_ERROR, kTraceError,
         "GetEcMetricsStatus() delay logging and echo mode are not the same");
     return -1;
   }
 
   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;
   }
   if (!_shared->audio_processing()->echo_cancellation()->is_enabled()) {
     _shared->SetLastError(
         VE_APM_ERROR, kTraceWarning,
         "GetEchoMetrics() AudioProcessingModule AEC is not enabled");
     return -1;
   }
 
   // Get Echo Metrics from Audio Processing Module.
   EchoCancellation::Metrics echoMetrics;
   if (_shared->audio_processing()->echo_cancellation()->GetMetrics(
           &echoMetrics)) {
     WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_shared->instance_id(), -1),
                  "GetEchoMetrics(), AudioProcessingModule metrics error");
     return -1;
   }
 
   // Echo quality metrics.
   ERL = echoMetrics.echo_return_loss.instant;
   ERLE = echoMetrics.echo_return_loss_enhancement.instant;
   RERL = echoMetrics.residual_echo_return_loss.instant;
   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;
   }
   if (!_shared->audio_processing()->echo_cancellation()->is_enabled()) {
     _shared->SetLastError(
         VE_APM_ERROR, kTraceWarning,
         "GetEcDelayMetrics() AudioProcessingModule AEC is not enabled");
     return -1;
   }
 
   int median = 0;
   int std = 0;
   float poor_fraction = 0;
   // Get delay-logging values from Audio Processing Module.
   if (_shared->audio_processing()->echo_cancellation()->GetDelayMetrics(
           &median, &std, &poor_fraction)) {
     WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_shared->instance_id(), -1),
                  "GetEcDelayMetrics(), AudioProcessingModule delay-logging "
                  "error");
     return -1;
   }
 
   // EC delay-logging metrics
   delay_median = median;
   delay_std = std;
   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) {
   WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
                "StartDebugRecording()");
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
   }
 
@@ skipping 111 matching lines @@
   _shared->transmit_mixer()->EnableStereoChannelSwapping(enable);
 }
 
 bool VoEAudioProcessingImpl::IsStereoChannelSwappingEnabled() {
   return _shared->transmit_mixer()->IsStereoChannelSwappingEnabled();
 }
 
 #endif  // #ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
 
 }  // namespace webrtc