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

@@ -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;
 }
 

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;
 }
 

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

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
 

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