From ec31bc1321da59a5f939f1fd9770acb6cf5e621b Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Mon, 6 Feb 2012 12:42:45 +0000 Subject: [PATCH] Fixed APM tests. TEST=ApmTest.* Review URL: https://webrtc-codereview.appspot.com/380008 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1607 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/audio_processing/echo_cancellation_impl.cc | 3 ++- src/modules/audio_processing/echo_control_mobile_impl.cc | 3 ++- src/modules/audio_processing/gain_control_impl.cc | 3 ++- src/modules/audio_processing/noise_suppression_impl.cc | 3 +++ src/modules/audio_processing/voice_detection_impl.cc | 3 +++ 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/modules/audio_processing/echo_cancellation_impl.cc b/src/modules/audio_processing/echo_cancellation_impl.cc index 3cc0791542..77e076aa95 100644 --- a/src/modules/audio_processing/echo_cancellation_impl.cc +++ b/src/modules/audio_processing/echo_cancellation_impl.cc @@ -33,7 +33,8 @@ WebRtc_Word16 MapSetting(EchoCancellation::SuppressionLevel level) { case EchoCancellation::kHighSuppression: return kAecNlpAggressive; } - assert(false); + // TODO(mflodman) Needed for gcc to compile and assert can't be added due to + // ApmTest triggers this. return -1; } diff --git a/src/modules/audio_processing/echo_control_mobile_impl.cc b/src/modules/audio_processing/echo_control_mobile_impl.cc index c0189fbe3e..e337d424b6 100644 --- a/src/modules/audio_processing/echo_control_mobile_impl.cc +++ b/src/modules/audio_processing/echo_control_mobile_impl.cc @@ -37,7 +37,8 @@ WebRtc_Word16 MapSetting(EchoControlMobile::RoutingMode mode) { case EchoControlMobile::kLoudSpeakerphone: return 4; } - assert(false); + // TODO(mflodman) Needed for gcc to compile and assert can't be added due to + // ApmTest triggers this. return -1; } diff --git a/src/modules/audio_processing/gain_control_impl.cc b/src/modules/audio_processing/gain_control_impl.cc index ffc137414f..eb7ca611fd 100644 --- a/src/modules/audio_processing/gain_control_impl.cc +++ b/src/modules/audio_processing/gain_control_impl.cc @@ -48,7 +48,8 @@ WebRtc_Word16 MapSetting(GainControl::Mode mode) { return kAgcModeFixedDigital; break; } - assert(false); + // TODO(mflodman) Needed for gcc to compile and assert can't be added due to + // ApmTest triggers this. return -1; } } // namespace diff --git a/src/modules/audio_processing/noise_suppression_impl.cc b/src/modules/audio_processing/noise_suppression_impl.cc index 8ecc8b5b72..5c16e0e0a2 100644 --- a/src/modules/audio_processing/noise_suppression_impl.cc +++ b/src/modules/audio_processing/noise_suppression_impl.cc @@ -42,6 +42,9 @@ int MapSetting(NoiseSuppression::Level level) { case NoiseSuppression::kVeryHigh: return 3; } + // TODO(mflodman) Needed for gcc to compile and assert can't be added due to + // ApmTest triggers this. + return -1; } } // namespace diff --git a/src/modules/audio_processing/voice_detection_impl.cc b/src/modules/audio_processing/voice_detection_impl.cc index e6da00bfb5..98242b90ca 100644 --- a/src/modules/audio_processing/voice_detection_impl.cc +++ b/src/modules/audio_processing/voice_detection_impl.cc @@ -38,6 +38,9 @@ int MapSetting(VoiceDetection::Likelihood likelihood) { return 0; break; } + // TODO(mflodman) Needed for gcc to compile and assert can't be added due to + // ApmTest triggers this. + return -1; } } // namespace