Improving support for Android Audio Effects in WebRTC

talk/media/webrtc/webrtcvoiceengine.cc

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 597 matching lines @@
   if (!ApplyOptions(options)) {
     return false;
   }
   option_overrides_ = AudioOptions();
   return true;
 }
 
 // AudioOptions defaults are set in InitInternal (for options with corresponding
 // MediaEngineInterface flags) and in SetOptions(int) for flagless options.
 bool WebRtcVoiceEngine::ApplyOptions(const AudioOptions& options_in) {
+  LOG(LS_INFO) << "ApplyOptions: " << options_in.ToString();
   AudioOptions options = options_in;  // The options are modified below.
   // kEcConference is AEC with high suppression.
   webrtc::EcModes ec_mode = webrtc::kEcConference;
   webrtc::AecmModes aecm_mode = webrtc::kAecmSpeakerphone;
   webrtc::AgcModes agc_mode = webrtc::kAgcAdaptiveAnalog;
   webrtc::NsModes ns_mode = webrtc::kNsHighSuppression;
   bool aecm_comfort_noise = false;
   if (options.aecm_generate_comfort_noise.Get(&aecm_comfort_noise)) {
     LOG(LS_VERBOSE) << "Comfort noise explicitly set to "
                     << aecm_comfort_noise << " (default is false).";
@@ skipping 24 matching lines @@
 #if !defined(IOS)
   if (options.delay_agnostic_aec.Get(&use_delay_agnostic_aec)) {
     if (use_delay_agnostic_aec) {
       options.echo_cancellation.Set(true);
       options.extended_filter_aec.Set(true);
       ec_mode = webrtc::kEcConference;
     }
   }
 #endif
 
-  LOG(LS_INFO) << "Applying audio options: " << options.ToString();
-
   webrtc::VoEAudioProcessing* voep = voe_wrapper_->processing();
 
   bool echo_cancellation = false;
   if (options.echo_cancellation.Get(&echo_cancellation)) {
     // Check if platform supports built-in EC. Currently only supported on
     // Android and in combination with Java based audio layer.
     // TODO(henrika): investigate possibility to support built-in EC also
     // in combination with Open SL ES audio.
     const bool built_in_aec = voe_wrapper_->hw()->BuiltInAECIsAvailable();
     if (built_in_aec) {
@@ skipping 26 matching lines @@
     }
 #endif
     if (ec_mode == webrtc::kEcAecm) {
       if (voep->SetAecmMode(aecm_mode, aecm_comfort_noise) != 0) {
         LOG_RTCERR2(SetAecmMode, aecm_mode, aecm_comfort_noise);
         return false;
       }
     }
   }
 
-  bool auto_gain_control;
+  bool auto_gain_control = false;
   if (options.auto_gain_control.Get(&auto_gain_control)) {
+    const bool built_in_agc = voe_wrapper_->hw()->BuiltInAGCIsAvailable();
+    if (built_in_agc) {
+      if (voe_wrapper_->hw()->EnableBuiltInAGC(auto_gain_control) == 0 &&
+          auto_gain_control) {
+        // Disable internal software AGC if built-in AGC is enabled,
+        // i.e., replace the software AGC with the built-in AGC.
+        options.auto_gain_control.Set(false);
+        auto_gain_control = false;
+        LOG(LS_INFO) << "Disabling AGC since built-in AGC will be used instead";
+      }
+    }
     if (voep->SetAgcStatus(auto_gain_control, agc_mode) == -1) {
       LOG_RTCERR2(SetAgcStatus, auto_gain_control, agc_mode);
       return false;
     } else {
       LOG(LS_INFO) << "Auto gain set to " << auto_gain_control << " with mode "
                    << agc_mode;
     }
   }
 
   if (options.tx_agc_target_dbov.IsSet() ||
@@ skipping 18 matching lines @@
             default_agc_config_.limiterEnable);
     if (voe_wrapper_->processing()->SetAgcConfig(default_agc_config_) == -1) {
       LOG_RTCERR3(SetAgcConfig,
                   default_agc_config_.targetLeveldBOv,
                   default_agc_config_.digitalCompressionGaindB,
                   default_agc_config_.limiterEnable);
       return false;
     }
   }
 
-  bool noise_suppression;
+  bool noise_suppression = false;
   if (options.noise_suppression.Get(&noise_suppression)) {
+    const bool built_in_ns = voe_wrapper_->hw()->BuiltInNSIsAvailable();
+    if (built_in_ns) {
+      if (voe_wrapper_->hw()->EnableBuiltInNS(noise_suppression) == 0 &&
+          noise_suppression) {
+        // Disable internal software NS if built-in NS is enabled,
+        // i.e., replace the software NS with the built-in NS.
+        options.noise_suppression.Set(false);
+        noise_suppression = false;
+        LOG(LS_INFO) << "Disabling NS since built-in NS will be used instead";
+      }
+    }
     if (voep->SetNsStatus(noise_suppression, ns_mode) == -1) {
       LOG_RTCERR2(SetNsStatus, noise_suppression, ns_mode);
       return false;
     } else {
-      LOG(LS_VERBOSE) << "Noise suppression set to " << noise_suppression
-                      << " with mode " << ns_mode;
+      LOG(LS_INFO) << "Noise suppression set to " << noise_suppression
+                   << " with mode " << ns_mode;
     }
   }
 
   bool highpass_filter;
   if (options.highpass_filter.Get(&highpass_filter)) {
     LOG(LS_INFO) << "High pass filter enabled? " << highpass_filter;
     if (voep->EnableHighPassFilter(highpass_filter) == -1) {
       LOG_RTCERR1(SetHighpassFilterStatus, highpass_filter);
       return false;
     }
@@ skipping 2510 matching lines @@
       LOG(LS_WARNING) << "Unknown codec " << ToString(codec);
       return false;
     }
   }
   return true;
 }
 
 }  // namespace cricket
 
 #endif  // HAVE_WEBRTC_VOICE